diff --git a/.zuul.yaml b/.zuul.yaml
index 8f219ec116..e7436b83e8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1557,6 +1557,23 @@
       - playbooks/roles/install-docker/.*
       - playbooks/roles/haproxy/.*
 
+- job:
+    name: infra-prod-service-nodepool
+    parent: infra-prod-service-base
+    description: Run service-nodepool.yaml playbook
+    vars:
+      playbook_name: service-nodepool.yaml
+    files:
+      - playbooks/service-nodepool.yaml
+      - playbooks/host_vars/nb.*
+      - playbooks/host_vars/nl.*
+      - playbooks/group_vars/nodepool.*
+      - playbooks/roles/configure-kubectl/.*
+      - playbooks/roles/configure-openstacksdk/.*
+      - playbooks/roles/install-docker/.*
+      - playbooks/roles/nodepool-.*
+      - playbooks/templates/clouds/nodepool_.*
+
 - job:
     name: system-config-goaccess-report
     description: |
@@ -1907,6 +1924,7 @@
                 soft: true
         - infra-prod-service-bridge
         - infra-prod-service-gitea-lb
+        - infra-prod-service-nodepool
     periodic:
       jobs:
         - developer-openstack-goaccess-report
@@ -1926,3 +1944,4 @@
         - infra-prod-service-letsencrypt
         - infra-prod-service-bridge
         - infra-prod-service-gitea-lb
+        - infra-prod-service-nodepool
diff --git a/run_all.sh b/run_all.sh
index d150087322..3663a4e569 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -76,10 +76,6 @@ start_timer
 timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-nameserver.yaml
 send_timer nameserver
 
-start_timer
-timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-nodepool.yaml
-send_timer nodepool
-
 start_timer
 timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-meetpad.yaml
 send_timer meetpad