diff --git a/playbooks/multinode-overcloud-upgrade-new.yml b/playbooks/multinode-overcloud-upgrade-new.yml
index 86b7719cc..6373aecc8 100644
--- a/playbooks/multinode-overcloud-upgrade-new.yml
+++ b/playbooks/multinode-overcloud-upgrade-new.yml
@@ -1,12 +1,3 @@
-- name: Prepare containers for Upgrade
-  hosts: undercloud
-  gather_facts: no
-  tags:
-    - overcloud-prep-containers
-  roles:
-    - role: overcloud-prep-containers
-      when: containerized_overcloud_upgrade|bool
-
 - name: Generate repo-setup script for overcloud upgrade
   hosts: undercloud
   tags:
@@ -20,7 +11,19 @@
   roles:
     - role: repo-setup
       when: containerized_overcloud_upgrade|bool
+      role: install-built-repo
+      when: hostvars['undercloud']['compressed_gating_repo'] is defined and mixed_upgrade|default(false)|bool
 
+- name: Prepare containers for Upgrade
+  hosts: undercloud
+  gather_facts: no
+  tags:
+    - overcloud-prep-containers
+  roles:
+    - role: overcloud-prep-containers
+      # This need the new repo in place.
+      update_containers: true
+      when: containerized_overcloud_upgrade|bool
 
 #FIXME(chem): tech-debt LP#1749740
 - name: Upgrade TripleO
diff --git a/roles/build-test-packages/defaults/main.yml b/roles/build-test-packages/defaults/main.yml
index b4aba98e4..3083c6a0c 100644
--- a/roles/build-test-packages/defaults/main.yml
+++ b/roles/build-test-packages/defaults/main.yml
@@ -15,6 +15,7 @@ artg_skipped_projects:
   - openstack/puppet-watcher
   - openstack/tripleo-quickstart
   - openstack/tripleo-quickstart-extras
+  - openstack/tripleo-upgrade
   - openstack-dev/grenade
   - openstack-infra/project-config
   - openstack-infra/tripleo-ci