diff --git a/roles/openafs-client/vars/CentOS.7.yaml b/roles/openafs-client/vars/CentOS.7.yaml
deleted file mode 100644
index d19b32a723..0000000000
--- a/roles/openafs-client/vars/CentOS.7.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-openafs_client_config_path: '/usr/vice/etc'
-openafs_client_yum_repo_url: https://tarballs.openstack.org/project-config/package-afs-centos7
-openafs_client_yum_repo_gpg_check: no
diff --git a/roles/openafs-client/vars/CentOS.8.yaml b/roles/openafs-client/vars/CentOS.8.yaml
deleted file mode 100644
index fd7ff782ae..0000000000
--- a/roles/openafs-client/vars/CentOS.8.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-openafs_client_config_path: '/usr/vice/etc'
-openafs_client_yum_repo_url: https://tarballs.openstack.org/project-config/package-afs-centos8
-openafs_client_yum_repo_gpg_check: no
diff --git a/roles/openafs-client/vars/CentOS.yaml b/roles/openafs-client/vars/CentOS.yaml
new file mode 100644
index 0000000000..e6010567a3
--- /dev/null
+++ b/roles/openafs-client/vars/CentOS.yaml
@@ -0,0 +1,3 @@
+openafs_client_config_path: '/usr/vice/etc'
+openafs_client_yum_repo_url: https://tarballs.opendev.org/openstack/openstack-zuul-jobs/openafs/centos{{ ansible_distribution_major_version}}/RPMS/{{ ansible_architecture }}
+openafs_client_yum_repo_gpg_check: no
diff --git a/zuul.d/system-config-roles.yaml b/zuul.d/system-config-roles.yaml
index 981cfe7710..479b869d56 100644
--- a/zuul.d/system-config-roles.yaml
+++ b/zuul.d/system-config-roles.yaml
@@ -30,6 +30,20 @@
           nodes:
             - base
 
+# NOTE(ianw): There's no need to run puppet tests on this node because
+# we have no control-plane xenial arm64 nodes.
+- job:
+    name: system-config-zuul-role-integration-xenial-arm64
+    parent: system-config-zuul-role-integration
+    nodeset:
+      nodes:
+        - name: base
+          label: ubuntu-xenial
+      groups:
+        - name: openafs
+          nodes:
+            - base
+
 - job:
     name: system-config-zuul-role-integration-bionic
     parent: system-config-zuul-role-integration
@@ -42,6 +56,18 @@
           nodes:
             - base
 
+- job:
+    name: system-config-zuul-role-integration-bionic-arm64
+    parent: system-config-zuul-role-integration
+    nodeset:
+      nodes:
+        - name: base
+          label: ubuntu-bionic-arm64
+      groups:
+        - name: openafs
+          nodes:
+            - base
+
 - job:
     name: system-config-zuul-role-integration-focal
     parent: system-config-zuul-role-integration
@@ -54,6 +80,18 @@
           nodes:
             - base
 
+- job:
+    name: system-config-zuul-role-integration-focal-arm64
+    parent: system-config-zuul-role-integration
+    nodeset:
+      nodes:
+        - name: base
+          label: ubuntu-focal-arm64
+      groups:
+        - name: openafs
+          nodes:
+            - base
+
 - job:
     name: system-config-zuul-role-integration-debian-stable
     parent: system-config-zuul-role-integration
@@ -66,6 +104,18 @@
           nodes:
             - base
 
+- job:
+    name: system-config-zuul-role-integration-debian-stable-arm64
+    parent: system-config-zuul-role-integration
+    nodeset:
+      nodes:
+        - name: base
+          label: debian-buster-arm64
+      groups:
+        - name: openafs
+          nodes:
+            - base
+
 - job:
     name: system-config-zuul-role-integration-centos-8
     parent: system-config-zuul-role-integration
@@ -78,19 +128,41 @@
           nodes:
             - base
 
+- job:
+    name: system-config-zuul-role-integration-centos-8-arm64
+    parent: system-config-zuul-role-integration
+    nodeset:
+      nodes:
+        - name: base
+          label: centos-8-arm64
+      groups:
+        - name: openafs
+          nodes:
+            - base
+
 - project-template:
     name: system-config-zuul-role-integration
     check:
       jobs:
         - system-config-zuul-role-integration-xenial
+        - system-config-zuul-role-integration-xenial-arm64
         - system-config-zuul-role-integration-bionic
+        - system-config-zuul-role-integration-bionic-arm64
         - system-config-zuul-role-integration-focal
+        - system-config-zuul-role-integration-focal-arm64
         - system-config-zuul-role-integration-debian-stable
+        - system-config-zuul-role-integration-debian-stable-arm64
         - system-config-zuul-role-integration-centos-8
+        - system-config-zuul-role-integration-centos-8-arm64
     gate:
       jobs:
         - system-config-zuul-role-integration-xenial
+        - system-config-zuul-role-integration-xenial-arm64
         - system-config-zuul-role-integration-bionic
+        - system-config-zuul-role-integration-bionic-arm64
         - system-config-zuul-role-integration-focal
+        - system-config-zuul-role-integration-focal-arm64
         - system-config-zuul-role-integration-debian-stable
+        - system-config-zuul-role-integration-debian-stable-arm64
         - system-config-zuul-role-integration-centos-8
+        - system-config-zuul-role-integration-centos-8-arm64