diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 606087e01a05051278e8842bfecb5fa334403bf8..6434bd1d867c97fe1beee3bd0cd9ca34158ba4cc 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -35,7 +35,7 @@
     domain: "{{ ipaserver_domain | default(ipaclient_domain) | default(omit) }}"
     servers: "{{ ipaclient_servers | default(omit) }}"
     realm: "{{ ipaserver_realm | default(ipaclient_realm) | default(omit) }}"
-    hostname: "{{ ipaclient_hostname | default(ansible_fqdn) }}"
+    hostname: "{{ ipaclient_hostname | default(omit) }}"
     ntp_servers: "{{ ipaclient_ntp_servers | default(omit) }}"
     ntp_pool: "{{ ipaclient_ntp_pool | default(omit) }}"
     no_ntp: "{{ ipaclient_no_ntp }}"
@@ -166,8 +166,8 @@
 
   - name: Install - Backup and set hostname
     ipaclient_set_hostname:
-      hostname: "{{ result_ipaclient_test.hostname }}"
-    when: not ipaclient_on_master | bool
+      hostname: "{{ ipaclient_hostname }}"
+    when: not ipaclient_on_master | bool and ipaclient_hostname is defined
 
   - name: Install - Join IPA
     ipaclient_join:
diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml
index 47279a0c14ca9fe90ecc14f7646004b680dba868..334b745dbfd2568cf76032e6c8fd780a48658a52 100644
--- a/roles/ipareplica/tasks/install.yml
+++ b/roles/ipareplica/tasks/install.yml
@@ -42,7 +42,7 @@
     domain: "{{ ipareplica_domain | default(ipaserver_domain) | default(omit) }}"
     servers: "{{ groups.ipaservers | default(groups.ipaserver) | default(omit) }}"
     realm: "{{ ipareplica_realm | default(omit) }}"
-    hostname: "{{ ipareplica_hostname | default(ansible_fqdn) }}"
+    hostname: "{{ ipareplica_hostname | default(omit) }}"
     ca_cert_files: "{{ ipareplica_ca_cert_files | default([]) }}"
     ### server ###
     setup_adtrust: "{{ ipareplica_setup_adtrust }}"
diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index 32374f32fe9c2a33ab0ac99e9fb69a60c4a1d0fd..2e6528475361d5338bcaf3f64c34ab1dfb5436ef 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -36,7 +36,7 @@
     ip_addresses: "{{ ipaserver_ip_addresses | default([]) }}"
     domain: "{{ ipaserver_domain | default(omit) }}"
     realm: "{{ ipaserver_realm | default(omit) }}"
-    hostname: "{{ ipaserver_hostname | default(ansible_fqdn) }}"
+    hostname: "{{ ipaserver_hostname | default(omit) }}"
     ca_cert_files: "{{ ipaserver_ca_cert_files | default(omit) }}"
     no_host_dns: "{{ ipaserver_no_host_dns }}"
     ### server ###