diff --git a/.zuul.yaml b/.zuul.yaml
index 11087717a7..b57206b7a1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -18,149 +18,61 @@
     check:
       jobs:
         - openstack-helm-linter
-        - openstack-helm-dev-deploy-ceph-swift-ovs:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-dev-deploy-ceph-radosgw-ovs:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-dev-deploy-ceph-rbd-ovs:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-dev-deploy-nfs-ovs:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - openstack-helm-dev-deploy-ceph-swift-ovs
+        - openstack-helm-dev-deploy-ceph-radosgw-ovs
+        - openstack-helm-dev-deploy-ceph-rbd-ovs
+        - openstack-helm-dev-deploy-nfs-ovs
         - openstack-helm-dev-deploy-ceph-lb:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
         - openstack-helm-dev-deploy-nfs-lb:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
         - openstack-helm-dev-deploy-nfs-ldap:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
         - openstack-helm-multinode-ubuntu:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
         - openstack-helm-ironic-ubuntu:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
         - openstack-helm-armada-fullstack-deploy:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-kolla-deploy-ceph-ovs:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - openstack-helm-kolla-deploy-ceph-ovs
         - openstack-helm-ocata-loci-deploy-ceph:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
         - openstack-helm-ocata-kolla-deploy-ceph:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
         - openstack-helm-pike-loci-deploy-ceph:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
         - openstack-helm-pike-kolla-deploy-ceph:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
     gate:
       jobs:
-        - openstack-helm-linter:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-dev-deploy-ceph-swift-ovs:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-dev-deploy-ceph-radosgw-ovs:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-dev-deploy-ceph-rbd-ovs:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-dev-deploy-nfs-ovs:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-kolla-deploy-ceph-ovs:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - openstack-helm-linter
+        - openstack-helm-dev-deploy-ceph-swift-ovs
+        - openstack-helm-dev-deploy-ceph-radosgw-ovs
+        - openstack-helm-dev-deploy-ceph-rbd-ovs
+        - openstack-helm-dev-deploy-nfs-ovs
+        - openstack-helm-kolla-deploy-ceph-ovs
     experimental:
       jobs:
-        - openstack-helm-multinode-centos:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - openstack-helm-multinode-centos
         # NOTE(lamt): Make fedora job experimental until issues with gates are resolved.
-        - openstack-helm-multinode-fedora:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-multinode-tempest:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - openstack-helm-multinode-fedora
+        - openstack-helm-multinode-tempest
 
 - job:
     name: openstack-helm-linter
     run: tools/gate/playbooks/zuul-linter.yaml
     nodeset: openstack-helm-single-node
 
+- job:
+    name: openstack-helm-functional
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^releasenotes/.*$
+
 - job:
     name: openstack-helm-dev-deploy
+    parent: openstack-helm-functional
     roles:
       - zuul: openstack/openstack-helm-infra
     timeout: 7200
@@ -226,6 +138,7 @@
 
 - job:
     name: openstack-helm-multinode
+    parent: openstack-helm-functional
     roles:
       - zuul: openstack/openstack-helm-infra
     vars: