diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
index da87af5f10..a0136c1011 100644
--- a/.zuul.d/centos.yaml
+++ b/.zuul.d/centos.yaml
@@ -7,6 +7,26 @@
         - kolla-ansible-centos8-source
         - kolla-ansible-centos8-binary
         - kolla-ansible-centos8-source-upgrade
+    check-arm64:
+      jobs:
+        - kolla-build-centos8-source-aarch64
+    gate:
+      queue: kolla
+      jobs:
+        - kolla-build-centos8-source
+        - kolla-ansible-centos8-source
+        - kolla-ansible-centos8-source-upgrade
+    periodic:
+      jobs:
+        - kolla-publish-centos8-source
+        - kolla-publish-centos8-binary
+    release:
+      jobs:
+        - kolla-publish-centos8-source
+        - kolla-publish-centos8-binary
+    experimental:
+      jobs:
+        - kolla-build-no-infra-wheels-centos8-source
         - kolla-ansible-centos8-source-bifrost:
             files: ^docker\/(base|bifrost|openstack-base)\/.*
         # Test rabbitmq & mariadb changes in multinode ceph jobs.
@@ -32,26 +52,6 @@
             files: ^docker/(base|elasticsearch|grafana|kibana|prometheus)/
         - kolla-ansible-centos8-source-kvm:
             files: ^docker/nova/
-    check-arm64:
-      jobs:
-        - kolla-build-centos8-source-aarch64
-    gate:
-      queue: kolla
-      jobs:
-        - kolla-build-centos8-source
-        - kolla-ansible-centos8-source
-        - kolla-ansible-centos8-source-upgrade
-    periodic:
-      jobs:
-        - kolla-publish-centos8-source
-        - kolla-publish-centos8-binary
-    release:
-      jobs:
-        - kolla-publish-centos8-source
-        - kolla-publish-centos8-binary
-    experimental:
-      jobs:
-        - kolla-build-no-infra-wheels-centos8-source
 
 - job:
     name: kolla-build-centos8-binary
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
index 636b1ad2fb..3532c9a758 100644
--- a/.zuul.d/ubuntu.yaml
+++ b/.zuul.d/ubuntu.yaml
@@ -13,6 +13,30 @@
         - kolla-ansible-ubuntu-source-upgrade:
             vars:
               kolla_python_version: 3.8
+    check-arm64:
+      jobs:
+        - kolla-build-ubuntu-source-aarch64
+    gate:
+      queue: kolla
+      jobs:
+        - kolla-build-ubuntu-source
+        - kolla-ansible-ubuntu-source:
+            vars:
+              kolla_python_version: 3.8
+        - kolla-ansible-ubuntu-source-upgrade:
+            vars:
+              kolla_python_version: 3.8
+    periodic:
+      jobs:
+        - kolla-publish-ubuntu-source
+        - kolla-publish-ubuntu-binary
+    release:
+      jobs:
+        - kolla-publish-ubuntu-source
+        - kolla-publish-ubuntu-binary
+    experimental:
+      jobs:
+        - kolla-build-no-infra-wheels-ubuntu-source
         # Test rabbitmq and mariadb in multinode ceph jobs.
         - kolla-ansible-ubuntu-source-ceph-ansible:
             files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
@@ -58,30 +82,6 @@
             files: ^docker/nova/
             vars:
               kolla_python_version: 3.8
-    check-arm64:
-      jobs:
-        - kolla-build-ubuntu-source-aarch64
-    gate:
-      queue: kolla
-      jobs:
-        - kolla-build-ubuntu-source
-        - kolla-ansible-ubuntu-source:
-            vars:
-              kolla_python_version: 3.8
-        - kolla-ansible-ubuntu-source-upgrade:
-            vars:
-              kolla_python_version: 3.8
-    periodic:
-      jobs:
-        - kolla-publish-ubuntu-source
-        - kolla-publish-ubuntu-binary
-    release:
-      jobs:
-        - kolla-publish-ubuntu-source
-        - kolla-publish-ubuntu-binary
-    experimental:
-      jobs:
-        - kolla-build-no-infra-wheels-ubuntu-source
 
 - job:
     name: kolla-build-ubuntu-binary