diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index 95a5384f5a..66a9fe7c22 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -267,8 +267,6 @@
         # Here we are dumping all the container startup configuration data
         # so that we can have access to how they are started outside of heat
         # and container cmd. This lets us create command line tools to test containers.
-        # FIXME We need to update the defaults, e.g in docker-tool, so we can remove the
-        # container-startup-configs.json and use per-step configs instead
         - name: Set container_config_default fact
           no_log: True
           set_fact:
@@ -286,18 +284,7 @@
           tags:
             - container_startup_configs
 
-        - name: Write container-startup-configs
-          no_log: True
-          copy:
-            content: "{{ container_config_with_default | to_nice_json }}"
-            dest: /var/lib/container-startup-configs.json
-            force: yes
-            mode: '0600'
-          tags:
-            - container_startup_configs
-          diff: no
-
-        - name: Write per-step container-startup-configs
+        - name: Write per-step container startup configs
           no_log: True
           copy:
             content: "{{ item[1] | to_nice_json }}"
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index e25d650c0e..4fd036a47d 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -427,9 +427,9 @@ outputs:
                 docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
                 docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
               tasks:
-                - name: Check if /var/lib/container-startup-configs.json already exists
+                - name: Check if /var/lib/tripleo-config/container-startup-config-1.json already exists
                   stat:
-                    path: /var/lib/container-startup-configs.json
+                    path: /var/lib/tripleo-config/container-startup-config-1.json
                   register: container_startup_configs_json_stat
                 - import_tasks: common_deploy_steps_tasks.yaml
                   when: