diff --git a/tasks/users/gitcomposer.yml b/tasks/users/gitcomposer.yml
index 38c0ff7f34b0ce5604ef21de7b3e22ea74ef0a5d..a52dbfe3bbd5810dffb6a397b7f8441f2614ed40 100644
--- a/tasks/users/gitcomposer.yml
+++ b/tasks/users/gitcomposer.yml
@@ -28,6 +28,4 @@
   - 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'
+  tags: 'SetPermissions'
diff --git a/tasks/users/gitscript.yml b/tasks/users/gitscript.yml
index a112590eed73dcb4b5557d7b62c817ea1b83a09d..ef00a78ca1662b376d1544cc524e2837443b3826 100644
--- a/tasks/users/gitscript.yml
+++ b/tasks/users/gitscript.yml
@@ -28,9 +28,9 @@
   - 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
+  tags: 'SetPermissions'
+
+- include_tasks: gitscript_cron.yml
+  when: drupal.src.cron is defined
+  tags: 'cron'
 
-  tags:
-    - 'SetPermissions'
-    - 'cron'
diff --git a/tasks/users/gitscript_cron.yml b/tasks/users/gitscript_cron.yml
index 72e001bbd6a2a81b9a35865967e03ca34e260304..1872bdba8541183ce27532d6e3a376b1fa9902ba 100644
--- a/tasks/users/gitscript_cron.yml
+++ b/tasks/users/gitscript_cron.yml
@@ -26,6 +26,4 @@
       user='root'
       disabled='{{ crons_disabled|default(false) }}'
 
-  tags:
-    - 'SetPermissions'
-    - 'cron'
+  tags: 'SetPermissions'