diff --git a/common/container_startup_configs_tasks.yaml b/common/container_startup_configs_tasks.yaml
index 0dac8a0110..fe334f12c9 100644
--- a/common/container_startup_configs_tasks.yaml
+++ b/common/container_startup_configs_tasks.yaml
@@ -11,9 +11,11 @@
 
 - name: "Creating container startup configs for {{ step_path }}"
   copy:
-    content: "{{ item.value | to_nice_json }}"
-    dest: "/var/lib/tripleo-config/container-startup-config/{{ step_path }}/{{ item.key }}.json"
+    content: "{{ startup_data.value | to_nice_json }}"
+    dest: "/var/lib/tripleo-config/container-startup-config/{{ step_path }}/{{ startup_data.key }}.json"
     setype: container_file_t
     mode: 0600
   no_log: true
+  loop_control:
+    loop_var: startup_data
   loop: "{{ item.1 | dict2items }}"
diff --git a/deployment/deprecated/docker/docker-baremetal-ansible.yaml b/deployment/deprecated/docker/docker-baremetal-ansible.yaml
index f7d79e7449..5f3e82d026 100644
--- a/deployment/deprecated/docker/docker-baremetal-ansible.yaml
+++ b/deployment/deprecated/docker/docker-baremetal-ansible.yaml
@@ -191,11 +191,11 @@ outputs:
           block:
             - name: Pre-fetch all the containers
               become: true
-              shell: "docker pull {{ container_image }}"
+              shell: "docker pull {{ prefetch_image }}"
               retries: 5
               delay: 5
               loop_control:
-                loop_var: container_image
+                loop_var: prefetch_image
               loop: "{{ lookup('file', tripleo_role_name + '/docker_config.yaml', errors='ignore') | default('{}', True) | from_yaml | recursive_get_key_from_dict(key='image') | unique }}"
       service_config_settings:
         neutron_l3:
diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml
index 77488a37e0..eaead7dc07 100644
--- a/deployment/podman/podman-baremetal-ansible.yaml
+++ b/deployment/podman/podman-baremetal-ansible.yaml
@@ -147,12 +147,12 @@ outputs:
             - name: Pre-fetch all the containers
               become: true
               podman_image:
-                  name: "{{ container_image }}"
+                  name: "{{ prefetch_image }}"
                   validate_certs: false
               retries: 5
               delay: 5
               loop_control:
-                  loop_var: container_image
+                  loop_var: prefetch_image
               loop: "{{ lookup('file', tripleo_role_name + '/docker_config.yaml', errors='ignore') | default('{}', True) | from_yaml | recursive_get_key_from_dict(key='image') | unique }}"
 
       service_config_settings: {}