diff --git a/ansible/roles/openshift-4-cluster/tasks/create.yml b/ansible/roles/openshift-4-cluster/tasks/create.yml
index 1a42ca86..efab5b4c 100644
--- a/ansible/roles/openshift-4-cluster/tasks/create.yml
+++ b/ansible/roles/openshift-4-cluster/tasks/create.yml
@@ -137,4 +137,6 @@
 
 - name: Include post installation tasks
   ansible.builtin.include_tasks: post-install.yml
-  tags: post-install
+  tags: 
+    - post-install
+    - post-install-add-ons
diff --git a/ansible/roles/openshift-4-cluster/tasks/post-install-add-ons.yml b/ansible/roles/openshift-4-cluster/tasks/post-install-add-ons.yml
index 1919e03a..deb8cc91 100644
--- a/ansible/roles/openshift-4-cluster/tasks/post-install-add-ons.yml
+++ b/ansible/roles/openshift-4-cluster/tasks/post-install-add-ons.yml
@@ -1,11 +1,20 @@
 ---
 - name: Include vars of stuff.yaml into the 'stuff' variable (2.2).
   ansible.builtin.include_vars: "{{ playbook_dir }}/../add-ons.yml"
+  tags:
+    - post-install
+    - add-ons
+    - post-install-add-ons
 
 - name: "Handle post_install_add_ons (include_role)"
   ansible.builtin.include_role:
     name: "{{ item.name }}"
     tasks_from: "{{ item.tasks_from | default('main.yml') }}"
+    apply:
+      tags:
+        - post-install
+        - add-ons
+        - post-install-add-ons
   tags:
     - post-install
     - add-ons