diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 2d919389b1885f67d258173afb46653d4fa6338f..b079837d4c1ef0c8d2650537598a1640baea4476 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -13,9 +13,9 @@
 
 - name: Install - IPA discovery
   ipadiscovery:
-    domain: "{{ ipaclient_domain | default(omit) }}"
-    servers: "{{ groups.ipaservers | default(omit) }}"
-    realm: "{{ ipaclient_realm | default(omit) }}"
+    domain: "{{ ipaserver_domain | default(ipaclient_domain) | default(omit) }}"
+    servers: "{{ groups.ipaserver | default(groups.ipaservers) | default(omit) }}"
+    realm: "{{ ipaserver_realm | default(ipaclient_realm) | default(omit) }}"
     hostname: "{{ ipaclient_hostname | default(ansible_fqdn) }}"
     ca_cert_file: "{{ ipaclient_ca_cert_file | default(omit) }}"
     on_master: "{{ ipaclient_on_master }}"