diff --git a/.zuul.yaml b/.zuul.yaml
index c5ac0abda6..96a590f497 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1557,6 +1557,22 @@
       - playbooks/roles/install-docker/.*
       - playbooks/roles/haproxy/.*
 
+- job:
+    name: infra-prod-service-nameserver
+    parent: infra-prod-service-base
+    description: Run service-nameserver.yaml playbook
+    vars:
+      playbook_name: service-nameserver.yaml
+    files:
+      - playbooks/service-nameserver.yaml
+      - playbooks/host_vars/adns1.opendev.org.yaml
+      - playbooks/host_vars/ns1.opendev.org.yaml
+      - playbooks/host_vars/ns2.opendev.org.yaml
+      - playbooks/group_vars/adns.yaml
+      - playbooks/group_vars/ns.yaml
+      - playbooks/roles/master-nameserver/.*
+      - playbooks/roles/nameserver/.*
+
 - job:
     name: infra-prod-service-nodepool
     parent: infra-prod-service-base
@@ -1959,6 +1975,7 @@
                 soft: true
         - infra-prod-service-bridge
         - infra-prod-service-gitea-lb
+        - infra-prod-service-nameserver
         - infra-prod-service-nodepool
         - infra-prod-service-meetpad
         - infra-prod-service-mirror-update
@@ -1981,6 +1998,7 @@
         - infra-prod-service-letsencrypt
         - infra-prod-service-bridge
         - infra-prod-service-gitea-lb
+        - infra-prod-service-nameserver
         - infra-prod-service-nodepool
         - infra-prod-service-meetpad
         - infra-prod-service-mirror-update
diff --git a/run_all.sh b/run_all.sh
index 677f077f8f..62705b865c 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-nameserver.yaml
-send_timer nameserver
-
 start_timer
 timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-mirror.yaml
 send_timer mirror