diff --git a/roles/sap_swpm/tasks/pre_install.yml b/roles/sap_swpm/tasks/pre_install.yml
index fea55a694..bf08793ab 100644
--- a/roles/sap_swpm/tasks/pre_install.yml
+++ b/roles/sap_swpm/tasks/pre_install.yml
@@ -31,14 +31,22 @@
 # Firewall
 
 - name: SAP SWPM Pre Install - Firewall Setup
-  ansible.builtin.include_tasks: pre_install/firewall.yml
+  ansible.builtin.include_tasks:
+    file: pre_install/firewall.yml
+    apply:
+      tags: sap_swpm_setup_firewall
   when: "sap_swpm_setup_firewall | bool"
+  tags: sap_swpm_setup_firewall
 
 # /etc/hosts
 
 - name: SAP SWPM Pre Install - Update /etc/hosts
-  ansible.builtin.include_tasks: pre_install/update_etchosts.yml
+  ansible.builtin.include_tasks:
+    file: pre_install/update_etchosts.yml
+    apply:
+      tags: sap_swpm_update_etchosts
   when: "sap_swpm_update_etchosts | bool"
+  tags: sap_swpm_update_etchosts
 
 ################
 # Display Parameters