diff --git a/roles/sap_general_preconfigure/tasks/sapnote/2369910.yml b/roles/sap_general_preconfigure/tasks/sapnote/2369910.yml
index 8e17e19e..7f8161e9 100644
--- a/roles/sap_general_preconfigure/tasks/sapnote/2369910.yml
+++ b/roles/sap_general_preconfigure/tasks/sapnote/2369910.yml
@@ -28,8 +28,12 @@
       when:
         - sap_general_preconfigure_default_locale is defined
         - sap_general_preconfigure_default_locale | length > 0
-        - __sap_general_preconfigure_locales_installed.stdout_lines | select('match', sap_general_preconfigure_default_locale | regex_replace('UTF-8', 'utf8')) | list | length > 0
-        - sap_general_preconfigure_default_locale.startswith('en_') or sap_general_preconfigure_default_locale.startswith('C.UTF-8')
+        - >
+          (__sap_general_preconfigure_locales_installed.stdout_lines | select('match', sap_general_preconfigure_default_locale) | list | length > 0) or
+          (__sap_general_preconfigure_locales_installed.stdout_lines | select('match', (sap_general_preconfigure_default_locale | regex_replace('UTF-8', 'utf8'))) | list | length > 0)
+        - >
+          sap_general_preconfigure_default_locale.startswith('en_') or
+          sap_general_preconfigure_default_locale.startswith('C.UTF-8')
       ansible.builtin.lineinfile:
         path: /etc/locale.conf
         regexp: ^LANG=