diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 017cb6ac..3cb33321 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -22,6 +22,8 @@
         - openstack-helm-images-compute-kit-train-ubuntu_bionic
         - openstack-helm-images-cinder-train-ubuntu_bionic
         - openstack-helm-images-horizon-train-ubuntu_bionic
+        - openstack-helm-images-compute-kit-ussuri-ubuntu_bionic
+        - openstack-helm-images-cinder-ussuri-ubuntu_bionic
         - openstack-helm-images-compute-kit-victoria-ubuntu_focal
         - openstack-helm-images-cinder-victoria-ubuntu_focal
         - openstack-helm-images-compute-kit-wallaby-ubuntu_focal
@@ -34,6 +36,8 @@
         - openstack-helm-images-compute-kit-train-ubuntu_bionic
         - openstack-helm-images-cinder-train-ubuntu_bionic
         - openstack-helm-images-horizon-train-ubuntu_bionic
+        - openstack-helm-images-compute-kit-ussuri-ubuntu_bionic
+        - openstack-helm-images-cinder-ussuri-ubuntu_bionic
         - openstack-helm-images-compute-kit-victoria-ubuntu_focal
         - openstack-helm-images-cinder-victoria-ubuntu_focal
         - openstack-helm-images-compute-kit-wallaby-ubuntu_focal
@@ -46,6 +50,8 @@
         - openstack-helm-images-compute-kit-train-ubuntu_bionic
         - openstack-helm-images-cinder-train-ubuntu_bionic
         - openstack-helm-images-horizon-train-ubuntu_bionic
+        - openstack-helm-images-compute-kit-ussuri-ubuntu_bionic
+        - openstack-helm-images-cinder-ussuri-ubuntu_bionic
         - openstack-helm-images-compute-kit-victoria-ubuntu_focal
         - openstack-helm-images-cinder-victoria-ubuntu_focal
         - openstack-helm-images-compute-kit-wallaby-ubuntu_focal
@@ -304,6 +310,68 @@
       - minikube-aio/.*
       - zuul.d/minikube-aio.yaml
 
+- job:
+    name: openstack-helm-images-compute-kit-ussuri-ubuntu_bionic
+    parent: openstack-helm-compute-kit-ussuri-ubuntu_bionic
+    match-on-config-updates: false
+    dependencies:
+      - name: openstack-helm-images-build-openvswitch
+        soft: true
+      - name: openstack-helm-images-build-openstack-loci-ussuri-ubuntu_bionic
+        soft: true
+      - name: openstack-helm-images-build-mariadb
+        soft: true
+      - name: openstack-helm-images-build-libvirt
+        soft: true
+      - name: openstack-helm-images-build-minikube-aio
+        soft: true
+      - name: openstack-helm-images-upload-openvswitch
+        soft: true
+      - name: openstack-helm-images-upload-openstack-loci-ussuri-ubuntu_bionic
+        soft: true
+      - name: openstack-helm-images-upload-mariadb
+        soft: true
+      - name: openstack-helm-images-upload-libvirt
+        soft: true
+      - name: openstack-helm-images-upload-minikube-aio
+        soft: true
+    files:
+      - openvswitch/.*
+      - zuul.d/openvswitch.yaml
+      - ^openstack/loci/.*
+      - zuul.d/openstack-loci.yaml
+      - mariadb/.*
+      - zuul.d/mariadb.yaml
+      - libvirt/.*
+      - zuul.d/libvirt.yaml
+      - minikube-aio/.*
+      - zuul.d/minikube-aio.yaml
+
+- job:
+    name: openstack-helm-images-cinder-ussuri-ubuntu_bionic
+    parent: openstack-helm-cinder-ussuri-ubuntu_bionic
+    match-on-config-updates: false
+    dependencies:
+      - name: openstack-helm-images-build-openstack-loci-ussuri-ubuntu_bionic
+        soft: true
+      - name: openstack-helm-images-build-minikube-aio
+        soft: true
+      - name: openstack-helm-images-build-mariadb
+        soft: true
+      - name: openstack-helm-images-upload-openstack-loci-ussuri-ubuntu_bionic
+        soft: true
+      - name: openstack-helm-images-upload-minikube-aio
+        soft: true
+      - name: openstack-helm-images-upload-mariadb
+        soft: true
+    files:
+      - ^openstack/loci/.*
+      - zuul.d/openstack-loci.yaml
+      - mariadb/.*
+      - zuul.d/mariadb.yaml
+      - minikube-aio/.*
+      - zuul.d/minikube-aio.yaml
+
 - job:
     name: openstack-helm-images-compute-kit-victoria-ubuntu_focal
     parent: openstack-helm-compute-kit-victoria-ubuntu_focal
diff --git a/zuul.d/libvirt.yaml b/zuul.d/libvirt.yaml
index de8c8507..7c525967 100644
--- a/zuul.d/libvirt.yaml
+++ b/zuul.d/libvirt.yaml
@@ -28,8 +28,10 @@
         - openstack-helm-images-upload-libvirt
         - openstack-helm-images-promote-libvirt:
             dependencies:
-              - name: openstack-helm-images-compute-kit-stein-ubuntu_bionic
               - name: openstack-helm-images-compute-kit-train-ubuntu_bionic
+              - name: openstack-helm-images-compute-kit-ussuri-ubuntu_bionic
+              - name: openstack-helm-images-compute-kit-victoria-ubuntu_focal
+              - name: openstack-helm-images-compute-kit-wallaby-ubuntu_focal
 
 - job:
     name: openstack-helm-images-build-libvirt
