diff --git a/tasks/install.yml b/tasks/install.yml
index a0029da9deedb841b74e8246552cec43b7e1193a..da78cc6fc15e9d4ff9fee01a8525fe7323d3b665 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -247,13 +247,20 @@
   tags: 'cron'
   when: item.0.install|default(true)
 
-- name: "Set Extended Permissions"
+- name: "Set Extended Default Permissions"
   command: setfacl -dRm u:{{ apacheUser }}:rwX,g:{{ apacheUser }}:rwX,o::rX {{ webRoot }}/files
   tags:
     - 'deploy'
     - 'SetPermissions'
   when: drupal.install_extra_dirs|default(true)
 
+- name: "Set Extended Permissions"
+  command: setfacl -Rm u:{{ apacheUser }}:rwX,g:{{ apacheUser }}:rwX,o::rX {{ webRoot }}/files
+  tags:
+    - 'deploy'
+    - 'SetPermissions'
+  when: drupal.install_extra_dirs|default(true)
+
 - name: "Make htaccess read-only"
   file:
     path='{{ webRoot }}/files/{{ drupal_domain.0.shortname|default("default") }}/{{ drupal_domain.1 }}/.htaccess'
diff --git a/tasks/users/gitcomposer.yml b/tasks/users/gitcomposer.yml
index 41bc50e55ceb6f52b726a88297fb2978053d2173..38c0ff7f34b0ce5604ef21de7b3e22ea74ef0a5d 100644
--- a/tasks/users/gitcomposer.yml
+++ b/tasks/users/gitcomposer.yml
@@ -22,9 +22,12 @@
       recurse=yes
       follow=no
 
-  - name: "Extended File Modes and Ownership for Repository"
+  - name: "Extended Default File Modes and Ownership for Repository"
     command: setfacl -dRm u:root:rwX,g:{{ drupal.src.name }}:rwX,o::rX {{ webRoot }}
 
+  - name: "Extended File Modes and Ownership for Repository"
+    command: setfacl -Rm u:root:rwX,g:{{ drupal.src.name }}:rwX,o::rX {{ webRoot }}
+
   tags:
     - 'SetPermissions'
     - 'cron'
diff --git a/tasks/users/gitscript.yml b/tasks/users/gitscript.yml
index 7b9afdcb90b5ba752706fe7d1e4ff1db4cf19910..a112590eed73dcb4b5557d7b62c817ea1b83a09d 100644
--- a/tasks/users/gitscript.yml
+++ b/tasks/users/gitscript.yml
@@ -22,9 +22,12 @@
       recurse=yes
       follow=no
 
-  - name: "Extended File Modes and Ownership for Repository"
+  - name: "Extended Default File Modes and Ownership for Repository"
     command: setfacl -dRm u:root:rwX,g:{{ drupal.src.name }}:rwX,o::rX {{ webRoot }}{{ drupal.src.git.target }}
 
+  - name: "Extended File Modes and Ownership for Repository"
+    command: setfacl -Rm u:root:rwX,g:{{ drupal.src.name }}:rwX,o::rX {{ webRoot }}{{ drupal.src.git.target }}
+
   - include_tasks: gitscript_cron.yml
     when: drupal.src.cron is defined