diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 9a148f9d3bdaca7ac134d02ca6696794deffe3fc..57c636ee3202c5d8c938fb95d36c6d4b70d1b5bf 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(omit) }}"
+    hostname: "{{ ipaclient_hostname | default(ansible_fqdn) }}"
     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: "{{ ipaclient_hostname }}"
-    when: not ipaclient_on_master | bool and ipaclient_hostname is defined
+      hostname: "{{ result_ipaclient_test.hostname }}"
+    when: not ipaclient_on_master | bool
 
   - name: Install - Join IPA
     ipaclient_join:
diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml
index dc4c0e795260e3b11c87aa04ec3459f12cb05ab5..d441239b772d4f6ab9a23112f50bfdec8428a81c 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(omit) }}"
+    hostname: "{{ ipareplica_hostname | default(ansible_fqdn) }}"
     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 f482bc080b2d8c4f301a0870448944501352654f..e8a0917cd6a1a01c8f6d2b3ad5571201945ec327 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(omit) }}"
+    hostname: "{{ ipaserver_hostname | default(ansible_fqdn) }}"
     ca_cert_files: "{{ ipaserver_ca_cert_files | default(omit) }}"
     no_host_dns: "{{ ipaserver_no_host_dns }}"
     ### server ###