diff --git a/admin-users/defaults/main.yml b/admin-users/defaults/main.yml
deleted file mode 100644
index ad5f42cb..00000000
--- a/admin-users/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-admin_users: {}
-admin_users_group: adm
diff --git a/admin-users/tasks/admin_user.yml b/admin-users/tasks/admin_user.yml
deleted file mode 100644
index 329ce50e..00000000
--- a/admin-users/tasks/admin_user.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-
-- include: user.yml
-
-- include: profile.yml
-
-- include: ssh.yml
-
-- include: sudo.yml
-
-- meta: flush_handlers
diff --git a/admin-users/tasks/sudo.yml b/admin-users/tasks/sudo.yml
deleted file mode 100644
index e05ac614..00000000
--- a/admin-users/tasks/sudo.yml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-
-- name: "Verify Evolinux sudoers file presence (jessie)"
-  template:
-    src: sudoers_jessie.j2
-    dest: /etc/sudoers.d/evolinux
-    force: no
-    validate: '/usr/sbin/visudo -cf %s'
-  register: copy_sudoers_evolinux
-  when: ansible_distribution_release == "jessie"
-
-- name: "Verify Evolinux sudoers file presence (Debian 9 or later)"
-  template:
-    src: sudoers_stretch.j2
-    dest: /etc/sudoers.d/evolinux
-    force: no
-    validate: '/usr/sbin/visudo -cf %s'
-  register: copy_sudoers_evolinux
-  when: ansible_distribution_major_version | version_compare('9', '>=')
-
-- name: "Verify Evolinux sudoers file permissions"
-  file:
-    path: /etc/sudoers.d/evolinux
-    mode: "0440"
-    state: file
-
-- name: "Add user in sudoers file for '{{ user.name }}' (jessie)"
-  replace:
-    dest: /etc/sudoers.d/evolinux
-    regexp: '^(User_Alias\s+ADMINS\s+=((?!{{ user.name }}).)*)$'
-    replace: '\1,{{ user.name }}'
-    validate: '/usr/sbin/visudo -cf %s'
-  when:
-  - ansible_distribution_release == "jessie"
-  - not copy_sudoers_evolinux.changed
-
-- name: "Create evolinux-sudo group (Debian 9 or later)"
-  group:
-    name: evolinux-sudo
-    system: yes
-  when: ansible_distribution_major_version | version_compare('9', '>=')
-
-- name: "Add user to evolinux-sudo group (Debian 9 or later)"
-  user:
-    name: '{{ user.name }}'
-    groups: 'evolinux-sudo'
-    append: yes
-  when: ansible_distribution_major_version | version_compare('9', '>=')
diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 4328b241..174fc2d0 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -100,6 +100,22 @@ evolinux_system_alert5_init: True
 evolinux_system_alert5_enable: True
 evolinux_system_eni_auto: True
 
+# evomaintenance
+
+evolinux_evomaintenance_include: True
+
+# ssh
+
+evolinux_ssh_include: True
+
+evolinux_ssh_password_auth_addresses: []
+evolinux_ssh_match_address: True
+evolinux_ssh_disable_acceptenv: True
+
+# evolinux users
+
+evolinux_users_include: True
+
 # root
 
 evolinux_root_include: True
@@ -112,15 +128,7 @@ evolinux_root_gitconfig: True
 evolinux_root_bash_history_appendonly: True
 evolinux_root_vim_default: True
 evolinux_root_vim_conf: True
-
-# ssh
-
-evolinux_ssh_include: True
-
-evolinux_ssh_password_auth_addresses: []
-evolinux_ssh_match_address: True
-evolinux_ssh_disable_root: False
-evolinux_ssh_disable_acceptenv: True
+evolinux_root_disable_ssh: True
 
 # postfix
 
diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml
index f44cfa11..b400e334 100644
--- a/evolinux-base/tasks/main.yml
+++ b/evolinux-base/tasks/main.yml
@@ -34,14 +34,24 @@
   include: system.yml
   when: evolinux_system_include
 
