diff --git a/roles/_init/tasks/drupal8.yml b/roles/_init/tasks/drupal8.yml
index 19e7204d..478b4426 100644
--- a/roles/_init/tasks/drupal8.yml
+++ b/roles/_init/tasks/drupal8.yml
@@ -6,9 +6,3 @@
 - name: Define path to drush for currently live build.
   set_fact:
     drush_live_bin: "{{ drush_live_bin | default('{{ live_symlink_dest }}/vendor/bin/drush') }}"
-
-- name: Override path to drush_bin on the cleanup step.
-  set_fact:
-    drush_bin: "{{ drush_live_bin }}"
-  when:
-    - deploy_operation == 'cleanup'
diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml
index cecc89e2..21b48dc3 100644
--- a/roles/_init/tasks/main.yml
+++ b/roles/_init/tasks/main.yml
@@ -67,12 +67,6 @@
       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 e16ab252..a4a4203a 100644
--- a/roles/cache_clear/cache_clear-drupal8/tasks/main.yml
+++ b/roles/cache_clear/cache_clear-drupal8/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- 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"