diff --git a/roles/sap_general_preconfigure/tasks/sapnote/2002167.yml b/roles/sap_general_preconfigure/tasks/sapnote/2002167.yml
index caece4ac8..b067cfc15 100644
--- a/roles/sap_general_preconfigure/tasks/sapnote/2002167.yml
+++ b/roles/sap_general_preconfigure/tasks/sapnote/2002167.yml
@@ -11,28 +11,33 @@
   ansible.builtin.import_tasks: 2002167/02-configuration-changes.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2002167_02 | d(false)
   tags:
+    - sap_general_preconfigure_2002167
     - sap_general_preconfigure_2002167_02
 
 - name: Import tasks from '2002167/03-setting-the-hostname.yml'
   ansible.builtin.import_tasks: 2002167/03-setting-the-hostname.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2002167_03 | d(false)
   tags:
+    - sap_general_preconfigure_2002167
     - sap_general_preconfigure_2002167_03
 
 - name: Import tasks from '2002167/04-linux-kernel-parameters.yml'
   ansible.builtin.import_tasks: 2002167/04-linux-kernel-parameters.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2002167_04 | d(false)
   tags:
+    - sap_general_preconfigure_2002167
     - sap_general_preconfigure_2002167_04
 
 - name: Import tasks from '2002167/05-process-resource-limits.yml'
   ansible.builtin.import_tasks: 2002167/05-process-resource-limits.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2002167_05 | d(false)
   tags:
+    - sap_general_preconfigure_2002167
     - sap_general_preconfigure_2002167_05
 
 - name: Import tasks from '2002167/06-additional-notes-for-installing-sap-systems.yml'
   ansible.builtin.import_tasks: 2002167/06-additional-notes-for-installing-sap-systems.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2002167_06 | d(false)
   tags:
+    - sap_general_preconfigure_2002167
     - sap_general_preconfigure_2002167_06
diff --git a/roles/sap_general_preconfigure/tasks/sapnote/2772999.yml b/roles/sap_general_preconfigure/tasks/sapnote/2772999.yml
index a42ba39ab..45f614357 100644
--- a/roles/sap_general_preconfigure/tasks/sapnote/2772999.yml
+++ b/roles/sap_general_preconfigure/tasks/sapnote/2772999.yml
@@ -11,52 +11,61 @@
   ansible.builtin.import_tasks: 2772999/02-configure-selinux.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_02 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_02
 
 - name: Import tasks from '2772999/03-configure-hostname.yml'
   ansible.builtin.import_tasks: 2772999/03-configure-hostname.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_03 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_03
 
 - name: Import tasks from '2772999/04-configure-network-time-and-date.yml'
   ansible.builtin.import_tasks: 2772999/04-configure-network-time-and-date.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_04 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_04
 
 - name: Import tasks from '2772999/05-configure-firewall.yml'
   ansible.builtin.import_tasks: 2772999/05-configure-firewall.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_05 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_05
 
 - name: Import tasks from '2772999/06-configure-uuidd.yml'
   ansible.builtin.import_tasks: 2772999/06-configure-uuidd.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_06 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_06
 
 - name: Import tasks from '2772999/07-configure-tmpfs.yml'
   ansible.builtin.import_tasks: 2772999/07-configure-tmpfs.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_07 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_07
 
 - name: Import tasks from '2772999/08-configure-linux-kernel-parameters.yml'
   ansible.builtin.import_tasks: 2772999/08-configure-linux-kernel-parameters.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_08 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_08
 
 - name: Import tasks from '2772999/09-configure-process-resource-limits.yml'
   ansible.builtin.import_tasks: 2772999/09-configure-process-resource-limits.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_09 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_09
 
 - name: Import tasks from '2772999/10-configure-systemd-tmpfiles.yml'
   ansible.builtin.import_tasks: 2772999/10-configure-systemd-tmpfiles.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_10 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_10
