diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index a06fbb737d..aa37bd6e91 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -691,7 +691,9 @@ outputs:
                   run_once: true
                   debug:
                     msg: Use --start-at-task "External deployment step {{step}}" to resume from this task
-                - import_tasks: external_deploy_steps_tasks.yaml
+                - include_tasks: "external_deploy_steps_tasks_step{{step}}.yaml"
+                  when:
+                    - "'external_deploy_steps_tasks_step{{step}}.yaml' is exists"
               tags:
                 - external
                 - external_deploy_steps