diff --git a/roles/sap_general_preconfigure/tasks/sapnote/3562909.yml b/roles/sap_general_preconfigure/tasks/sapnote/3562909.yml
index b671d6399..805395061 100644
--- a/roles/sap_general_preconfigure/tasks/sapnote/3562909.yml
+++ b/roles/sap_general_preconfigure/tasks/sapnote/3562909.yml
@@ -4,7 +4,7 @@
 - name: Configure - Display SAP note number 3562909 and its version
   ansible.builtin.debug:
     msg: "SAP note {{ (__sap_general_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562909$') | first).number }}
-          (version {{ (__sap_general_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562909$') | first).version }}): Configure RHEL 9"
+          (version {{ (__sap_general_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562909$') | first).version }}): Configure RHEL 10"
   tags:
     - always
 
diff --git a/roles/sap_general_preconfigure/tasks/sapnote/assert-3562909.yml b/roles/sap_general_preconfigure/tasks/sapnote/assert-3562909.yml
index 5237ed50a..6c9eebb9b 100644
--- a/roles/sap_general_preconfigure/tasks/sapnote/assert-3562909.yml
+++ b/roles/sap_general_preconfigure/tasks/sapnote/assert-3562909.yml
@@ -4,7 +4,7 @@
 - name: Assert - Display SAP note number 3562909 and its version
   ansible.builtin.debug:
     msg: "SAP note {{ (__sap_general_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562909$') | first).number }}
-          (version {{ (__sap_general_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562909$') | first).version }}): Configure RHEL 9"
+          (version {{ (__sap_general_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562909$') | first).version }}): Configure RHEL 10"
   tags:
     - always
 
diff --git a/roles/sap_hana_preconfigure/tasks/sapnote/3108302.yml b/roles/sap_hana_preconfigure/tasks/sapnote/3108302.yml
index f2cf27499..2061a6f89 100644
--- a/roles/sap_hana_preconfigure/tasks/sapnote/3108302.yml
+++ b/roles/sap_hana_preconfigure/tasks/sapnote/3108302.yml
@@ -3,7 +3,7 @@
 - name: Configure - Display SAP note number 3108302 and its version
   ansible.builtin.debug:
     msg: "SAP note {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3108302$') | first).number }}
-          (version {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3108302$') | first).version }}): SAP HANA settings for RHEL 8"
+          (version {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3108302$') | first).version }}): SAP HANA settings for RHEL 9"
 
 - name: Import tasks from '3108302/01-configure-selinux.yml'
   ansible.builtin.import_tasks: 3108302/01-configure-selinux.yml
diff --git a/roles/sap_hana_preconfigure/tasks/sapnote/3562919.yml b/roles/sap_hana_preconfigure/tasks/sapnote/3562919.yml
index 78dec9ec3..2ad051be4 100644
--- a/roles/sap_hana_preconfigure/tasks/sapnote/3562919.yml
+++ b/roles/sap_hana_preconfigure/tasks/sapnote/3562919.yml
@@ -3,7 +3,7 @@
 - name: Configure - Display SAP note number 3562919 and its version
   ansible.builtin.debug:
     msg: "SAP note {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562919$') | first).number }}
-          (version {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562919$') | first).version }}): SAP HANA settings for RHEL 8"
+          (version {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562919$') | first).version }}): SAP HANA settings for RHEL 10"
 
 - name: Import tasks from '3562919/01-configure-selinux.yml'
   ansible.builtin.import_tasks: 3562919/01-configure-selinux.yml
diff --git a/roles/sap_hana_preconfigure/tasks/sapnote/assert-3108302.yml b/roles/sap_hana_preconfigure/tasks/sapnote/assert-3108302.yml
index 972a11a61..62220f026 100644
--- a/roles/sap_hana_preconfigure/tasks/sapnote/assert-3108302.yml
+++ b/roles/sap_hana_preconfigure/tasks/sapnote/assert-3108302.yml
@@ -3,7 +3,7 @@
 - name: Assert - Display SAP note number 3108302 and its version
   ansible.builtin.debug:
     msg: "SAP note {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3108302$') | first).number }}
-          (version {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3108302$') | first).version }}): SAP HANA settings for RHEL 8"
+          (version {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3108302$') | first).version }}): SAP HANA settings for RHEL 9"
 
 - name: Import tasks from '3108302/01-assert-selinux.yml'
   ansible.builtin.import_tasks: 3108302/01-assert-selinux.yml
diff --git a/roles/sap_hana_preconfigure/tasks/sapnote/assert-3562919.yml b/roles/sap_hana_preconfigure/tasks/sapnote/assert-3562919.yml
index f651bf786..44567974b 100644
--- a/roles/sap_hana_preconfigure/tasks/sapnote/assert-3562919.yml
+++ b/roles/sap_hana_preconfigure/tasks/sapnote/assert-3562919.yml
@@ -3,7 +3,7 @@
 - name: Assert - Display SAP note number 3562919 and its version
   ansible.builtin.debug:
     msg: "SAP note {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562919$') | first).number }}
-          (version {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562919$') | first).version }}): SAP HANA settings for RHEL 8"
+          (version {{ (__sap_hana_preconfigure_sapnotes_versions | selectattr('number', 'match', '^3562919$') | first).version }}): SAP HANA settings for RHEL 10"
 
 - name: Import tasks from '3562919/01-assert-selinux.yml'
   ansible.builtin.import_tasks: 3562919/01-assert-selinux.yml