diff --git a/ansible/roles/oracle-db-bootstrap/tasks/create-database.yml b/ansible/roles/oracle-db-bootstrap/tasks/create-database.yml
index 176bc0015..716ce445f 100644
--- a/ansible/roles/oracle-db-bootstrap/tasks/create-database.yml
+++ b/ansible/roles/oracle-db-bootstrap/tasks/create-database.yml
@@ -32,3 +32,4 @@
     path: "/tmp/dbca{{ db_version }}.rsp"
     state: absent
   when: command_result.stdout is search("100%")
+  tags: remove-response-file
diff --git a/ansible/roles/oracle-oem-agent-setup/tasks/oem_target_agent_ru_upgrade.yml b/ansible/roles/oracle-oem-agent-setup/tasks/oem_target_agent_ru_upgrade.yml
index 5046ce250..8e6257cf2 100644
--- a/ansible/roles/oracle-oem-agent-setup/tasks/oem_target_agent_ru_upgrade.yml
+++ b/ansible/roles/oracle-oem-agent-setup/tasks/oem_target_agent_ru_upgrade.yml
@@ -19,6 +19,7 @@
 
     - name: Download agent RU patch
       import_tasks: download_oem_ru_software.yml
+      tags: download_oem_ru_software
 
     - name: Upgrade OEM agent Agentpatcher
       import_tasks: oms_upgrade_agentpatcher.yml
diff --git a/ansible/roles/oracle-oms-setup/tasks/download_oem_software.yml b/ansible/roles/oracle-oms-setup/tasks/download_oem_software.yml
index 6a5f89a53..87f953b4d 100644
--- a/ansible/roles/oracle-oms-setup/tasks/download_oem_software.yml
+++ b/ansible/roles/oracle-oms-setup/tasks/download_oem_software.yml
@@ -25,3 +25,5 @@
     - "em13500_linux64-3.zip"
     - "em13500_linux64-4.zip"
     - "em13500_linux64-5.zip"
+  tags:
+    - download_oem_software
diff --git a/ansible/roles/oracle-oms-setup/tasks/oem_ru_upgrade.yml b/ansible/roles/oracle-oms-setup/tasks/oem_ru_upgrade.yml
index 7d42677cf..32427d26c 100644
--- a/ansible/roles/oracle-oms-setup/tasks/oem_ru_upgrade.yml
+++ b/ansible/roles/oracle-oms-setup/tasks/oem_ru_upgrade.yml
@@ -34,4 +34,6 @@
   include_tasks: cleanup.yml
   vars:
     patch_type: agent
-  tags: patch_agent
+  tags:
+    - patch_agent
+    - cleanup