diff --git a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/assert-configuration.yml b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/assert-configuration.yml
index 8b1b4f59..379ea44e 100644
--- a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/assert-configuration.yml
+++ b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/assert-configuration.yml
@@ -37,8 +37,8 @@
   register: __sap_hypervisor_node_preconfigure_cpu_stepping_output_assert
   changed_when: __sap_hypervisor_node_preconfigure_cpu_stepping_output_assert.rc != 0
 
-- name: register stepping as fact
-  set_fact:
+- name: Register stepping as fact
+  ansible.builtin.set_fact:
     __sap_hypervisor_node_preconfigure_cpu_stepping_assert: "{{ __sap_hypervisor_node_preconfigure_cpu_stepping_output_assert.stdout }}"
 
 - name: Print CPU Stepping
@@ -47,6 +47,7 @@
 
 # skylake:
 - name: Assert - Check Intel Skylake CPU Platform
+  when: __sap_hypervisor_node_preconfigure_cpu_stepping_assert == "4"
   block:
     - name: Get ple_gap
       ansible.builtin.command: grep -E '^options\s+kvm_intel.*?ple_gap\s*=\s*0.*$' /etc/modprobe.d/kvm.conf
@@ -67,9 +68,9 @@
         fail_msg: "FAIL: spectre_v2=retpoline is not on Kernel command line"
         success_msg: "PASS: spectre_v2=retpoline is on Kernel command line"
       ignore_errors: "{{ sap_hypervisor_node_preconfigure_ignore_failed_assertion }}"
-  when: __sap_hypervisor_node_preconfigure_cpu_stepping_assert == "4"
 
 - name: Assert - check sap_hypervisor_node_preconfigure_nx_huge_pages
+  when: sap_hypervisor_node_preconfigure_nx_huge_pages is defined
   block:
     - name: "Assert - Check kvm.nx_huge_pages is {{ sap_hypervisor_node_preconfigure_nx_huge_pages }}"
       ansible.builtin.assert:
@@ -78,8 +79,6 @@
         success_msg: "PASS: kvm.nx_huge_pages is {{ sap_hypervisor_node_preconfigure_nx_huge_pages }}"
       ignore_errors: "{{ sap_hypervisor_node_preconfigure_ignore_failed_assertion }}"
 
-  when: sap_hypervisor_node_preconfigure_nx_huge_pages is defined
-
 - name: Assert - check seccomp_sanbox=0
   block:
     - name: Get seccomp setting
@@ -104,7 +103,7 @@
 
     - name: "Check that at least {{ sap_hypervisor_node_preconfigure_reserved_ram }} GB are available for the hypervisor and the rest are 1G hugepages"
       ansible.builtin.assert:
-        that: "{{ ( ansible_memtotal_mb / 1024 )|int - sap_hypervisor_node_preconfigure_reserved_ram }} >= {{ __sap_hypervisor_node_preconfigure_1Ghugepages_assert.stdout }}"
+        that: "{{ (ansible_memtotal_mb / 1024) | int - sap_hypervisor_node_preconfigure_reserved_ram }} >= {{ __sap_hypervisor_node_preconfigure_1g_hugepages_assert.stdout }}"
         fail_msg: "FAIL: Not enough memory reserved for hypervisor"
         success_msg: "PASS: Enough memory reserved for hypervisor"
       ignore_errors: "{{ sap_hypervisor_node_preconfigure_ignore_failed_assertion }}"
diff --git a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/configuration.yml b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/configuration.yml
index 8bd29ba8..b49399e4 100644
--- a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/configuration.yml
+++ b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/configuration.yml
@@ -19,7 +19,7 @@
   changed_when: cpu_stepping_output.rc != 0
 
 - name: Register CPU stepping as fact
-  set_fact:
+  ansible.builtin.set_fact:
     cpu_stepping: "{{ cpu_stepping_output.stdout }}"
   become: true
   become_user: root
@@ -92,7 +92,7 @@
   with_items:
     - default_hugepagesz=1GB
     - hugepagesz=1GB
-    - hugepages={{ ( ansible_memtotal_mb / 1024 )|int - sap_hypervisor_node_preconfigure_reserved_ram }}
+    - hugepages={{ (ansible_memtotal_mb / 1024) | int - sap_hypervisor_node_preconfigure_reserved_ram }}
   notify: __sap_hypervisor_node_preconfigure_regenerate_grub2_conf_handler
   tags: grubconfig
   when: sap_hypervisor_node_preconfigure_reserve_hugepages == "static"
diff --git a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/main.yml b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/main.yml
index 213a45bc..b14b4ee7 100644
--- a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/main.yml
+++ b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_rhel_kvm/main.yml
@@ -13,13 +13,17 @@
     assert_prefix: "assert-"
   when: sap_hypervisor_node_preconfigure_assert|d(false)
 
-- include_tasks: '{{ assert_prefix }}installation.yml'
+- name: Include "{{ assert_prefix }}installation.yml"
+  ansible.builtin.include_tasks: '{{ assert_prefix }}installation.yml'
 
-- include_tasks: '{{ assert_prefix }}configuration.yml'
+- name: Include "{{ assert_prefix }}configuration.yml"
+  ansible.builtin.include_tasks: '{{ assert_prefix }}configuration.yml'
 
-- include_tasks: '{{ assert_prefix }}set-tuned-profile.yml'
+- name: Include "{{ assert_prefix }}set-tuned-profile.yml"
+  ansible.builtin.i include_tasks: '{{ assert_prefix }}set-tuned-profile.yml'
 
-- include_tasks: "{{ assert_prefix }}rhv-hooks.yml"
+- name: Include "{{ assert_prefix }}rhv-hooks.yml"
+  ansible.builtin.include_tasks: "{{ assert_prefix }}rhv-hooks.yml"
   loop:
     - "{{ role_path }}/tasks/platform/{{ sap_hypervisor_node_platform }}/50_hana"
     - "{{ role_path }}/tasks/platform/{{ sap_hypervisor_node_platform }}/50_iothread_pinning"