diff --git a/roles/sap_general_preconfigure/tasks/sapnote/3108316.yml b/roles/sap_general_preconfigure/tasks/sapnote/3108316.yml
index 4a58fb5a4..18e94b534 100644
--- a/roles/sap_general_preconfigure/tasks/sapnote/3108316.yml
+++ b/roles/sap_general_preconfigure/tasks/sapnote/3108316.yml
@@ -11,52 +11,61 @@
   ansible.builtin.import_tasks: 3108316/02-configure-selinux.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_02 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_02
 
 - name: Import tasks from '3108316/03-configure-hostname.yml'
   ansible.builtin.import_tasks: 3108316/03-configure-hostname.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_03 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_03
 
 - name: Import tasks from '3108316/04-configure-network-time-and-date.yml'
   ansible.builtin.import_tasks: 3108316/04-configure-network-time-and-date.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_04 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_04
 
 - name: Import tasks from '3108316/05-configure-firewall.yml'
   ansible.builtin.import_tasks: 3108316/05-configure-firewall.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_05 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_05
 
 - name: Import tasks from '3108316/06-configure-uuidd.yml'
   ansible.builtin.import_tasks: 3108316/06-configure-uuidd.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_06 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_06
 
 - name: Import tasks from '3108316/07-configure-tmpfs.yml'
   ansible.builtin.import_tasks: 3108316/07-configure-tmpfs.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_07 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_07
 
 - name: Import tasks from '3108316/08-configure-linux-kernel-parameters.yml'
   ansible.builtin.import_tasks: 3108316/08-configure-linux-kernel-parameters.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_08 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_08
 
 - name: Import tasks from '3108316/09-configure-process-resource-limits.yml'
   ansible.builtin.import_tasks: 3108316/09-configure-process-resource-limits.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_09 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_09
 
 - name: Import tasks from '3108316/10-configure-systemd-tmpfiles.yml'
   ansible.builtin.import_tasks: 3108316/10-configure-systemd-tmpfiles.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_10 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_10
diff --git a/roles/sap_general_preconfigure/tasks/sapnote/assert-2002167.yml b/roles/sap_general_preconfigure/tasks/sapnote/assert-2002167.yml
index 811da3620..12040584c 100644
--- a/roles/sap_general_preconfigure/tasks/sapnote/assert-2002167.yml
+++ b/roles/sap_general_preconfigure/tasks/sapnote/assert-2002167.yml
@@ -11,28 +11,33 @@
   ansible.builtin.import_tasks: 2002167/02-assert-configuration-changes.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2002167_02 | d(false)
   tags:
+    - sap_general_preconfigure_2002167
     - sap_general_preconfigure_2002167_02
 
 - name: Import tasks from '2002167/03-assert-setting-the-hostname.yml'
   ansible.builtin.import_tasks: 2002167/03-assert-setting-the-hostname.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2002167_03 | d(false)
   tags:
+    - sap_general_preconfigure_2002167
     - sap_general_preconfigure_2002167_03
 
 - name: Import tasks from '2002167/04-assert-linux-kernel-parameters.yml'
   ansible.builtin.import_tasks: 2002167/04-assert-linux-kernel-parameters.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2002167_04 | d(false)
   tags:
+    - sap_general_preconfigure_2002167
     - sap_general_preconfigure_2002167_04
 
 - name: Import tasks from '2002167/05-assert-process-resource-limits.yml'
   ansible.builtin.import_tasks: 2002167/05-assert-process-resource-limits.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2002167_05 | d(false)
   tags:
+    - sap_general_preconfigure_2002167
     - sap_general_preconfigure_2002167_05
 
 - name: Import tasks from '2002167/06-assert-additional-notes-for-installing-sap-systems.yml'
   ansible.builtin.import_tasks: 2002167/06-assert-additional-notes-for-installing-sap-systems.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2002167_06 | d(false)
   tags:
+    - sap_general_preconfigure_2002167
     - sap_general_preconfigure_2002167_06
