diff --git a/roles/ipa/server/tasks/main.yml b/roles/ipa/server/tasks/main.yml
index 55fabea5a2..0e934ef84d 100644
--- a/roles/ipa/server/tasks/main.yml
+++ b/roles/ipa/server/tasks/main.yml
@@ -615,10 +615,10 @@
     argv:
       - ipa
       - topologysegment-add
-      - leftnode="{{ inventory_hostname }}"
-      - rightnode="{{ hostvars[item]['ansible_hostname'] }}"
+      - "--leftnode={{ inventory_hostname }}"
+      - "--rightnode={{ item }}"
       - "ca"
-      - "{{ inventory_hostname + '-' + hostvars[item]['ansible_hostname'] }}"
+      - "{{ inventory_hostname + '-' + item }}"
   with_items: "{{ (env == 'production')|ternary(groups['ipa'], groups['ipa_stg']) }}"
   ignore_errors: true
   tags:
@@ -632,10 +632,10 @@
     argv:
       - ipa
       - topologysegment-add
-      - leftnode="{{ inventory_hostname }}"
-      - rightnode="{{ hostvars[item]['ansible_hostname'] }}"
+      - "--leftnode={{ inventory_hostname }}"
+      - "--rightnode={{ item }}"
       - "domain"
-      - "{{ inventory_hostname + '-' + hostvars[item]['ansible_hostname'] }}"
+      - "{{ inventory_hostname + '-' + item }}"
   with_items: "{{ (env == 'production')|ternary(groups['ipa'], groups['ipa_stg']) }}"
   ignore_errors: true
   tags: