diff --git a/lib/sles4sap_publiccloud.pm b/lib/sles4sap_publiccloud.pm
index 2646d998f6f4..8267be39cc8b 100644
--- a/lib/sles4sap_publiccloud.pm
+++ b/lib/sles4sap_publiccloud.pm
@@ -981,7 +981,7 @@ sub create_playbook_section_list {
 
     # SLES4SAP/HA related playbooks
     if ($args{ha_enabled}) {
-        push @playbook_list, 'pre-cluster.yaml', 'sap-hana-preconfigure.yaml -e use_sapconf=' . get_required_var('USE_SAPCONF');
+        push @playbook_list, 'pre-cluster.yaml', 'sap-hana-preconfigure.yaml -e use_sapconf=' . get_var('USE_SAPCONF', 'false');
         push @playbook_list, 'cluster_sbd_prep.yaml' if ($args{fencing} eq 'sbd');
         push @playbook_list, qw(
           sap-hana-storage.yaml
diff --git a/tests/sles4sap/publiccloud/qesap_terraform.pm b/tests/sles4sap/publiccloud/qesap_terraform.pm
index e87e5ce08758..9db55e7f0595 100644
--- a/tests/sles4sap/publiccloud/qesap_terraform.pm
+++ b/tests/sles4sap/publiccloud/qesap_terraform.pm
@@ -144,7 +144,6 @@ sub run {
     }
     set_var('SLES4SAP_OS_IMAGE_NAME', $os_image_name);
 
-    set_var_output('USE_SAPCONF', 'true');
     # This is the path where community.sles-for-sap repo
     # has been cloned.
     # Not all the conf.yaml used by this file needs it but