diff --git a/playbooks/zuul_reconfigure.yaml b/playbooks/zuul_reconfigure.yaml
index aad04145ea..4c52e082f1 100644
--- a/playbooks/zuul_reconfigure.yaml
+++ b/playbooks/zuul_reconfigure.yaml
@@ -1,4 +1,4 @@
-- hosts: 'zuul01.openstack.org'
+- hosts: 'zuul-scheduler:!disabled'
   any_errors_fatal: true
   tasks:
     - name: Reconfigure the zuul scheduler
diff --git a/playbooks/zuul_restart.yaml b/playbooks/zuul_restart.yaml
index c9b67d1605..87d18dcd39 100644
--- a/playbooks/zuul_restart.yaml
+++ b/playbooks/zuul_restart.yaml
@@ -1,6 +1,6 @@
 # Run this with "-f 20"
 
-- hosts: 'zuul01.openstack.org'
+- hosts: 'zuul-scheduler:!disabled'
   any_errors_fatal: true
   tasks:
     - name: Stop Zuul Scheduler
@@ -37,7 +37,7 @@
         state: absent
         timeout: 11400
 
-- hosts: 'zm*.openstack.org'
+- hosts: 'zuul-merger:!disabled'
   tasks:
     - name: Stop Zuul Mergers
       service:
@@ -46,7 +46,7 @@
       become: true
       become_user: root
 
-- hosts: 'ze*.openstack.org'
+- hosts: 'zuul-executor:!disabled'
   tasks:
     - name: Stop Zuul Executors
       service:
@@ -55,7 +55,7 @@
       become: true
       become_user: root
 
-- hosts: 'zuul01.openstack.org'
+- hosts: 'zuul-scheduler:!disabled'
   tasks:
     - name: Start Zuul Scheduler
       service:
@@ -76,7 +76,7 @@
       become: true
       become_user: root
 
-- hosts: 'zm*.openstack.org'
+- hosts: 'zuul-merger:!disabled'
   tasks:
     - name: Wait for (3h10m) to stop Zuul Mergers
       wait_for:
@@ -90,7 +90,7 @@
       become: true
       become_user: root
 
-- hosts: 'ze*.openstack.org'
+- hosts: 'zuul-executor:!disabled'
   tasks:
     - name: Wait for (3h10m) to stop Zuul Executors
       wait_for:
diff --git a/playbooks/zuul_start.yaml b/playbooks/zuul_start.yaml
index 51148cc707..537edb8789 100644
--- a/playbooks/zuul_start.yaml
+++ b/playbooks/zuul_start.yaml
@@ -1,6 +1,6 @@
 # Run this with "-f 20"
 
-- hosts: 'zuul01.openstack.org'
+- hosts: 'zuul-scheduler:!disabled'
   tasks:
     - name: Start Zuul Scheduler
       service:
@@ -21,7 +21,7 @@
       become: true
       become_user: root
 
-- hosts: 'zm*.openstack.org'
+- hosts: 'zuul-merger:!disabled'
   tasks:
     - name: Start Zuul Mergers
       service:
@@ -30,7 +30,7 @@
       become: true
       become_user: root
 
-- hosts: 'ze*.openstack.org'
+- hosts: 'zuul-executor:!disabled'
   tasks:
     - name: Start Zuul Executors
       service:
diff --git a/playbooks/zuul_stop.yaml b/playbooks/zuul_stop.yaml
index b9ba206494..09ea8ce5e7 100644
--- a/playbooks/zuul_stop.yaml
+++ b/playbooks/zuul_stop.yaml
@@ -1,6 +1,6 @@
 # Run this with "-f 20"
 
-- hosts: 'zuul01.openstack.org'
+- hosts: 'zuul-scheduler:!disabled'
   any_errors_fatal: true
   tasks:
     - name: Stop Zuul Scheduler
@@ -37,7 +37,7 @@
         state: absent
         timeout: 11400
 
-- hosts: 'zm*.openstack.org'
+- hosts: 'zuul-merger:!disabled'
   tasks:
     - name: Stop Zuul Merger
       service:
@@ -51,7 +51,7 @@
         state: absent
         timeout: 11400
 
-- hosts: 'ze*.openstack.org'
+- hosts: 'zuul-executor:!disabled'
   tasks:
     - name: Stop Zuul Executor
       service: