diff --git a/.zuul.yaml b/.zuul.yaml
index 64bc11ab68..97c3f78025 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1819,6 +1819,22 @@
       - modules/.*
       - manifests/.*
 
+- job:
+    name: infra-prod-remote-puppet-else
+    parent: infra-prod-service-base
+    description: Run remote-puppet-else.yaml playbook
+    vars:
+      playbook_name: remote-puppet-else.yaml
+      infra_prod_ansible_forks: 50
+    files:
+      - playbooks/remote-puppet-else.yaml
+      - playbooks/group_vars/.*
+      - playbooks/host_vars/.*
+      - playbooks/roles/puppet-install/.*
+      - playbooks/roles/disable-puppet-agent/.*
+      - modules/.*
+      - manifests/.*
+
 - job:
     name: system-config-goaccess-report
     description: |
@@ -2185,6 +2201,7 @@
         - infra-prod-service-review-dev
         - infra-prod-service-gitea
         - infra-prod-remote-puppet-afs
+        - infra-prod-remote-puppet-else
     periodic:
       jobs:
         - developer-openstack-goaccess-report
@@ -2227,3 +2244,6 @@
         - infra-prod-service-zuul-preview:
             dependencies:
               - infra-prod-update-system-config
+        - infra-prod-remote-puppet-else:
+            dependencies:
+              - infra-prod-update-system-config
diff --git a/run_all.sh b/run_all.sh
index e7de48bd8d..7004a4d3ff 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -69,13 +69,7 @@ echo "--- begin run @ $(date -Is) ---"
 # errexit
 set +e
 
-# Run all the ansible playbooks under timeout to prevent them from getting
-# stuck if they are oomkilled
-
-# 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
-send_timer else
+# DO NOTHING!!!
 
 # Send the combined time for everything
 send_timer total $GLOBAL_START_TIME