diff --git a/roles/ipa/client/tasks/common.yml b/roles/ipa/client/tasks/common.yml
index dcc5eec169..1cb244a1b3 100644
--- a/roles/ipa/client/tasks/common.yml
+++ b/roles/ipa/client/tasks/common.yml
@@ -19,4 +19,4 @@
     ipaadmin_password: "{{ ipa_admin_password }}"
     action: member
     state: present
-    host: "{{ ansible_fqdn }}"
+    host: "{{ inventory_hostname }}"
diff --git a/roles/ipa/server/tasks/main.yml b/roles/ipa/server/tasks/main.yml
index 0fc4a09a98..28d5fb1194 100644
--- a/roles/ipa/server/tasks/main.yml
+++ b/roles/ipa/server/tasks/main.yml
@@ -427,7 +427,7 @@
     - "Self-service Portal Administrators"
     user:
     - noggin
-    ipa_host: "{{ ansible_fqdn }}"
+    ipa_host: "{{ inventory_hostname }}"
     ipa_user: admin
     ipa_pass: "{{ipa_admin_password}}"
     validate_certs: no
@@ -453,7 +453,7 @@
     - admin
     - fas_sync
     - arrfab
-    ipa_host: "{{ ansible_fqdn }}"
+    ipa_host: "{{ inventory_hostname }}"
     ipa_user: admin
     ipa_pass: "{{ipa_admin_password}}"
     validate_certs: no