diff --git a/zuul.d/deprecated-jobs.yaml b/zuul.d/deprecated-jobs.yaml
index 71f7cb7e2..2add4ee56 100644
--- a/zuul.d/deprecated-jobs.yaml
+++ b/zuul.d/deprecated-jobs.yaml
@@ -164,6 +164,33 @@
       extra_tags:
         - overcloud-upgrade
 
+- job:
+    name: tripleo-ci-centos-8-undercloud-upgrade
+    parent: tripleo-ci-base-singlenode-centos-8
+    branches: ^master$
+    voting: true
+    vars:
+      featureset: '050'
+      featureset_override:
+        validate_services: false
+      extra_tags:
+        - undercloud-upgrade
+
+- job:
+    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates
+    description: |
+      Basic tripleo update job for centos-8, this is not an upgrade job.
+    parent: tripleo-ci-base-multinode-centos-8
+    voting: true
+    branches: ^master$
+    vars:
+      nodes: 1ctlr
+      featureset: '037'
+      # Note (dmsimard): This enforces a minimum TTL for DNS records, see
+      # https://review.opendev.org/#/c/523178/ for context
+      unbound_cache_min_ttl: 900
+      extra_tags:
+        - overcloud-update
 
 - job:
     name: tripleo-ci-centos-7-scenario001-multinode-oooq-container
diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml
index fb2fab390..e4a34da1a 100644
--- a/zuul.d/multinode-jobs.yaml
+++ b/zuul.d/multinode-jobs.yaml
@@ -86,7 +86,6 @@
             dependencies:
               - tripleo-ci-centos-9-content-provider
         - tripleo-ci-centos-9-scenario007-multinode-oooq-container: *cs9_multinode_all
-        - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates: *cs9_multinode_all
         - tripleo-ci-centos-7-containers-multinode:
             irrelevant-files: *multinode_ignored
             vars: *multi_consumer_vars
@@ -134,7 +133,6 @@
               - tripleo-ci-centos-8-content-provider
         - tripleo-ci-centos-9-containers-multinode: *cs9_multinode_all
         - tripleo-ci-centos-9-scenario007-multinode-oooq-container: *cs9_multinode_all
-        - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates: *cs9_multinode_all
         - tripleo-ci-centos-7-containers-multinode:
             irrelevant-files: *multinode_ignored
 
@@ -145,7 +143,6 @@
         - tripleo-ci-centos-8-content-provider
         - tripleo-ci-centos-9-containers-multinode: *cs9_multinode_all
         - tripleo-ci-centos-9-scenario007-multinode-oooq-container: *cs9_multinode_all
-        - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates: *cs9_multinode_all
         - tripleo-ci-centos-8-containers-multinode:
             irrelevant-files: *multinode_ignored
             vars: *multi_consumer_vars
@@ -236,13 +233,6 @@
     nodeset: two-centos-9-nodes
     irrelevant-files: *multinode_ignored
 
-- job:
-    name: tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates
-    parent: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates
-    branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$
-    nodeset: two-centos-9-nodes
-    irrelevant-files: *multinode_ignored
-
 ## CentOS 8 jobs
 - job:
     name: tripleo-ci-centos-8-containers-multinode
diff --git a/zuul.d/upgrades-jobs-templates.yaml b/zuul.d/upgrades-jobs-templates.yaml
index eed029fd4..fae8a7e6c 100644
--- a/zuul.d/upgrades-jobs-templates.yaml
+++ b/zuul.d/upgrades-jobs-templates.yaml
@@ -5,9 +5,8 @@
     name: tripleo-upgrades-master-pipeline
     check:
       jobs:
-        - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-content-provider-wallaby
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates:
+        - tripleo-ci-centos-9-content-provider
+        - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates: &cs9_update_all
             irrelevant-files: &multinode_ignored
               - ^.*\.md$
               - ^.*\.rst$
@@ -42,9 +41,26 @@
               build_container_images: false
               remove_tags:
                 - build
+            dependencies:
+              - tripleo-ci-centos-9-content-provider
+    gate:
+      queue: tripleo
+      jobs:
+        - tripleo-ci-centos-9-content-provider
+        - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates: *cs9_update_all
+
+- project-template:
+    name: tripleo-upgrades-wallaby-pipeline
+    check:
+      jobs:
+        - tripleo-ci-centos-8-content-provider
+        - tripleo-ci-centos-8-content-provider-victoria
+        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-wallaby:
+            irrelevant-files: *multinode_ignored
+            vars: *consumer_vars
             dependencies:
               - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-undercloud-upgrade:
+        - tripleo-ci-centos-8-undercloud-upgrade-wallaby:
             vars: *consumer_vars
             irrelevant-files: &undercloud_ignored
               - ^.*\.md$
@@ -87,40 +103,6 @@
               # upgrade/update featuresets
               - ^config/general_config/featureset037.yml
               - ^config/general_config/featureset051.yml
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-              - tripleo-ci-centos-8-content-provider-wallaby
-    gate:
-      queue: tripleo
-      jobs:
-        - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-content-provider-wallaby
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates:
-            irrelevant-files: *multinode_ignored
-            vars: *consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-undercloud-upgrade:
-            vars: *consumer_vars
-            irrelevant-files: *undercloud_ignored
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-              - tripleo-ci-centos-8-content-provider-wallaby
-
-- project-template:
-    name: tripleo-upgrades-wallaby-pipeline
-    check:
-      jobs:
-        - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-content-provider-victoria
-        - tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-wallaby:
-            irrelevant-files: *multinode_ignored
-            vars: *consumer_vars
-            dependencies:
-              - tripleo-ci-centos-8-content-provider
-        - tripleo-ci-centos-8-undercloud-upgrade-wallaby:
-            vars: *consumer_vars
-            irrelevant-files: *undercloud_ignored
             dependencies:
               - tripleo-ci-centos-8-content-provider
               - tripleo-ci-centos-8-content-provider-victoria
@@ -273,22 +255,6 @@
 # Minor update jobs
 #
 
-- job:
-    name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates
-    description: |
-      Basic tripleo update job for centos-8, this is not an upgrade job.
-    parent: tripleo-ci-base-multinode-centos-8
-    voting: true
-    branches: ^master$
-    vars:
-      nodes: 1ctlr
-      featureset: '037'
-      # Note (dmsimard): This enforces a minimum TTL for DNS records, see
-      # https://review.opendev.org/#/c/523178/ for context
-      unbound_cache_min_ttl: 900
-      extra_tags:
-        - overcloud-update
-
 - job:
     name: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates-wallaby
     description: |
@@ -345,6 +311,12 @@
       extra_tags:
         - overcloud-update
 
+- job:
+    name: tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates
+    parent: tripleo-ci-centos-8-scenario000-multinode-oooq-container-updates
+    branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$
+    nodeset: two-centos-9-nodes
+
 #
 # Major Upgrade jobs
 #
@@ -458,18 +430,6 @@
 #
 # Undercloud upgrade jobs
 
-- job:
-    name: tripleo-ci-centos-8-undercloud-upgrade
-    parent: tripleo-ci-base-singlenode-centos-8
-    branches: ^master$
-    voting: true
-    vars:
-      featureset: '050'
-      featureset_override:
-        validate_services: false
-      extra_tags:
-        - undercloud-upgrade
-
 - job:
     name: tripleo-ci-centos-8-undercloud-upgrade-ussuri
     parent: tripleo-ci-base-singlenode-centos-8