diff --git a/roles/ansible/tasks/main.yml b/roles/ansible/tasks/main.yml
index 44f62449..2fffc9bc 100644
--- a/roles/ansible/tasks/main.yml
+++ b/roles/ansible/tasks/main.yml
@@ -16,14 +16,21 @@
     owner: root
     group: nounou
 
-- name: Set ACL for re2o project
-  command: setfacl -d -m 'g::rwx' /var/local/ansible
+- name: Set ACL for ansible directory
+  acl:
+    path: /var/local/ansible
+    default: yes
+    entity: nounou
+    etype: group
+    permissions: rwx
+    state: query
 
 - name: Clone Ansible project
   git:
     repo: 'http://gitlab.adm.crans.org/nounous/ansible.git'
     dest: /var/local/ansible
     umask: '002'
+    version: 'master'
 
 - name: Indicate Ansible in motd
   template:
diff --git a/roles/re2o/tasks/main.yml b/roles/re2o/tasks/main.yml
index 50f5ffcc..1af10e1d 100644
--- a/roles/re2o/tasks/main.yml
+++ b/roles/re2o/tasks/main.yml
@@ -51,8 +51,14 @@
     owner: "{{ re2o.owner }}"
     group: "{{ re2o.group }}"
 
-- name: Set ACL for re2o project
-  command: setfacl -d -m 'g::rwx' /var/www/re2o
+- name: Set ACL for re2o directory
+  acl:
+    path: /var/www/re2o
+    default: yes
+    entity: nounou
+    etype: group
+    permissions: rwx
+    state: query
 
 - name: Clone re2o repository
   git: