diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 4774a9f62a..f9e971a81f 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -539,7 +539,7 @@ outputs:
                 - include_tasks: deployments.yaml
                   vars:
                     force: false
-                  with_items: "{{ '{{' }} hostvars[inventory_hostname][tripleo_role_name ~ '_pre_deployments']|default([]) {{ '}}' }}"
+                  with_items: "{{ '{{' }} hostvars[inventory_hostname]['pre_deployments_' ~ tripleo_role_name]|default([]) {{ '}}' }}"
 
                 - name: Check for previous run of NetworkConfig
                   stat:
@@ -762,7 +762,7 @@ outputs:
                 - include_tasks: deployments.yaml
                   vars:
                     force: false
-                  with_items: "{{ '{{' }} hostvars[inventory_hostname][tripleo_role_name ~ '_post_deployments']|default([]) {{ '}}' }}"
+                  with_items: "{{ '{{' }} hostvars[inventory_hostname]['post_deployments_' ~ tripleo_role_name]|default([]) {{ '}}' }}"
               tags:
                 - overcloud
                 - post_deploy_steps