diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index cdd1fc07a6..fbf9dd44e0 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -337,7 +337,7 @@ outputs:
                 - include_tasks: deployments.yaml
                   vars:
                     force: false
-                  with_items: "{{ '{{' }} lookup('vars', tripleo_role_name + '_pre_deployments')|default([]) {{ '}}' }}"
+                  with_items: "{{ '{{' }} lookup('vars', 'pre_deployments_' + tripleo_role_name)|default([]) {{ '}}' }}"
 
                 - name: Hiera symlink
                   file:
@@ -471,7 +471,7 @@ outputs:
                 - include_tasks: deployments.yaml
                   vars:
                     force: false
-                  with_items: "{{ '{{' }} lookup('vars', tripleo_role_name + '_post_deployments')|default([]) {{ '}}' }}"
+                  with_items: "{{ '{{' }} lookup('vars', 'post_deployments_' + tripleo_role_name)|default([]) {{ '}}' }}"
               tags:
                 - overcloud
                 - post_deploy_steps