diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index ca89b4497b..f2f05d667b 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -562,8 +562,15 @@ outputs:
                 bootstrap_server_id: BOOTSTRAP_SERVER_ID
                 step: '{{step}}'
                 container_cli: CONTAINER_CLI
+                update_identifier: UPDATE_IDENTIFIER
               tasks:
+                - name: Check if /var/lib/docker-container-startup-configs.json already exists
+                  stat:
+                    path: /var/lib/docker-container-startup-configs.json
+                  register: docker_container_startup_configs_json_stat
                 - import_tasks: common_deploy_steps_tasks.yaml
+                  when:
+                    - (update_identifier != "" or not docker_container_startup_configs_json_stat.stat.exists)
               tags:
                 - overcloud
                 - deploy_steps