diff --git a/tripleo_common/templates/deployments.yaml b/tripleo_common/templates/deployments.yaml
index 10b3c2e5e..14c2ad85a 100644
--- a/tripleo_common/templates/deployments.yaml
+++ b/tripleo_common/templates/deployments.yaml
@@ -6,11 +6,11 @@
 
 - name: Lookup deployment UUID
   set_fact:
-    deployment_uuid: "{{ lookup('file', tripleo_role_name ~ '/' ~ ansible_hostname | lower ~ '/' ~ item) | from_yaml | json_query(item_id) }}"
+    deployment_uuid: "{{ lookup('file', tripleo_role_name ~ '/' ~ ansible_facts['hostname'] | lower ~ '/' ~ item) | from_yaml | json_query(item_id) }}"
 
 - name: Lookup deployment group
   set_fact:
-    deployment_group: "{{ lookup('file', tripleo_role_name ~ '/' ~ ansible_hostname | lower ~ '/' ~ item) | from_yaml | json_query(item_group) }}"
+    deployment_group: "{{ lookup('file', tripleo_role_name ~ '/' ~ ansible_facts['hostname'] | lower ~ '/' ~ item) | from_yaml | json_query(item_group) }}"
 
 - name: Hiera check and diff mode
   block:
@@ -35,7 +35,7 @@
 
     - name: "Template deployment file for {{ item }}"
       template:
-        src: "{{ tripleo_role_name ~ '/' ~ ansible_hostname | lower ~ '/' ~ item }}"
+        src: "{{ tripleo_role_name ~ '/' ~ ansible_facts['hostname'] | lower ~ '/' ~ item }}"
         dest: "/var/lib/heat-config/check-mode/tripleo-config-download/{{ item ~ '-' ~ deployment_uuid }}.rendered"
         # variable_start/end are overridden since the Heat template must be
         # valid yaml, so the jinja expression must be wrapped in quotes in the
@@ -122,7 +122,7 @@
 
 - name: "Template deployment file for {{ item }}"
   template:
-    src: "{{ tripleo_role_name ~ '/' ~ ansible_hostname | lower ~ '/' ~ item }}"
+    src: "{{ tripleo_role_name ~ '/' ~ ansible_facts['hostname'] | lower ~ '/' ~ item }}"
     dest: "/var/lib/heat-config/tripleo-config-download/{{ item ~ '-' ~ deployment_uuid }}.rendered"
     # variable_start/end are overridden since the Heat template must be
     # valid yaml, so the jinja expression must be wrapped in quotes in the