diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 4ff08008bc..b6fa671826 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -706,17 +706,6 @@ outputs:
                     force: true
                     mode: '0600'
 {% endraw %}
-                - name: Deploy step tasks for {{step}}
-                  delegate_to: localhost
-                  run_once: true
-                  debug:
-                    msg: Use --start-at-task 'Deploy step tasks for {{step}}' to resume from this task
-{%- for role in roles %}
-                - include_tasks: "{{role.name}}/deploy_steps_tasks_step{{step}}.yaml"
-                  when:
-                    - tripleo_role_name == '{{role.name}}'
-                    - "'{{role.name}}/deploy_steps_tasks_step{{step}}.yaml' is exists"
-{%- endfor %}
 {% if step == 1 %}
                 - name: Overcloud common bootstrap tasks for step 1
                   block:
@@ -735,6 +724,17 @@ outputs:
                         - ((deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or
                           not container_startup_configs_json_stat.stat.exists)
 {% endif %}
+                - name: Deploy step tasks for {{step}}
+                  delegate_to: localhost
+                  run_once: true
+                  debug:
+                    msg: Use --start-at-task 'Deploy step tasks for {{step}}' to resume from this task
+{%- for role in roles %}
+                - include_tasks: "{{role.name}}/deploy_steps_tasks_step{{step}}.yaml"
+                  when:
+                    - tripleo_role_name == '{{role.name}}'
+                    - "'{{role.name}}/deploy_steps_tasks_step{{step}}.yaml' is exists"
+{%- endfor %}
                 - name: Overcloud common deploy step tasks {{step}}
                   block:
                     - name: Overcloud common deploy step tasks {{step}}