diff --git a/.zuul.yaml b/.zuul.yaml
index 9c8e3a07fe..9ac553bd85 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -862,16 +862,11 @@
       - testinfra/test_backups.py
 
 - job:
-    name: system-config-run-mirror
+    name: system-config-run-mirror-base
     parent: system-config-run
+    abstract: true
     description: |
       Run the playbook for a mirror node
-    nodeset:
-      nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
-        - name: mirror01.openafs.provider.opendev.org
-          label: ubuntu-bionic
     vars:
       run_playbooks:
         - playbooks/service-letsencrypt.yaml
@@ -892,6 +887,27 @@
       - playbooks/zuul/templates/group_vars/mirror_opendev.yaml.j2
       - testinfra/test_mirror.py
 
+- job:
+    name: system-config-run-mirror-x86
+    parent: system-config-run-mirror-base
+    nodeset:
+      nodes:
+        - name: bridge.openstack.org
+          label: ubuntu-bionic
+        - name: mirror01.openafs.provider.opendev.org
+          label: ubuntu-bionic
+
+- job:
+    name: system-config-run-mirror-arm64
+    parent: system-config-run-mirror-base
+    timeout: 3600
+    nodeset:
+      nodes:
+        - name: bridge.openstack.org
+          label: ubuntu-bionic-arm64
+        - name: mirror01.openafs.provider.opendev.org
+          label: ubuntu-bionic-arm64
+
 - job:
     name: system-config-run-mirror-update
     parent: system-config-run
@@ -1085,7 +1101,7 @@
         - system-config-run-eavesdrop
         - system-config-run-lists
         - system-config-run-nodepool
-        - system-config-run-mirror
+        - system-config-run-mirror-x86
         - system-config-run-mirror-update
         - system-config-run-docker-registry
         - system-config-run-gitea:
@@ -1133,6 +1149,9 @@
         - system-config-build-image-haproxy-statsd
         - system-config-build-image-python-base
         - system-config-build-image-python-builder
+    check-arm64:
+      jobs:
+        - system-config-run-mirror-arm64
     gate:
       jobs:
         - opendev-buildset-registry:
@@ -1145,7 +1164,7 @@
         - system-config-run-eavesdrop
         - system-config-run-lists
         - system-config-run-nodepool
-        - system-config-run-mirror
+        - system-config-run-mirror-x86
         - system-config-run-mirror-update
         - system-config-run-docker-registry
         - system-config-run-gitea: