diff --git a/playbooks/multinode-overcloud-update.yml b/playbooks/multinode-overcloud-update.yml
index af04fbca5..7a3cb8df8 100644
--- a/playbooks/multinode-overcloud-update.yml
+++ b/playbooks/multinode-overcloud-update.yml
@@ -1,7 +1,88 @@
 ---
+# the yum repos ALWAYS need to change
+- name: Configure next release repository in the undercloud
+  hosts: undercloud
+  tags:
+    - overcloud-update
+  vars:
+    repo_setup_run_update: false
+    # This should not be enabled because the updating of the packages occurs
+    # durring the upgrade process. For general installation it's ok to have
+    # this enabled, but this needs to be disabled for upgrades
+    ib_gating_repo_update: false
+  roles:
+    - role: repo-setup
+
+# note: in upstream CI the gerrit change is built on the content-provider
+# this task will be skipped upstream
+- name: Build the gerrit changes on the relevant release for the upgrade
+  hosts: undercloud
+  tags:
+    - build
+  vars:
+    repo_setup_run_update: false
+    artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz"
+    # This should not be enabled because the updating of the packages occurs
+    # durring the upgrade process. For general installation it's ok to have
+    # this enabled, but this needs to be disabled for upgrades
+    ib_gating_repo_update: false
+  roles:
+    - role: build-test-packages
+    - {role: install-built-repo, when: compressed_gating_repo is defined}
+
+
+- name: DEBUG save current containers-prepare-parameter.yaml
+  hosts: undercloud
+  gather_facts: false
+  tags:
+    - overcloud-update
+  tasks:
+    - name: DEBUG ensure current containers-prepare-parameter.yaml is saved
+      shell: |
+        cp containers-prepare-parameter.yaml containers-prepare-parameter-before.yaml
+
+- name: Revert container to current dlrn tag for update testing
+  hosts: undercloud
+  gather_facts: false
+  tags:
+    - overcloud-update
+  roles:
+    - role: container-update
+      when:
+        - containerized_undercloud|default(false)|bool
+        - overcloud_update|default(false)|bool
+      vars:
+        release_update: "{{ release }}-current"
+        docker_registry_host: "{{ job.registry_ip_address_branch[release_update] }}:{{ local_registry_port }}"
+
+
+- name: Prepare containers for update
+  hosts: undercloud
+  gather_facts: false
+  tags:
+    - overcloud-update
+  tasks:
+    - name: Gather facts for prep-container role
+      include_role:
+        name: overcloud-prep-containers
+        tasks_from: main
+    - name: Create prep containers script
+      include_role:
+        name: overcloud-prep-containers
+        tasks_from: create-scripts
+    - name: Run prep containers script
+      include_role:
+        name: overcloud-prep-containers
+        tasks_from: overcloud-prep-containers
+      vars:
+        overcloud_prep_containers_log: "update_overcloud_prep_containers.log"
+      when: overcloud_update|default(false)|bool
+
 - name: Run tripleo-upgrade role to update the overcloud
   hosts: undercloud
   gather_facts: true
+  vars:
+    undercloud_update: false
   tags:
     - overcloud-update
   roles:
diff --git a/playbooks/multinode-undercloud-upgrade.yml b/playbooks/multinode-undercloud-upgrade.yml
index eacce6b1d..bf784c27d 100644
--- a/playbooks/multinode-undercloud-upgrade.yml
+++ b/playbooks/multinode-undercloud-upgrade.yml
@@ -50,6 +50,8 @@
 
 - name: Run tripleo-upgrade role to upgrade undercloud
   hosts: undercloud
+  vars:
+    overcloud_update: false
   tags:
     - undercloud-upgrade
   roles:
diff --git a/roles/extras-common/defaults/main.yml b/roles/extras-common/defaults/main.yml
index dc2a2e337..83e8b21ff 100644
--- a/roles/extras-common/defaults/main.yml
+++ b/roles/extras-common/defaults/main.yml
@@ -36,6 +36,9 @@ overcloud_container_cli: podman
 local_docker_registry_host: "{{ undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1)) }}"
 docker_registry_host: >-
   {% if job.consumer_job | default(false) | bool -%}
+  {% if run_minor_update|default(false)|bool -%}
+  {{ job.registry_ip_address_branch['wallaby-current'] }}:{{ local_registry_port }}
+  {%- else -%}
   {% if registry_distro is defined and
   registry_distro | default('') | length > 0 -%}
   {{ job.registry_ip_address_distro[registry_distro] }}:{{ local_registry_port }}
@@ -45,8 +48,9 @@ docker_registry_host: >-
   {%- else -%}
   docker.io
   {%- endif -%}
+  {%- endif -%}
 docker_registry_namespace: "tripleo{{ release }}"
-docker_image_tag: current-tripleo
+
 
 # set default and convert job.build_container_images to native
 build_container_images: "{{ job.build_container_images|default(false)|bool }}"
diff --git a/roles/overcloud-prep-containers/tasks/create-scripts.yml b/roles/overcloud-prep-containers/tasks/create-scripts.yml
index 2a2b3c411..0d4bf22a5 100644
--- a/roles/overcloud-prep-containers/tasks/create-scripts.yml
+++ b/roles/overcloud-prep-containers/tasks/create-scripts.yml
@@ -4,7 +4,7 @@
 - name: set the service environments for container image prepare
   set_fact:
     prepare_service_env_args: >-
-      -e {{ overcloud_templates_path }}/environments/docker.yaml
+      -e {{ overcloud_templates_path }}/environments/podman.yaml
       -e {{ overcloud_templates_path }}/ci/environments/{{ composable_scenario }}
   when: not composable_scenario|trim == ''
 
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 540be0bb3..5c4d96b62 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -3,6 +3,7 @@
     queue: tripleo
     templates:
       - tripleo-multinode-branchful
+      - tripleo-upgrades-wallaby-pipeline
     check:
       jobs:
         - openstack-tox-linters