-- name: Root user configuration
-  include: root.yml
-  when: evolinux_root_include
+- name: Evomaintenance
+  include_role:
+    name: evomaintenance
+  when: evolinux_evomaintenance_include
 
 - name: SSH configuration
   include: ssh.yml
   when: evolinux_ssh_include
 
+- name: Create evolinux users
+  include_role:
+    name: evolinux-users
+  when: evolinux_users_include
+
+- name: Root user configuration
+  include: root.yml
+  when: evolinux_root_include
+
 - name: Postfix
   include: postfix.yml
   when: evolinux_postfix_include
diff --git a/evolinux-base/tasks/root.yml b/evolinux-base/tasks/root.yml
index ffe64fe1..4c66324a 100644
--- a/evolinux-base/tasks/root.yml
+++ b/evolinux-base/tasks/root.yml
@@ -80,4 +80,12 @@
     - "set shiftwidth=4"
   when: evolinux_root_vim_conf
 
+- name: disable SSH access for root
+  replace:
+    dest: /etc/ssh/sshd_config
+    regexp: '^PermitRootLogin (yes|without-password)'
+    replace: "PermitRootLogin no"
+  notify: reload sshd
+  when: evolinux_root_disable_ssh
+
 - meta: flush_handlers
diff --git a/evolinux-base/tasks/ssh.yml b/evolinux-base/tasks/ssh.yml
index 6fc80292..8094d8bc 100644
--- a/evolinux-base/tasks/ssh.yml
+++ b/evolinux-base/tasks/ssh.yml
@@ -17,14 +17,6 @@
   notify: reload sshd
   when: not evolinux_ssh_password_auth_addresses == []
 
-- name: disable SSH access for root
-  replace:
-    dest: /etc/ssh/sshd_config
-    regexp: '^PermitRootLogin (yes|without-password)'
-    replace: "PermitRootLogin no"
-  notify: reload sshd
-  when: evolinux_ssh_disable_root
-
 # We disable AcceptEnv because it can be a security issue, but also because we
 # do not want clients to push their environment variables like LANG.
 - name: disable AcceptEnv in ssh config
diff --git a/admin-users/.kitchen.yml b/evolinux-users/.kitchen.yml
similarity index 92%
rename from admin-users/.kitchen.yml
rename to evolinux-users/.kitchen.yml
index f9ea107a..0c97cc85 100644
--- a/admin-users/.kitchen.yml
+++ b/evolinux-users/.kitchen.yml
@@ -31,7 +31,7 @@ suites:
       playbook: ./tests/test.yml
     verifier:
       patterns:
-      - admin-users/tests/spec/admin-users_spec.rb
+      - evolinux-users/tests/spec/evolinux-users_spec.rb
       bundler_path: '/usr/local/bin'
       rspec_path: '/usr/local/bin'
 
diff --git a/admin-users/README.md b/evolinux-users/README.md
similarity index 66%
rename from admin-users/README.md
rename to evolinux-users/README.md
index 68b0044d..83d69172 100644
--- a/admin-users/README.md
+++ b/evolinux-users/README.md
@@ -1,6 +1,6 @@
-# admin-users
+# evolinux-users
 
-Creates admin users accounts, based on a configuration data structure.
+Creates evolinux users accounts, based on a configuration data structure.
 
 ## Tasks
 
@@ -8,10 +8,10 @@ Everything is in the `tasks/main.yml` file.
 
 ## Available variables
 
-The variable `admin_users` must be a "dict" of one or more users :
+The variable `evolinux_users` must be a "dict" of one or more users :
 
 ```
-admin_users:
+evolinux_users:
   foo:
     name: foo
     uid: 1001
diff --git a/evolinux-users/defaults/main.yml b/evolinux-users/defaults/main.yml
new file mode 100644
index 00000000..f0947958
--- /dev/null
+++ b/evolinux-users/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+evolinux_users: {}
+evolinux_sudo_group: "evolinux-sudo"
diff --git a/admin-users/handlers/main.yml b/evolinux-users/handlers/main.yml
similarity index 100%
rename from admin-users/handlers/main.yml
rename to evolinux-users/handlers/main.yml
diff --git a/admin-users/meta/main.yml b/evolinux-users/meta/main.yml
similarity index 88%
rename from admin-users/meta/main.yml
rename to evolinux-users/meta/main.yml
index 006768d3..9bae9e73 100644
--- a/admin-users/meta/main.yml
+++ b/evolinux-users/meta/main.yml
@@ -1,6 +1,6 @@
 galaxy_info:
   author: Evolix
-  description: Creates admin users accounts.
+  description: Creates evolinux users accounts.
 
   issue_tracker_url: https://forge.evolix.org/projects/ansible-roles/issues
 
diff --git a/admin-users/tasks/user.yml b/evolinux-users/tasks/account.yml
similarity index 72%
rename from admin-users/tasks/user.yml
rename to evolinux-users/tasks/account.yml
index 94f1a0c3..453eca66 100644
--- a/admin-users/tasks/user.yml
+++ b/evolinux-users/tasks/account.yml
@@ -35,18 +35,6 @@
    update_password: on_create
   when: loginisbusy.rc != 0 and uidisbusy.rc == 0
 
-- name: "Create {{ admin_users_group }} group (Debian 9 or later)"
-  group:
-    name: "{{ admin_users_group }}"
-  when: ansible_distribution_major_version | version_compare('9', '>=')
-
-- name: "Add user to {{ admin_users_group }} group (Debian 9 or later)"
-  user:
-    name: '{{ user.name }}'
-    groups: '{{ admin_users_group }}'
-    append: yes
-  when: ansible_distribution_major_version | version_compare('9', '>=')
-
 - name: "Fix perms on homedirectory for '{{ user.name }}'"
   file:
    name: '/home/{{ user.name }}'
diff --git a/admin-users/tasks/main.yml b/evolinux-users/tasks/main.yml
similarity index 52%
rename from admin-users/tasks/main.yml
rename to evolinux-users/tasks/main.yml
index 6a1d1506..f168ae08 100644
--- a/admin-users/tasks/main.yml
+++ b/evolinux-users/tasks/main.yml
@@ -6,11 +6,11 @@
   - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<')
 
 - debug:
-    msg: "Warning: empty 'admin_users' variable, tasks will be skipped!"
-  when: admin_users == {}
+    msg: "Warning: empty 'evolinux_users' variable, tasks will be skipped!"
+  when: evolinux_users == {}
 
-- include: admin_user.yml
+- include: user.yml
   vars:
     user: "{{ item.value }}"
-  with_dict: "{{ admin_users }}"
-  when: admin_users != {}
+  with_dict: "{{ evolinux_users }}"
+  when: evolinux_users != {}
diff --git a/admin-users/tasks/profile.yml b/evolinux-users/tasks/profile.yml
similarity index 100%
rename from admin-users/tasks/profile.yml
rename to evolinux-users/tasks/profile.yml
diff --git a/admin-users/tasks/ssh.yml b/evolinux-users/tasks/ssh.yml
similarity index 100%
rename from admin-users/tasks/ssh.yml
rename to evolinux-users/tasks/ssh.yml
diff --git a/evolinux-users/tasks/sudo_jessie.yml b/evolinux-users/tasks/sudo_jessie.yml
new file mode 100644
index 00000000..fd854c1f
--- /dev/null
+++ b/evolinux-users/tasks/sudo_jessie.yml
@@ -0,0 +1,21 @@
+---
+
+- name: "Verify Evolinux sudoers file presence (jessie)"
+  template:
+    src: sudoers_jessie.j2
+    dest: /etc/sudoers.d/evolinux
+    force: no
+    mode: "0440"
+    validate: '/usr/sbin/visudo -cf %s'
+  register: copy_sudoers_evolinux
+  when: ansible_distribution_release == "jessie"
+
+- name: "Add user in sudoers file for '{{ user.name }}' (jessie)"
+  replace:
+    dest: /etc/sudoers.d/evolinux
+    regexp: '^(User_Alias\s+ADMINS\s+=((?!{{ user.name }}).)*)$'
+    replace: '\1,{{ user.name }}'
+    validate: '/usr/sbin/visudo -cf %s'
+  when:
+  - ansible_distribution_release == "jessie"
+  - not copy_sudoers_evolinux.changed
diff --git a/evolinux-users/tasks/sudo_stretch.yml b/evolinux-users/tasks/sudo_stretch.yml
new file mode 100644
index 00000000..7358fbf1
--- /dev/null
+++ b/evolinux-users/tasks/sudo_stretch.yml
@@ -0,0 +1,23 @@
+---
+
+- name: "Verify Evolinux sudoers file presence (Debian 9 or later)"
+  template:
+    src: sudoers_stretch.j2
+    dest: /etc/sudoers.d/evolinux
+    force: no
+    validate: '/usr/sbin/visudo -cf %s'
+  register: copy_sudoers_evolinux
+  when: ansible_distribution_major_version | version_compare('9', '>=')
+
+- name: "Create evolinux-sudo group (Debian 9 or later)"
+  group:
+    name: "{{ evolinux_sudo_group }}"
+    system: yes
+  when: ansible_distribution_major_version | version_compare('9', '>=')
+
+- name: "Add user to evolinux-sudo group (Debian 9 or later)"
+  user:
+    name: '{{ user.name }}'
+    groups: "{{ evolinux_sudo_group }}"
+    append: yes
+  when: ansible_distribution_major_version | version_compare('9', '>=')
diff --git a/evolinux-users/tasks/user.yml b/evolinux-users/tasks/user.yml
new file mode 100644
index 00000000..73fea728
--- /dev/null
+++ b/evolinux-users/tasks/user.yml
@@ -0,0 +1,15 @@
+---
+
+- include: account.yml
+
+- include: profile.yml
+
+- include: ssh.yml
+
+- include: sudo_jessie.yml
+  when: ansible_distribution_release == "jessie"
+
+- include: sudo_stretch.yml
+  when: ansible_distribution_major_version | version_compare('9', '>=')
+
+- meta: flush_handlers
diff --git a/admin-users/templates/sudoers_jessie.j2 b/evolinux-users/templates/sudoers_jessie.j2
similarity index 100%
rename from admin-users/templates/sudoers_jessie.j2
rename to evolinux-users/templates/sudoers_jessie.j2
diff --git a/admin-users/templates/sudoers_stretch.j2 b/evolinux-users/templates/sudoers_stretch.j2
similarity index 75%
rename from admin-users/templates/sudoers_stretch.j2
rename to evolinux-users/templates/sudoers_stretch.j2
index 8de1bbc6..289a65ee 100644
--- a/admin-users/templates/sudoers_stretch.j2
+++ b/evolinux-users/templates/sudoers_stretch.j2
@@ -5,5 +5,5 @@ Cmnd_Alias      MAINT = /usr/share/scripts/evomaintenance.sh, /usr/share/scripts
 nagios          ALL = NOPASSWD: /usr/lib/nagios/plugins/check_procs
 nagios          ALL = (clamav) NOPASSWD: /usr/bin/clamscan /tmp/safe.txt
 
-%evolinux-sudo  ALL=(ALL:ALL) ALL
-%evolinux-sudo  ALL = NOPASSWD: MAINT
+%{{ evolinux_sudo_group }}  ALL=(ALL:ALL) ALL
+%{{ evolinux_sudo_group }}  ALL = NOPASSWD: MAINT
diff --git a/admin-users/tests/spec/admin-users_spec.rb b/evolinux-users/tests/spec/evolinux-users_spec.rb
similarity index 100%
rename from admin-users/tests/spec/admin-users_spec.rb
rename to evolinux-users/tests/spec/evolinux-users_spec.rb
diff --git a/admin-users/tests/test.yml b/evolinux-users/tests/test.yml
similarity index 94%
rename from admin-users/tests/test.yml
rename to evolinux-users/tests/test.yml
index 06c29643..f622eebf 100644
--- a/admin-users/tests/test.yml
+++ b/evolinux-users/tests/test.yml
@@ -2,7 +2,7 @@
 - hosts: test-kitchen
 
   vars:
-    admin_users:
+    evolinux_users:
       foo:
         name: foo
         uid: 1001
@@ -20,4 +20,4 @@
   #       state: directory
 
   roles:
-    - role: admin-users
+    - role: evolinux-users