diff --git a/roles/devscripts/tasks/cleanup.yml b/roles/devscripts/tasks/cleanup.yml
index cafad3565d..0dd2f91822 100644
--- a/roles/devscripts/tasks/cleanup.yml
+++ b/roles/devscripts/tasks/cleanup.yml
@@ -15,9 +15,6 @@
 # under the License.
 
 - name: Scrub the existence of dev-scripts deployed OCP cluster.
-  tags:
-    - never
-    - deepscrub
   when: >-
     (cifmw_devscripts_ocp_comply is undefined) or
     (not cifmw_devscripts_ocp_comply) or
@@ -53,6 +50,9 @@
       poll: 10
 
     - name: Remove the SSH key generated for accessing the platform
+      tags:
+        - never
+        - deepscrub
       ansible.builtin.file:
         path: "{{ cifmw_devscripts_artifacts_dir }}/{{ item }}"
         state: absent
@@ -61,6 +61,9 @@
         - "cifmw_ocp_access_key.pub"
 
     - name: Cleanup the devscripts repo directory.
+      tags:
+        - never
+        - deepscrub
       become: true
       ansible.builtin.file:
         path: "{{ cifmw_devscripts_repo_dir }}"
@@ -68,6 +71,9 @@
         force: true
 
     - name: Cleanup the devscripts working directory.
+      tags:
+        - never
+        - deepscrub
       become: true
       ansible.builtin.file:
         path: "{{ cifmw_devscripts_config.working_dir }}"
@@ -80,6 +86,9 @@
         tasks_from: cleanup-dns.yml
 
     - name: Ensure no dangling qcow2 images
+      tags:
+        - never
+        - deepscrub
       block:
         - name: Get files
           register: _found_imgs