diff --git a/roles/sap_general_preconfigure/tasks/sapnote/assert-2772999.yml b/roles/sap_general_preconfigure/tasks/sapnote/assert-2772999.yml
index 744687def..504404264 100644
--- a/roles/sap_general_preconfigure/tasks/sapnote/assert-2772999.yml
+++ b/roles/sap_general_preconfigure/tasks/sapnote/assert-2772999.yml
@@ -11,52 +11,61 @@
   ansible.builtin.import_tasks: 2772999/02-assert-selinux.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_02 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_02
 
 - name: Import tasks from '2772999/03-assert-hostname.yml'
   ansible.builtin.import_tasks: 2772999/03-assert-hostname.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_03 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_03
 
 - name: Import tasks from '2772999/04-assert-network-time-and-date.yml'
   ansible.builtin.import_tasks: 2772999/04-assert-network-time-and-date.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_04 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_04
 
 - name: Import tasks from '2772999/05-assert-firewall.yml'
   ansible.builtin.import_tasks: 2772999/05-assert-firewall.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_05 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_05
 
 - name: Import tasks from '2772999/06-assert-uuidd.yml'
   ansible.builtin.import_tasks: 2772999/06-assert-uuidd.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_06 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_06
 
 - name: Import tasks from '2772999/07-assert-tmpfs.yml'
   ansible.builtin.import_tasks: 2772999/07-assert-tmpfs.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_07 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_07
 
 - name: Import tasks from '2772999/08-assert-linux-kernel-parameters.yml'
   ansible.builtin.import_tasks: 2772999/08-assert-linux-kernel-parameters.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_08 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_08
 
 - name: Import tasks from '2772999/09-assert-process-resource-limits.yml'
   ansible.builtin.import_tasks: 2772999/09-assert-process-resource-limits.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_09 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_09
 
 - name: Import tasks from '2772999/10-assert-systemd-tmpfiles.yml'
   ansible.builtin.import_tasks: 2772999/10-assert-systemd-tmpfiles.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_2772999_10 | d(false)
   tags:
+    - sap_general_preconfigure_2772999
     - sap_general_preconfigure_2772999_10
diff --git a/roles/sap_general_preconfigure/tasks/sapnote/assert-3108316.yml b/roles/sap_general_preconfigure/tasks/sapnote/assert-3108316.yml
index d9ce9960f..b80204cd2 100644
--- a/roles/sap_general_preconfigure/tasks/sapnote/assert-3108316.yml
+++ b/roles/sap_general_preconfigure/tasks/sapnote/assert-3108316.yml
@@ -11,52 +11,61 @@
   ansible.builtin.import_tasks: 3108316/02-assert-selinux.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_02 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_02
 
 - name: Import tasks from '3108316/03-assert-hostname.yml'
   ansible.builtin.import_tasks: 3108316/03-assert-hostname.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_03 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_03
 
 - name: Import tasks from '3108316/04-assert-network-time-and-date.yml'
   ansible.builtin.import_tasks: 3108316/04-assert-network-time-and-date.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_04 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_04
 
 - name: Import tasks from '3108316/05-assert-firewall.yml'
   ansible.builtin.import_tasks: 3108316/05-assert-firewall.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_05 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_05
 
 - name: Import tasks from '3108316/06-assert-uuidd.yml'
   ansible.builtin.import_tasks: 3108316/06-assert-uuidd.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_06 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_06
 
 - name: Import tasks from '3108316/07-assert-tmpfs.yml'
   ansible.builtin.import_tasks: 3108316/07-assert-tmpfs.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_07 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_07
 
 - name: Import tasks from '3108316/08-assert-linux-kernel-parameters.yml'
   ansible.builtin.import_tasks: 3108316/08-assert-linux-kernel-parameters.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_08 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_08
 
 - name: Import tasks from '3108316/09-assert-process-resource-limits.yml'
   ansible.builtin.import_tasks: 3108316/09-assert-process-resource-limits.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_09 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_09
 
 - name: Import tasks from '3108316/10-assert-systemd-tmpfiles.yml'
   ansible.builtin.import_tasks: 3108316/10-assert-systemd-tmpfiles.yml
   when: sap_general_preconfigure_config_all | d(true) or sap_general_preconfigure_3108316_10 | d(false)
   tags:
+    - sap_general_preconfigure_3108316
     - sap_general_preconfigure_3108316_10