diff --git a/.zuul.yaml b/.zuul.yaml
index 74788c248d..8536103661 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1671,6 +1671,18 @@
       - playbooks/roles/backup/.*
       - playbooks/roles/backup-server/.*
 
+- job:
+    name: infra-prod-service-registry
+    parent: infra-prod-service-base
+    description: Run service-registry.yaml playbook
+    vars:
+      playbook_name: service-registry.yaml
+    files:
+      - playbooks/service-registry.yaml
+      - playbooks/group_vars/registry.yaml
+      - playbooks/roles/install-docker/.*
+      - playbooks/roles/registry/.*
+
 - job:
     name: system-config-goaccess-report
     description: |
@@ -2028,6 +2040,7 @@
         - infra-prod-service-mirror
         - infra-prod-service-static
         - infra-prod-service-backup
+        - infra-prod-service-registry
     periodic:
       jobs:
         - developer-openstack-goaccess-report
@@ -2054,3 +2067,4 @@
         - infra-prod-service-mirror
         - infra-prod-service-static
         - infra-prod-service-backup
+        - infra-prod-service-registry
diff --git a/run_all.sh b/run_all.sh
index 6718c77a89..bf87ece059 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -72,10 +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-registry.yaml
-send_timer registry
-
 start_timer
 timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-zuul.yaml
 send_timer zuul