diff --git a/deployment/ipa/ipaservices-baremetal-ansible.yaml b/deployment/ipa/ipaservices-baremetal-ansible.yaml
index 7bf9970b26..1e58ee7677 100644
--- a/deployment/ipa/ipaservices-baremetal-ansible.yaml
+++ b/deployment/ipa/ipaservices-baremetal-ansible.yaml
@@ -124,18 +124,24 @@ outputs:
         - name: enroll the node as an ipa client
           when: step|int == 1
           vars:
-            state: present
-            ipaclient_otp: "{{ ipa_host_otp }}"
-            idm_enroll_base_server: {get_param: IdMEnrollBaseServer}
-            ipaclient_mkhomedir: {get_param: MakeHomeDir}
-            ipaclient_domain: {get_param: IdMDomain}
-            ipaclient_no_ntp: {get_param: IdMNoNtpSetup}
-            ipaclient_force: yes
-            ipaclient_servers: {get_param: IdMServer}
-            ipaclient_hostname: "{{ fqdn_canonical }}"
-            ipaclient_install_packages: {get_param: IdMInstallClientPackages}
-            ipaclients:
-              - "{{ inventory_hostname }}"
+            map_merge:
+              -
+                state: present
+                ipaclient_otp: "{{ ipa_host_otp }}"
+                idm_enroll_base_server: {get_param: IdMEnrollBaseServer}
+                ipaclient_mkhomedir: {get_param: MakeHomeDir}
+                ipaclient_no_ntp: {get_param: IdMNoNtpSetup}
+                ipaclient_force: yes
+                ipaclient_hostname: "{{ fqdn_canonical }}"
+                ipaclient_install_packages: {get_param: IdMInstallClientPackages}
+                ipaclients:
+                  - "{{ inventory_hostname }}"
+              -
+                if:
+                - idm_server_provided
+                - ipaclient_servers: {get_param: IdMServer}
+                  ipaclient_domain: {get_param: IdMDomain}
+                - {}
           block:
             - name: check if default.conf exists
               stat: