diff --git a/playbooks/zuul_restart.yaml b/playbooks/zuul_restart.yaml
new file mode 100644
index 0000000000..c9b67d1605
--- /dev/null
+++ b/playbooks/zuul_restart.yaml
@@ -0,0 +1,105 @@
+# Run this with "-f 20"
+
+- hosts: 'zuul01.openstack.org'
+  any_errors_fatal: true
+  tasks:
+    - name: Stop Zuul Scheduler
+      service:
+        name: zuul-scheduler
+        state: stopped
+      become: true
+      become_user: root
+    - name: Stop Zuul Web
+      service:
+        name: zuul-web
+        state: stopped
+      become: true
+      become_user: root
+    - name: Stop Zuul Finger Gateway
+      service:
+        name: zuul-fingergw
+        state: stopped
+      become: true
+      become_user: root
+    - name: Wait for (3h10m) to stop Zuul Scheduler
+      wait_for:
+        path: /var/run/zuul/scheduler.pid
+        state: absent
+        timeout: 11400
+    - name: Wait for (3h10m) to stop Zuul Web
+      wait_for:
+        path: /var/run/zuul/web.pid
+        state: absent
+        timeout: 11400
+    - name: Wait for (3h10m) to stop Zuul Finger Gateway
+      wait_for:
+        path: /var/run/zuul/fingergw.pid
+        state: absent
+        timeout: 11400
+
+- hosts: 'zm*.openstack.org'
+  tasks:
+    - name: Stop Zuul Mergers
+      service:
+        name: zuul-merger
+        state: stopped
+      become: true
+      become_user: root
+
+- hosts: 'ze*.openstack.org'
+  tasks:
+    - name: Stop Zuul Executors
+      service:
+        name: zuul-executor
+        state: stopped
+      become: true
+      become_user: root
+
+- hosts: 'zuul01.openstack.org'
+  tasks:
+    - name: Start Zuul Scheduler
+      service:
+        name: zuul-scheduler
+        state: started
+      become: true
+      become_user: root
+    - name: Stop Zuul Web
+      service:
+        name: zuul-web
+        state: started
+      become: true
+      become_user: root
+    - name: Stop Zuul Finger Gateway
+      service:
+        name: zuul-fingergw
+        state: started
+      become: true
+      become_user: root
+
+- hosts: 'zm*.openstack.org'
+  tasks:
+    - name: Wait for (3h10m) to stop Zuul Mergers
+      wait_for:
+        path: /var/run/zuul/merger.pid
+        state: absent
+        timeout: 11400
+    - name: Start Zuul Mergers
+      service:
+        name: zuul-merger
+        state: started
+      become: true
+      become_user: root
+
+- hosts: 'ze*.openstack.org'
+  tasks:
+    - name: Wait for (3h10m) to stop Zuul Executors
+      wait_for:
+        path: /var/run/zuul/executor.pid
+        state: absent
+        timeout: 11400
+    - name: Start Zuul Executors
+      service:
+        name: zuul-executor
+        state: started
+      become: true
+      become_user: root
diff --git a/playbooks/zuul_start.yaml b/playbooks/zuul_start.yaml
new file mode 100644
index 0000000000..51148cc707
--- /dev/null
+++ b/playbooks/zuul_start.yaml
@@ -0,0 +1,40 @@
+# Run this with "-f 20"
+
+- hosts: 'zuul01.openstack.org'
+  tasks:
+    - name: Start Zuul Scheduler
+      service:
+        name: zuul-scheduler
+        state: started
+      become: true
+      become_user: root
+    - name: Stop Zuul Web
+      service:
+        name: zuul-web
+        state: started
+      become: true
+      become_user: root
+    - name: Stop Zuul Finger Gateway
+      service:
+        name: zuul-fingergw
+        state: started
+      become: true
+      become_user: root
+
+- hosts: 'zm*.openstack.org'
+  tasks:
+    - name: Start Zuul Mergers
+      service:
+        name: zuul-merger
+        state: started
+      become: true
+      become_user: root
+
+- hosts: 'ze*.openstack.org'
+  tasks:
+    - name: Start Zuul Executors
+      service:
+        name: zuul-executor
+        state: started
+      become: true
+      become_user: root
diff --git a/playbooks/zuul_stop.yaml b/playbooks/zuul_stop.yaml
new file mode 100644
index 0000000000..b9ba206494
--- /dev/null
+++ b/playbooks/zuul_stop.yaml
@@ -0,0 +1,66 @@
+# Run this with "-f 20"
+
+- hosts: 'zuul01.openstack.org'
+  any_errors_fatal: true
+  tasks:
+    - name: Stop Zuul Scheduler
+      service:
+        name: zuul-scheduler
+        state: stopped
+      become: true
+      become_user: root
+    - name: Stop Zuul Web
+      service:
+        name: zuul-web
+        state: stopped
+      become: true
+      become_user: root
+    - name: Stop Zuul Finger Gateway
+      service:
+        name: zuul-fingergw
+        state: stopped
+      become: true
+      become_user: root
+    - name: Wait for (3h10m) to stop Zuul Scheduler
+      wait_for:
+        path: /var/run/zuul/scheduler.pid
+        state: absent
+        timeout: 11400
+    - name: Wait for (3h10m) to stop Zuul Web
+      wait_for:
+        path: /var/run/zuul/web.pid
+        state: absent
+        timeout: 11400
+    - name: Wait for (3h10m) to stop Zuul Finger Gateway
+      wait_for:
+        path: /var/run/zuul/fingergw.pid
+        state: absent
+        timeout: 11400
+
+- hosts: 'zm*.openstack.org'
+  tasks:
+    - name: Stop Zuul Merger
+      service:
+        name: zuul-merger
+        state: stopped
+      become: true
+      become_user: root
+    - name: Wait for (3h10m) to stop Zuul Merger
+      wait_for:
+        path: /var/run/zuul/merger.pid
+        state: absent
+        timeout: 11400
+
+- hosts: 'ze*.openstack.org'
+  tasks:
+    - name: Stop Zuul Executor
+      service:
+        name: zuul-executor
+        state: stopped
+      become: true
+      become_user: root
+    - name: Wait for (3h10m) to stop Zuul Executor
+      wait_for:
+        path: /var/run/zuul/executor.pid
+        state: absent
+        timeout: 11400
diff --git a/start_all_zuul.yaml b/start_all_zuul.yaml
deleted file mode 100644
index e5857cf4b1..0000000000
--- a/start_all_zuul.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- hosts: 'zuul.openstack.org'
-  any_errors_fatal: true
-  tasks:
-    - name: Start Zuul
-      service:
-        name: zuul
-        state: started
-      become: true
-      become_user: root
-
-- hosts: 'zm0*.openstack.org'
-  tasks:
-    - name: Start zuul-merger
-      service:
-        name: zuul-merger
-        state: started
-      become: true
-      become_user: root
diff --git a/stop_all_zuul.yaml b/stop_all_zuul.yaml
deleted file mode 100644
index b2cb8c476a..0000000000
--- a/stop_all_zuul.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- hosts: 'zuul.openstack.org'
-  any_errors_fatal: true
-  tasks:
-    - name: Stop Zuul
-      service:
-        name: zuul
-        state: stopped
-      become: true
-      become_user: root
-    - name: Wait for (3h10m) to stop zuul
-      wait_for:
-        path: /var/run/zuul/zuul.pid
-        state: absent
-        timeout: 11400
-
-- hosts: 'zm0*.openstack.org'
-  tasks:
-    - name: Hard stop zuul-merger
-      service:
-        name: zuul-merger
-        state: stopped
-      become: true
-      become_user: root
-    - name: Wait for (3h10m) to stop zuul-merger
-      wait_for:
-        path: /var/run/zuul-merger/zuul-merger.pid
-        state: absent
-        timeout: 11400