diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 41ccdc19b2..29bd72fb16 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -740,12 +740,10 @@ outputs:
                   debug:
                     msg: Use --start-at-task "Overcloud deploy step tasks for {{step}}" to resume from this task
 {%- for role in roles %}
-                - include_tasks: "{% raw %}{{ _task_file_path }}{% endraw %}"
-                  vars:
-                    _task_file_path: "{{role.name}}/deploy_steps_tasks_step{{step}}.yaml"
+                - include_tasks: "{{role.name}}/deploy_steps_tasks_step{{step}}.yaml"
                   when:
                     - tripleo_role_name == '{{role.name}}'
-                    - "{% raw %}'{{ playbook_dir }}/{{ _task_file_path }}' is exists{% endraw %}"
+                    - "'{{role.name}}/deploy_steps_tasks_step{{step}}.yaml' is exists"
 {%- endfor %}
 {% if step == 1 %}
                 - name: Overcloud common bootstrap tasks for step 1