diff --git a/deployment/deprecated/docker/docker-baremetal-ansible.yaml b/deployment/deprecated/docker/docker-baremetal-ansible.yaml
index 2d7e72f025..c62d8ca0a3 100644
--- a/deployment/deprecated/docker/docker-baremetal-ansible.yaml
+++ b/deployment/deprecated/docker/docker-baremetal-ansible.yaml
@@ -185,6 +185,17 @@ outputs:
               name: container-registry
               tasks_from: docker-login
             when: container_registry_login|bool
+      deploy_steps_tasks:
+        - when:
+            - (step|int) == 1
+          block:
+            - name: Pre-fetch all the containers
+              become: true
+              docker_image:
+                name: "{{ container_image }}"
+              loop_control:
+                loop_var: container_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:
           docker_additional_sockets: {get_param: DockerAdditionalSockets}
diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml
index d46b792206..35704c057e 100644
--- a/deployment/podman/podman-baremetal-ansible.yaml
+++ b/deployment/podman/podman-baremetal-ansible.yaml
@@ -133,6 +133,18 @@ outputs:
                 path: /etc/sysconfig/podman_drop_in
                 state: absent
 
+      deploy_steps_tasks:
+        - when:
+            - (step|int) == 1
+          block:
+            # TODO(mwhahaha): figure out the bug in podman_image
+            - name: Pre-fetch all the containers
+              become: true
+              shell: podman pull "{{ container_image }}"
+              loop_control:
+                  loop_var: container_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: {}
 
       upgrade_tasks: