diff --git a/roles/_init/tasks/drupal8.yml b/roles/_init/tasks/drupal8.yml
index 3792c489..478b4426 100644
--- a/roles/_init/tasks/drupal8.yml
+++ b/roles/_init/tasks/drupal8.yml
@@ -5,4 +5,4 @@
 
 - name: Define path to drush for currently live build.
   set_fact:
-    drush_live_bin: "{{ drush_live_bin | default('{{ live_symlink_dest }}/vendor/bin/drush') }}"
\ No newline at end of file
+    drush_live_bin: "{{ drush_live_bin | default('{{ live_symlink_dest }}/vendor/bin/drush') }}"
diff --git a/roles/cache_clear/cache_clear-drupal8/tasks/main.yml b/roles/cache_clear/cache_clear-drupal8/tasks/main.yml
index f8ba1228..a4a4203a 100644
--- a/roles/cache_clear/cache_clear-drupal8/tasks/main.yml
+++ b/roles/cache_clear/cache_clear-drupal8/tasks/main.yml
@@ -1,21 +1,13 @@
 ---
-- name: Clear Drupal cache, drush is in site build dir.
-  ansible.builtin.command:
-    cmd: "{{ drush_bin }} -l {{ site_drupal.folder }} -y cr"
-    chdir: "{{ cache_clear_base_path }}/{{ webroot }}/sites/{{ site_drupal.folder }}"
-  become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
-  become_user: "{{ www_user }}"
-  with_items: "{{ drupal.sites }}"
-  loop_control:
-    loop_var: site_drupal
-  run_once: true
-  register: _drush_output
+- name: Override path to drush_bin on the cleanup step.
+  set_fact:
+    drush_bin: "{{ drush_live_bin }}"
   when:
-    - deploy_operation != 'cleanup'
+    - deploy_operation == 'cleanup'
 
-- name: Clear Drupal cache, drush is in site live dir.
+- name: Clear Drupal cache.
   ansible.builtin.command:
-    cmd: "{{ drush_live_bin }} -l {{ site_drupal.folder }} -y cr"
+    cmd: "{{ drush_bin }} -l {{ site_drupal.folder }} -y cr"
     chdir: "{{ cache_clear_base_path }}/{{ webroot }}/sites/{{ site_drupal.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
@@ -24,8 +16,6 @@
     loop_var: site_drupal
   run_once: true
   register: _drush_output
-  when:
-    - deploy_operation == 'cleanup'
 
 - name: Show drush output.
   ansible.builtin.debug: