diff --git a/.zuul.yaml b/.zuul.yaml
index 478b565125..64bc11ab68 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1800,6 +1800,25 @@
       - docker/jinja-init/.*
       - docker/python-base/.*
 
+# Run AFS changes separately so we can make sure to only do one at a time
+# (turns out quorum is nice to have)
+- job:
+    name: infra-prod-remote-puppet-afs
+    parent: infra-prod-service-base
+    description: Run remote-puppet-afs.yaml playbook
+    vars:
+      playbook_name: remote-puppet-afs.yaml
+      infra_prod_ansible_forks: 1
+    files:
+      - playbooks/remote-puppet-afs.yaml
+      - playbooks/group_vars/afs.*
+      - playbooks/group_vars/mirror-update.*
+      - playbooks/roles/puppet-install/.*
+      - playbooks/roles/disable-puppet-agent/.*
+      - playbooks/roles/vos-release/.*
+      - modules/.*
+      - manifests/.*
+
 - job:
     name: system-config-goaccess-report
     description: |
@@ -2165,6 +2184,7 @@
         - infra-prod-service-review
         - infra-prod-service-review-dev
         - infra-prod-service-gitea
+        - infra-prod-remote-puppet-afs
     periodic:
       jobs:
         - developer-openstack-goaccess-report
@@ -2194,6 +2214,7 @@
         - infra-prod-service-review
         - infra-prod-service-review-dev
         - infra-prod-service-gitea
+        - infra-prod-remote-puppet-afs
     opendev-prod-hourly:
       jobs:
         - infra-prod-update-system-config
diff --git a/playbooks/remote_puppet_afs.yaml b/playbooks/remote_puppet_afs.yaml
index 75de5463ee..aa92eef1bf 100644
--- a/playbooks/remote_puppet_afs.yaml
+++ b/playbooks/remote_puppet_afs.yaml
@@ -24,4 +24,4 @@
 - hosts: "afs:!disabled"
   name: "Allow remote vos_release"
   roles:
-    - vos-release
\ No newline at end of file
+    - vos-release
diff --git a/run_all.sh b/run_all.sh
index 9b3edcee7e..e7de48bd8d 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -72,12 +72,6 @@ set +e
 # Run all the ansible playbooks under timeout to prevent them from getting
 # stuck if they are oomkilled
 
-# Run AFS changes separately so we can make sure to only do one at a time
-# (turns out quorum is nice to have)
-start_timer
-timeout -k 2m 30m ansible-playbook -f 1 ${ANSIBLE_PLAYBOOKS}/remote_puppet_afs.yaml
-send_timer afs
-
 # Run everything else. We do not care if the other things worked
 start_timer
 timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/remote_puppet_else.yaml