diff --git a/roles/deploy_code/defaults/main.yml b/roles/deploy_code/defaults/main.yml
index f9b84739..7b68c3a7 100644
--- a/roles/deploy_code/defaults/main.yml
+++ b/roles/deploy_code/defaults/main.yml
@@ -35,6 +35,8 @@ deploy_code:
   service_action: reload
   # Trigger an API call to rebuild infra after a deploy, e.g. if you need to repack an AMI.
   rebuild_infra: false
+  # Used to skip tasks to fix ownership and permissions, drupal needs this set to true by default
+  fix_cleanup_perms: true
   # Details of API call to trigger. See api_call role.
   api_call:
     type: gitlab
diff --git a/roles/deploy_code/tasks/cleanup.yml b/roles/deploy_code/tasks/cleanup.yml
index b3a4f132..870f86b7 100644
--- a/roles/deploy_code/tasks/cleanup.yml
+++ b/roles/deploy_code/tasks/cleanup.yml
@@ -4,7 +4,9 @@
     cmd: "if [ -d {{ deploy_path_prefix }}{{ item }} ]; then chmod -R 777 {{ deploy_path_prefix }}{{ item }}; fi"
   with_sequence: start={{ [previous_build_number | int - cleanup_history_depth, 0] | max }}  end={{ [previous_build_number | int - deploy_code.keep, 0] | max }}
   become: true
-  when: "www_user != deploy_user"
+  when:
+    - "www_user != deploy_user"
+    - deploy_code.fix_cleanup_perms
 
 - name: Ensure permissions are set on deploy directory.
   ansible.builtin.shell: