diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 0d3064e977..8cd8a2649a 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -129,6 +129,15 @@
         container_distro_name: ubuntu
         container_distro_version: focal
 
+- job:
+    name: openstack-helm-cinder-yoga-ubuntu_focal
+    parent: openstack-helm-cinder
+    vars:
+      osh_params:
+        openstack_release: yoga
+        container_distro_name: ubuntu
+        container_distro_version: focal
+
 - job:
     name: openstack-helm-compute-kit
     parent: openstack-helm-chart-deploy
@@ -218,6 +227,15 @@
         container_distro_name: ubuntu
         container_distro_version: focal
 
+- job:
+    name: openstack-helm-compute-kit-yoga-ubuntu_focal
+    parent: openstack-helm-compute-kit
+    vars:
+      osh_params:
+        openstack_release: yoga
+        container_distro_name: ubuntu
+        container_distro_version: focal
+
 - job:
     name: openstack-helm-horizon-wallaby-ubuntu_focal
     parent: openstack-helm-chart-deploy
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3217c29992..5d0a4c9786 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -26,12 +26,15 @@
         - openstack-helm-cinder-ussuri-ubuntu_bionic
         - openstack-helm-cinder-victoria-ubuntu_focal
         - openstack-helm-cinder-wallaby-ubuntu_focal
-        # - openstack-helm-cinder-xena-ubuntu_focal
+        - openstack-helm-cinder-xena-ubuntu_focal
+        - openstack-helm-cinder-yoga-ubuntu_focal
         - openstack-helm-compute-kit-ussuri-ubuntu_bionic
         - openstack-helm-compute-kit-victoria-ubuntu_focal
         - openstack-helm-compute-kit-victoria-ubuntu_focal-umbrella
         - openstack-helm-compute-kit-wallaby-ubuntu_focal
-        # - openstack-helm-compute-kit-xena-ubuntu_focal
+        - openstack-helm-compute-kit-xena-ubuntu_focal
+        # TODO(gagehugo): Fix and enable this job
+        # - openstack-helm-compute-kit-yoga-ubuntu_focal
         - openstack-helm-horizon-wallaby-ubuntu_focal
         - openstack-helm-keystone-ldap
     gate: