diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b8245bb42f..25493f2136 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -26,40 +26,35 @@
         - openstack-helm-lint
         - openstack-helm-bandit
         - openstack-helm-cinder
-        - openstack-helm-cinder-ocata-ubuntu_xenial
-        - openstack-helm-cinder-pike-ubuntu_xenial
-        - openstack-helm-cinder-queens-ubuntu_xenial
-        - openstack-helm-cinder-rocky-ubuntu_xenial
         - openstack-helm-cinder-rocky-ubuntu_bionic
-        - openstack-helm-cinder-rocky-opensuse_15:
-            voting: false
         - openstack-helm-cinder-train-ubuntu_bionic
         - openstack-helm-compute-kit
-        - openstack-helm-compute-kit-ocata-ubuntu_xenial
-        - openstack-helm-compute-kit-pike-ubuntu_xenial
-        - openstack-helm-compute-kit-queens-ubuntu_xenial
-        - openstack-helm-compute-kit-rocky-ubuntu_xenial
         - openstack-helm-compute-kit-rocky-ubuntu_bionic
-        - openstack-helm-compute-kit-rocky-opensuse_15:
-            voting: false
         - openstack-helm-compute-kit-train-ubuntu_bionic
         - openstack-helm-horizon
-        - openstack-helm-apparmor:
-            voting: false
-        - openstack-helm-apparmor-cinder:
-            voting: false
-        - openstack-helm-netpol-compute-kit
-        - openstack-helm-netpol-compute-kit-train
-        - openstack-helm-netpol-cinder
     gate:
       jobs:
         - openstack-helm-lint
         - openstack-helm-cinder
         - openstack-helm-compute-kit
+        - openstack-helm-horizon
     periodic:
       jobs:
-        # Keystone job that exersizes feature gate
+        # Keystone job that exercises feature gate
         - openstack-helm-keystone-ldap
+        - openstack-helm-cinder-ocata-ubuntu_xenial
+        - openstack-helm-cinder-pike-ubuntu_xenial
+        - openstack-helm-cinder-queens-ubuntu_xenial
+        - openstack-helm-cinder-rocky-ubuntu_xenial
+        - openstack-helm-compute-kit-ocata-ubuntu_xenial
+        - openstack-helm-compute-kit-pike-ubuntu_xenial
+        - openstack-helm-compute-kit-queens-ubuntu_xenial
+        - openstack-helm-compute-kit-rocky-ubuntu_xenial
+        # TODO: Disabling this until there is proper maintainence to make it
+        # work properly again
+        # - openstack-helm-cinder-rocky-opensuse_15
+        # - openstack-helm-compute-kit-rocky-opensuse_15
+        #
         # Unique periodic jobs
         # NOTE(srwilkers): Disabling the following jobs until
         # issues with the kubeadm-aio based deployments are addressed
@@ -68,12 +63,16 @@
         # - openstack-helm-armada-deploy
         # - openstack-helm-armada-update-uuid
         # - openstack-helm-armada-update-passwords
-    # NOTE(srwilkers): Disabling the following jobs until
-    # issues with the kubeadm-aio based deployments are addressed
-    # experimental:
-    #   jobs:
+    experimental:
+      jobs:
+        - openstack-helm-apparmor
+        - openstack-helm-apparmor-cinder
+        - openstack-helm-netpol-compute-kit
+        - openstack-helm-netpol-compute-kit-train
+        - openstack-helm-netpol-cinder
+        # NOTE(srwilkers): Disabling the following jobs until
+        # issues with the kubeadm-aio based deployments are addressed
         # - openstack-helm-multinode-temp-centos
-        # # NOTE(lamt): Make fedora job experimental until issues with gates are resolved.
         # - openstack-helm-multinode-temp-fedora
         # - openstack-helm-multinode-temp-tempest
         # - openstack-helm-armada-deploy