diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml
index 21b48dc3..cecc89e2 100644
--- a/roles/_init/tasks/main.yml
+++ b/roles/_init/tasks/main.yml
@@ -67,6 +67,12 @@
       ansible.builtin.file:
         path: "{{ build_base_path }}"
         state: directory
+
+    - name: Override path to drush_bin on the cleanup step.
+      set_fact:
+        drush_bin: "{{ drush_live_bin }}"
+      when:
+        - deploy_operation == 'cleanup'
   when:
     - deploy_code.mount_type is defined
     - deploy_code.mount_type == "squashfs"
diff --git a/roles/cache_clear/cache_clear-drupal8/tasks/main.yml b/roles/cache_clear/cache_clear-drupal8/tasks/main.yml
index a4a4203a..e16ab252 100644
--- a/roles/cache_clear/cache_clear-drupal8/tasks/main.yml
+++ b/roles/cache_clear/cache_clear-drupal8/tasks/main.yml
@@ -1,10 +1,4 @@
 ---
-- name: Override path to drush_bin on the cleanup step.
-  set_fact:
-    drush_bin: "{{ drush_live_bin }}"
-  when:
-    - deploy_operation == 'cleanup'
-
 - name: Clear Drupal cache.
   ansible.builtin.command:
     cmd: "{{ drush_bin }} -l {{ site_drupal.folder }} -y cr"