diff --git a/group_vars/all/home_nounou.yml b/group_vars/all/home_nounou.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c31e4508bb04e197bff35d403aeead309388c34a
--- /dev/null
+++ b/group_vars/all/home_nounou.yml
@@ -0,0 +1,4 @@
+---
+glob_home_nounou:
+  ip: 172.16.10.1
+  mountpoint: /pool/home
diff --git a/group_vars/all/vars.yaml b/group_vars/all/vars.yaml
index 8acc7ad3b8215c84fd47b2218a6f2f909c35882e..ec368d89f5d30e3ceee3044730a31d0d3dafe76b 100644
--- a/group_vars/all/vars.yaml
+++ b/group_vars/all/vars.yaml
@@ -59,6 +59,3 @@ glob_ldap:
     - 172.16.10.12
     - 172.16.10.13
   base: 'dc=crans,dc=org'
-
-home_nounous:
-  ip: 172.16.10.1
diff --git a/plays/root.yml b/plays/root.yml
index c73b87eddf2aa78d964a9b2f1101984b6fc1dadf..0df02eee863ba9e4dff145212ecdc1c45c15fb68 100755
--- a/plays/root.yml
+++ b/plays/root.yml
@@ -38,9 +38,11 @@
   roles:
     - ldap-client
 
-- hosts: server,!ovh_physical,!tealc.adm.crans.org,!zamok.adm.crans.org
+- hosts: server,!ovh_physical,!tealc.adm.crans.org,!zamok.adm.crans.org,!gulp.cachan-adm.crans.org
+  vars:
+    home_nounou: "{{ glob_home_nounou | default({}) | combine(loc_home_nounou | default({})) }}"
   roles:
-    - home-nounous
+    - home-nounou
 
 - import_playbook: scripts.yml
 - import_playbook: vm_setup.yml
diff --git a/roles/home-nounous/README.md b/roles/home-nounou/README.md
similarity index 100%
rename from roles/home-nounous/README.md
rename to roles/home-nounou/README.md
diff --git a/roles/home-nounous/tasks/main.yml b/roles/home-nounou/tasks/main.yml
similarity index 57%
rename from roles/home-nounous/tasks/main.yml
rename to roles/home-nounou/tasks/main.yml
index b3ea1062654c2fafd3f21da1749e5c1b07f1d1c0..915b294e5c1324092f4373f71c82943f208020f7 100644
--- a/roles/home-nounous/tasks/main.yml
+++ b/roles/home-nounou/tasks/main.yml
@@ -9,15 +9,23 @@
   retries: 3
   until: apt_result is succeeded
 
+- name: Create directory home_nounou
+  file:
+    path: /home_nounou
+    state: directory
+    owner: root
+    group: _user
+    mode: 0750
+
 - name: Deploy nfs systemd mount
   template:
-    src: systemd/system/home.mount.j2
-    dest: /etc/systemd/system/home.mount
+    src: systemd/system/home_nounou.mount.j2
+    dest: /etc/systemd/system/home_nounou.mount
     mode: 0644
 
 - name: Load and activate nfs systemd mount
   systemd:
-    name: home.mount
+    name: home_nounou.mount
     daemon_reload: true
     enabled: true
     state: started
diff --git a/roles/home-nounous/templates/systemd/system/home.mount.j2 b/roles/home-nounou/templates/systemd/system/home_nounou.mount.j2
similarity index 72%
rename from roles/home-nounous/templates/systemd/system/home.mount.j2
rename to roles/home-nounou/templates/systemd/system/home_nounou.mount.j2
index b144343da5fc3ed9e9cf446f109d633d28a852ff..835e16caa577a9dea8ab49cad46a3d488045bba0 100644
--- a/roles/home-nounous/templates/systemd/system/home.mount.j2
+++ b/roles/home-nounou/templates/systemd/system/home_nounou.mount.j2
@@ -5,8 +5,8 @@ Wants=network-online.target
 After=network-online.target
 
 [Mount]
-What={{ home_nounous.ip }}:/pool/home
-Where=/home
+What={{ home_nounou.ip }}:{{ home_nounou.mountpoint }}
+Where=/home_nounou
 Type=nfs
 Options=rw,nosuid
 
diff --git a/roles/sudo/templates/sudoers.d/group_privilege.j2 b/roles/sudo/templates/sudoers.d/group_privilege.j2
index 7d0fe1d7c88f9522e1e26ea6a4c6c56dc8ce5f77..2b7e31fd472c45b3110a460dafba074198e2f222 100644
--- a/roles/sudo/templates/sudoers.d/group_privilege.j2
+++ b/roles/sudo/templates/sudoers.d/group_privilege.j2
@@ -1,3 +1,3 @@
 {{ ansible_header | comment }}
 # Group privilege specification
-NOUNOU    ALL=(ALL:ALL) ALL
+NOUNOUS    ALL=(ALL:ALL) ALL