diff --git a/playbooks/baremetal-undercloud-validate-ha.yml b/playbooks/baremetal-undercloud-validate-ha.yml
index 4de2ee201..6861bd415 100644
--- a/playbooks/baremetal-undercloud-validate-ha.yml
+++ b/playbooks/baremetal-undercloud-validate-ha.yml
@@ -64,6 +64,14 @@
   tags:
     - overcloud-prep-config
 
+- name:  Prepare overcloud containers
+  hosts: undercloud
+  gather_facts: no
+  roles:
+    - overcloud-prep-containers
+  tags:
+    - overcloud-prep-containers
+
 - name: Fetch the overcloud images
   hosts: undercloud
   gather_facts: no
diff --git a/playbooks/baremetal-undercloud.yml b/playbooks/baremetal-undercloud.yml
index b832e7eae..deaf4dddd 100644
--- a/playbooks/baremetal-undercloud.yml
+++ b/playbooks/baremetal-undercloud.yml
@@ -64,6 +64,14 @@
   tags:
     - overcloud-prep-config
 
+- name:  Prepare overcloud containers
+  hosts: undercloud
+  gather_facts: no
+  roles:
+    - overcloud-prep-containers
+  tags:
+    - overcloud-prep-containers
+
 - name: Fetch the overcloud images
   hosts: undercloud
   gather_facts: no