diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh
index c7b09aafc..8aee3d1de 100755
--- a/scripts/tripleo.sh
+++ b/scripts/tripleo.sh
@@ -611,6 +611,9 @@ parameter_defaults:
   ControlPlaneSubnetCidr: 24
 EOF_CAT
 
+    # generate container-images.yaml for tripleoupstream
+    openstack overcloud container image prepare --env-file $HOME/container-images.yaml
+
     LOCAL_IP=${LOCAL_IP:-192.168.24.1}
 
     cp -a /usr/share/openstack-tripleo-heat-templates ~/tripleo-heat-templates
@@ -622,8 +625,8 @@ EOF_CAT
         -e $HOME/tripleo-heat-templates/environments/services-docker/mistral.yaml \
         -e $HOME/tripleo-heat-templates/environments/services-docker/zaqar.yaml \
         -e $HOME/tripleo-heat-templates/environments/docker.yaml \
-        -e $HOME/tripleo-heat-templates/environments/docker-centos-tripleoupstream.yaml \
         -e $HOME/tripleo-heat-templates/environments/mongodb-nojournal.yaml \
+        -e $HOME/container-images.yaml \
         -e $HOME/custom.yaml
 
     # the new installer requires root privs to avoid sudo'ing everything,
diff --git a/toci_gate_test-orig.sh b/toci_gate_test-orig.sh
index 2beebe8f0..cbf231751 100755
--- a/toci_gate_test-orig.sh
+++ b/toci_gate_test-orig.sh
@@ -266,7 +266,6 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
             OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS \
             -e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml \
             -e /usr/share/openstack-tripleo-heat-templates/environments/docker-network.yaml \
-            -e /usr/share/openstack-tripleo-heat-templates/environments/docker-centos-tripleoupstream.yaml \
             -e ~/containers-default-parameters.yaml"
             ;;
         ovb)