diff --git a/zuul.d/mariadb.yaml b/zuul.d/mariadb.yaml
index 06802e14..7037f625 100644
--- a/zuul.d/mariadb.yaml
+++ b/zuul.d/mariadb.yaml
@@ -30,6 +30,8 @@
             dependencies:
               - name: openstack-helm-images-compute-kit-train-ubuntu_bionic
               - name: openstack-helm-images-compute-kit-ussuri-ubuntu_bionic
+              - name: openstack-helm-images-compute-kit-victoria-ubuntu_focal
+              - name: openstack-helm-images-compute-kit-wallaby-ubuntu_focal
 
 - job:
     name: openstack-helm-images-build-mariadb
diff --git a/zuul.d/minikube-aio.yaml b/zuul.d/minikube-aio.yaml
index 183820b6..db8683e2 100644
--- a/zuul.d/minikube-aio.yaml
+++ b/zuul.d/minikube-aio.yaml
@@ -28,10 +28,14 @@
             dependencies:
               - name: openstack-helm-images-aio-monitoring
               - name: openstack-helm-images-aio-logging
-              - name: openstack-helm-images-compute-kit-stein-ubuntu_bionic
               - name: openstack-helm-images-compute-kit-train-ubuntu_bionic
-              - name: openstack-helm-images-cinder-stein-ubuntu_bionic
+              - name: openstack-helm-images-compute-kit-ussuri-ubuntu_bionic
+              - name: openstack-helm-images-compute-kit-victoria-ubuntu_focal
+              - name: openstack-helm-images-compute-kit-wallaby-ubuntu_focal
               - name: openstack-helm-images-cinder-train-ubuntu_bionic
+              - name: openstack-helm-images-cinder-ussuri-ubuntu_bionic
+              - name: openstack-helm-images-cinder-victoria-ubuntu_focal
+              - name: openstack-helm-images-cinder-wallaby-ubuntu_focal
               - name: openstack-helm-images-horizon-train-ubuntu_bionic
 
 - job:
diff --git a/zuul.d/openstack-loci.yaml b/zuul.d/openstack-loci.yaml
index ed2db313..7046c46f 100644
--- a/zuul.d/openstack-loci.yaml
+++ b/zuul.d/openstack-loci.yaml
@@ -46,15 +46,18 @@
         - openstack-helm-images-upload-openstack-loci-ussuri-ubuntu_bionic
         - openstack-helm-images-promote-openstack-loci-ussuri-ubuntu_bionic:
             dependencies:
-              - name: openstack-helm-images-upload-openstack-loci-ussuri-ubuntu_bionic
+              - name: openstack-helm-images-compute-kit-ussuri-ubuntu_bionic
+              - name: openstack-helm-images-cinder-ussuri-ubuntu_bionic
         - openstack-helm-images-upload-openstack-loci-victoria-ubuntu_focal
         - openstack-helm-images-promote-openstack-loci-victoria-ubuntu_focal:
             dependencies:
-              - name: openstack-helm-images-upload-openstack-loci-victoria-ubuntu_focal
+              - name: openstack-helm-images-compute-kit-victoria-ubuntu_focal
+              - name: openstack-helm-images-cinder-victoria-ubuntu_focal
         - openstack-helm-images-upload-openstack-loci-wallaby-ubuntu_focal
         - openstack-helm-images-promote-openstack-loci-wallaby-ubuntu_focal:
             dependencies:
-              - name: openstack-helm-images-upload-openstack-loci-wallaby-ubuntu_focal
+              - name: openstack-helm-images-compute-kit-wallaby-ubuntu_focal
+              - name: openstack-helm-images-cinder-wallaby-ubuntu_focal
         - openstack-helm-images-upload-openstack-loci-master-ubuntu_focal
         - openstack-helm-images-promote-openstack-loci-master-ubuntu_focal:
             dependencies:
diff --git a/zuul.d/openvswitch.yaml b/zuul.d/openvswitch.yaml
index daa595d6..fe3522ef 100644
--- a/zuul.d/openvswitch.yaml
+++ b/zuul.d/openvswitch.yaml
@@ -28,8 +28,10 @@
         - openstack-helm-images-upload-openvswitch
         - openstack-helm-images-promote-openvswitch:
             dependencies:
-              - name: openstack-helm-images-compute-kit-stein-ubuntu_bionic
               - name: openstack-helm-images-compute-kit-train-ubuntu_bionic
+              - name: openstack-helm-images-compute-kit-ussuri-ubuntu_bionic
+              - name: openstack-helm-images-compute-kit-victoria-ubuntu_focal
+              - name: openstack-helm-images-compute-kit-wallaby-ubuntu_focal
 
 - job:
     name: openstack-helm-images-build-openvswitch
diff --git a/zuul.d/ospurge.yaml b/zuul.d/ospurge.yaml
index 207427a9..62de0dcb 100644
--- a/zuul.d/ospurge.yaml
+++ b/zuul.d/ospurge.yaml
@@ -28,7 +28,7 @@
         - openstack-helm-images-upload-ospurge
         - openstack-helm-images-promote-ospurge:
             dependencies:
-              - name: openstack-helm-images-compute-kit-stein-ubuntu_bionic
+              - name: openstack-helm-images-compute-kit-train-ubuntu_bionic
 
 - job:
     name: openstack-helm-images-build-ospurge