diff --git a/roles/_meta/deploy-drupal8/tasks/main.yml b/roles/_meta/deploy-drupal8/tasks/main.yml
index 6ce31d4f..3e66875b 100644
--- a/roles/_meta/deploy-drupal8/tasks/main.yml
+++ b/roles/_meta/deploy-drupal8/tasks/main.yml
@@ -20,14 +20,14 @@
     name: database_backup
 - import_role:
     name: config_generate
+- import_role:
+    name: cache_clear/cache_clear-opcache
 - import_role:
     name: database_apply
 - import_role:
     name: sanitize/admin_creds
 - import_role:
     name: live_symlink
-- import_role:
-    name: cache_clear/cache_clear-opcache
 - import_role:
     name: cache_clear/cache_clear-drupal8
 - import_role:
diff --git a/roles/database_apply/database_apply-drupal7/tasks/main.yml b/roles/database_apply/database_apply-drupal7/tasks/main.yml
index 4f476253..3012032f 100644
--- a/roles/database_apply/database_apply-drupal7/tasks/main.yml
+++ b/roles/database_apply/database_apply-drupal7/tasks/main.yml
@@ -26,11 +26,6 @@
     name: "cache_clear/cache_clear-{{ project_type }}"
   when: previous_build_number > 0
 
-- name: Clear the opcache.
-  ansible.builtin.include_role:
-    name: cache_clear/cache_clear-opcache
-  when: previous_build_number > 0
-
 - name: Apply Drupal database updates.
   ansible.builtin.shell:
     cmd: "{{ drush_bin }} -l {{ site.folder }} -y updb"
diff --git a/roles/database_apply/database_apply-drupal8/tasks/main.yml b/roles/database_apply/database_apply-drupal8/tasks/main.yml
index 4dc66a3a..c649826c 100644
--- a/roles/database_apply/database_apply-drupal8/tasks/main.yml
+++ b/roles/database_apply/database_apply-drupal8/tasks/main.yml
@@ -44,11 +44,6 @@
     - previous_build_number > 0
     - site.config_import_command != 'deploy'
 
-- name: Clear the opcache.
-  ansible.builtin.include_role:
-    name: cache_clear/cache_clear-opcache
-  when: previous_build_number > 0
-
 - name: Apply Drupal database updates.
   ansible.builtin.command:
     cmd: "{{ drush_bin }} -l {{ site.folder }} -y updb"
diff --git a/roles/deploy_code/tasks/cleanup.yml b/roles/deploy_code/tasks/cleanup.yml
index db2bb9bb..b3a4f132 100644
--- a/roles/deploy_code/tasks/cleanup.yml
+++ b/roles/deploy_code/tasks/cleanup.yml
@@ -150,7 +150,7 @@
     - deploy_code.mount_sync is defined
     - deploy_code.mount_sync | length > 1
     - deploy_code.mount_type == "squashfs"
-    - _deploy_code_mount_check is succeeded
+    - _deploy_code_mount_check.rc == 0
     - deploy_code.services | length > 0
 
 - name: Stop any services that might be keeping the loop device busy.
@@ -166,7 +166,7 @@
     - deploy_code.mount_sync is defined
     - deploy_code.mount_sync | length > 1
     - deploy_code.mount_type == "squashfs"
-    - _deploy_code_mount_check is succeeded
+    - _deploy_code_mount_check.rc == 0
     - deploy_code.services | length > 0
 
 - name: Unmount existing SquashFS image.
@@ -177,7 +177,7 @@
     - deploy_code.mount_sync is defined
     - deploy_code.mount_sync | length > 1
     - deploy_code.mount_type == "squashfs"
-    - _deploy_code_mount_check is succeeded
+    - _deploy_code_mount_check.rc == 0
 
 - name: Mount new SquashFS image.
   ansible.builtin.command: