diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml
index 95a96fa738..256e4f729f 100644
--- a/extraconfig/services/openshift-master.yaml
+++ b/extraconfig/services/openshift-master.yaml
@@ -145,15 +145,15 @@ outputs:
                 nodes:
                   - new_node: "{{origin_nodes.results | selectattr('item', 'equalto', item) | selectattr('stdout', 'equalto', 'false') | list | count > 0}}"
                     hostname: "{{item}}"
-                    ansible_user: "{{ hostvars.raw_get(item)['ansible_user'] | default(hostvars.raw_get(item)['ansible_ssh_user']) | default('root') }}"
-                    ansible_host: "{{ hostvars.raw_get(item)['ansible_host'] | default(item) }}"
+                    ansible_user: "{{ hostvars[item]['ansible_user'] | default(hostvars[item]['ansible_ssh_user']) | default('root') }}"
+                    ansible_host: "{{ hostvars[item]['ansible_host'] | default(item) }}"
                     ansible_become: true
-                    etcd_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
-                    openshift_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
-                    openshift_master_bind_addr: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
-                    openshift_public_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
-                    openshift_hostname: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
-                    openshift_public_hostname: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
+                    etcd_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_master_bind_addr: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_public_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_public_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
 
               register: all_master_nodes
               with_items: "{{groups[tripleo_role_name] | default([]) }}"
diff --git a/extraconfig/services/openshift-worker.yaml b/extraconfig/services/openshift-worker.yaml
index f28111098c..4034b9032e 100644
--- a/extraconfig/services/openshift-worker.yaml
+++ b/extraconfig/services/openshift-worker.yaml
@@ -87,14 +87,14 @@ outputs:
                 nodes:
                   - new_node: "{{origin_nodes.results | selectattr('item', 'equalto', item) | selectattr('stdout', 'equalto', 'false') | list | count > 0}}"
                     hostname: "{{item}}"
-                    ansible_user: "{{ hostvars.raw_get(item)['ansible_user'] | default(hostvars.raw_get(item)['ansible_ssh_user']) | default('root') }}"
-                    ansible_host: "{{ hostvars.raw_get(item)['ansible_host'] | default(item) }}"
+                    ansible_user: "{{ hostvars[item]['ansible_user'] | default(hostvars[item]['ansible_ssh_user']) | default('root') }}"
+                    ansible_host: "{{ hostvars[item]['ansible_host'] | default(item) }}"
                     ansible_become: true
-                    etcd_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
-                    openshift_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
-                    openshift_public_ip: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
-                    openshift_hostname: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
-                    openshift_public_hostname: "{{hostvars.raw_get(item)[openshift_master_network + '_ip']}}"
+                    etcd_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_public_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_public_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
                     openshift_schedulable: true
                     openshift_node_labels:
                       region: 'infra'