diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 6198ffd..2e0002d 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,55 +7,55 @@
       jobs:
         # NOTE(dtantsur): keep N-3 and older non-voting for these jobs.
         - ironic-standalone
+        - ironic-standalone-yoga
         - ironic-standalone-xena
-        - ironic-standalone-wallaby
-        - ironic-standalone-victoria:
+        - ironic-standalone-wallaby:
             voting: false
         - ironic-tempest-functional-python3
+        - ironic-tempest-functional-python3-yoga
         - ironic-tempest-functional-python3-xena
-        - ironic-tempest-functional-python3-wallaby
-        - ironic-tempest-functional-python3-victoria:
+        - ironic-tempest-functional-python3-wallaby:
             voting: false
         - ironic-inspector-tempest
+        - ironic-inspector-tempest-yoga
         - ironic-inspector-tempest-xena
-        - ironic-inspector-tempest-wallaby
-        - ironic-inspector-tempest-victoria:
+        - ironic-inspector-tempest-wallaby:
             voting: false
         - ironic-standalone-redfish
+        - ironic-standalone-redfish-yoga:
+            voting: false
         - ironic-standalone-redfish-xena:
             voting: false
         - ironic-standalone-redfish-wallaby:
             voting: false
-        - ironic-standalone-redfish-victoria:
-            voting: false
         # NOTE(dtantsur): these jobs cover rarely changed tests and are quite
         # unstable, so keep them non-voting.
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode:
             voting: false
+        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-yoga:
+            voting: false
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-xena:
             voting: false
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-wallaby:
             voting: false
-        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-victoria:
-            voting: false
         - ironic-inspector-tempest-discovery
+        - ironic-inspector-tempest-discovery-yoga:
+            voting: false
         - ironic-inspector-tempest-discovery-xena:
             voting: false
         - ironic-inspector-tempest-discovery-wallaby:
             voting: false
-        - ironic-inspector-tempest-discovery-victoria:
-            voting: false
     gate:
       queue: ironic
       jobs:
         - ironic-standalone
+        - ironic-standalone-yoga
         - ironic-standalone-xena
-        - ironic-standalone-wallaby
         - ironic-tempest-functional-python3
+        - ironic-tempest-functional-python3-yoga
         - ironic-tempest-functional-python3-xena
-        - ironic-tempest-functional-python3-wallaby
         - ironic-inspector-tempest
+        - ironic-inspector-tempest-yoga
         - ironic-inspector-tempest-xena
-        - ironic-inspector-tempest-wallaby
         - ironic-standalone-redfish
         - ironic-inspector-tempest-discovery
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 0f83c2a..42099c6 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -1,4 +1,9 @@
 - job:
+    name: ironic-standalone-yoga
+    parent: ironic-standalone
+    override-checkout: stable/yoga
+
+- job:
     name: ironic-standalone-xena
     parent: ironic-standalone
     override-checkout: stable/xena
@@ -27,6 +32,12 @@
         USE_PYTHON3: True
 
 - job:
+    name: ironic-standalone-redfish-yoga
+    parent: ironic-standalone-redfish
+    nodeset: openstack-single-node-focal
+    override-checkout: stable/yoga
+
+- job:
     name: ironic-standalone-redfish-xena
     parent: ironic-standalone-redfish
     nodeset: openstack-single-node-focal
@@ -58,6 +69,11 @@
         USE_PYTHON3: True
 
 - job:
+    name: ironic-tempest-functional-python3-yoga
+    parent: ironic-tempest-functional-python3
+    override-checkout: stable/yoga
+
+- job:
     name: ironic-tempest-functional-python3-xena
     parent: ironic-tempest-functional-python3
     override-checkout: stable/xena
@@ -83,6 +99,11 @@
     override-checkout: stable/train
 
 - job:
+    name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-yoga
+    parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
+    override-checkout: stable/yoga
+
+- job:
     name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-xena
     parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
     override-checkout: stable/xena
@@ -111,6 +132,11 @@
         USE_PYTHON3: True
 
 - job:
+    name: ironic-inspector-tempest-yoga
+    parent: ironic-inspector-tempest
+    override-checkout: stable/yoga
+
+- job:
     name: ironic-inspector-tempest-xena
     parent: ironic-inspector-tempest
     override-checkout: stable/xena
@@ -148,6 +174,11 @@
         USE_PYTHON3: True
 
 - job:
+    name: ironic-inspector-tempest-discovery-yoga
+    parent: ironic-inspector-tempest-discovery
+    override-checkout: stable/yoga
+
+- job:
     name: ironic-inspector-tempest-discovery-xena
     parent: ironic-inspector-tempest-discovery
     override-checkout: stable/xena