diff --git a/roles/_meta/deploy-drupal7/tasks/main.yml b/roles/_meta/deploy-drupal7/tasks/main.yml
index 1e453758..93e6b1b7 100644
--- a/roles/_meta/deploy-drupal7/tasks/main.yml
+++ b/roles/_meta/deploy-drupal7/tasks/main.yml
@@ -18,8 +18,6 @@
     name: database_backup
 - import_role:
     name: config_generate
-- import_role:
-    name: cache_clear/cache_clear-drupal7
 - import_role:
     name: database_apply
 - import_role:
diff --git a/roles/_meta/deploy-drupal8/tasks/main.yml b/roles/_meta/deploy-drupal8/tasks/main.yml
index 4a8e0204..50804566 100644
--- a/roles/_meta/deploy-drupal8/tasks/main.yml
+++ b/roles/_meta/deploy-drupal8/tasks/main.yml
@@ -20,8 +20,6 @@
     name: database_backup
 - import_role:
     name: config_generate
-- import_role:
-    name: cache_clear/cache_clear-drupal8
 - import_role:
     name: database_apply
 - import_role:
diff --git a/roles/database_apply/database_apply-drupal8/tasks/main.yml b/roles/database_apply/database_apply-drupal8/tasks/main.yml
index dc138585..23cb0b3b 100644
--- a/roles/database_apply/database_apply-drupal8/tasks/main.yml
+++ b/roles/database_apply/database_apply-drupal8/tasks/main.yml
@@ -32,6 +32,11 @@
     loop_var: site
   when: previous_build_number == 0 or (site.force_install is defined and site.force_install)
 
+- name: Clear the cache.
+  ansible.builtin.include_role:
+    name: "cache_clear/cache_clear-{{ project_type }}"
+  when: previous_build_number > 0
+
 - name: Apply Drupal database updates.
   command:
     cmd: "{{ drush_bin }} -l {{ site.folder }} -y updb"