diff --git a/.zuul.yaml b/.zuul.yaml
index 429faffa58..ab47b447c6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1733,6 +1733,43 @@
       - playbooks/roles/install-docker/.*
       - playbooks/roles/zuul-preview/.*
 
+- job:
+    name: infra-prod-service-review
+    parent: infra-prod-service-base
+    description: Run service-review.yaml playbook
+    vars:
+      playbook_name: service-review.yaml
+    dependencies: &infra_prod_service_review_deps
+      - name: infra-prod-update-system-config
+      - name: infra-prod-install-ansible
+        soft: true
+      - name: infra-prod-base
+        soft: true
+      - name: infra-prod-service-letsencrypt
+        soft: true
+      - name: system-config-promote-image-gerrit-2.13
+        soft: true
+    files:
+      - playbooks/service-review.yaml
+      - playbooks/group_vars/gerrit.yaml
+      - playbooks/host_vars/review01.openstack.org.yaml
+      - playbooks/roles/install-docker/.*
+      - playbooks/roles/gerrit/.*
+
+- job:
+    name: infra-prod-service-review-dev
+    parent: infra-prod-service-base
+    description: Run service-review-dev.yaml playbook
+    vars:
+      playbook_name: service-review-dev.yaml
+    dependencies: *infra_prod_service_review_deps
+    files:
+      - playbooks/service-review-dev.yaml
+      - playbooks/group_vars/gerrit.yaml
+      - playbooks/host_vars/review-dev01.opendev.org.yaml
+      - playbooks/roles/install-docker/.*
+      - playbooks/roles/gerrit/.*
+
 - job:
     name: system-config-goaccess-report
     description: |
@@ -2095,6 +2132,8 @@
         - infra-prod-service-backup
         - infra-prod-service-registry
         - infra-prod-service-zuul-preview
+        - infra-prod-service-review
+        - infra-prod-service-review-dev
     periodic:
       jobs:
         - developer-openstack-goaccess-report
@@ -2121,6 +2160,8 @@
         - infra-prod-service-mirror
         - infra-prod-service-static
         - infra-prod-service-backup
+        - infra-prod-service-review
+        - infra-prod-service-review-dev
     opendev-prod-hourly:
       jobs:
         - infra-prod-update-system-config
diff --git a/run_all.sh b/run_all.sh
index e045483841..02dbc9e766 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -72,14 +72,6 @@ set +e
 # Run all the ansible playbooks under timeout to prevent them from getting
 # stuck if they are oomkilled
 
-start_timer
-timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-review-dev.yaml
-send_timer nodepool
-
-start_timer
-timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-review.yaml
-send_timer nodepool
-
 start_timer
 timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-gitea.yaml
 send_timer nodepool