diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 2b66b37349..9cc572da8f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -25,22 +25,6 @@
       jobs:
         - openstack-helm-lint
         - openstack-helm-bandit
-        - openstack-helm-keystone
-        - openstack-helm-keystone-pike-ubuntu_xenial:
-            voting: false
-        - openstack-helm-keystone-rocky-opensuse_15:
-            voting: false
-        - openstack-helm-keystone-ldap
-        - openstack-helm-glance
-        - openstack-helm-glance-pike-ubuntu_xenial:
-            voting: false
-        - openstack-helm-glance-rocky-opensuse_15:
-            voting: false
-        - openstack-helm-heat
-        - openstack-helm-heat-pike-ubuntu_xenial:
-            voting: false
-        - openstack-helm-heat-rocky-opensuse_15:
-            voting: false
         - openstack-helm-cinder
         - openstack-helm-cinder-pike-ubuntu_xenial:
             voting: false
@@ -57,14 +41,25 @@
     gate:
       jobs:
         - openstack-helm-lint
-        - openstack-helm-keystone
-        - openstack-helm-keystone-ldap
-        - openstack-helm-glance
-        - openstack-helm-heat
         - openstack-helm-cinder
         - openstack-helm-compute-kit
     periodic:
       jobs:
+        # Keystone jobs that are replicated in compute-kit
+        - openstack-helm-keystone
+        - openstack-helm-keystone-pike-ubuntu_xenial
+        - openstack-helm-keystone-rocky-opensuse_15
+        # Keystone job that exersizes feature gate
+        - openstack-helm-keystone-ldap
+        # Glance jobs that are replicated in compute-kit
+        - openstack-helm-glance
+        - openstack-helm-glance-pike-ubuntu_xenial
+        - openstack-helm-glance-rocky-opensuse_15
+        # Heat jobs that are replicated in compute-kit
+        - openstack-helm-heat
+        - openstack-helm-heat-pike-ubuntu_xenial
+        - openstack-helm-heat-rocky-opensuse_15
+        # Unique periodic jobs
         - openstack-helm-multinode-temp-ubuntu
         - openstack-helm-ironic-ubuntu
         - openstack-helm-armada-deploy