diff --git a/playbooks/roles/zuul-scheduler/files/zuul-client b/playbooks/roles/zuul-scheduler/files/zuul-client
new file mode 100644
index 0000000000..dd5408ffc6
--- /dev/null
+++ b/playbooks/roles/zuul-scheduler/files/zuul-client
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker run --rm -it --network=host -v /root/.config/zuul:/root/.config/zuul zuul/zuul-client --use-config opendev $*
diff --git a/playbooks/roles/zuul-scheduler/tasks/main.yaml b/playbooks/roles/zuul-scheduler/tasks/main.yaml
index d277fdb2f0..885b802712 100644
--- a/playbooks/roles/zuul-scheduler/tasks/main.yaml
+++ b/playbooks/roles/zuul-scheduler/tasks/main.yaml
@@ -88,6 +88,23 @@
   vars:
     logrotate_file_name: /var/log/zuul/gearman-server.log
 
+- name: Install zuul-client script
+  copy:
+    src: zuul-client
+    dest: /usr/local/bin/zuul-client
+    mode: "0555"
+
+- name: Make zuul-client config directory
+  file:
+    state: directory
+    path: /root/.config/zuul
+
+- name: Install zuul-client config
+  template:
+    src: client.conf
+    dest: /root/.config/zuul/client.conf
+    mode: "0400"
+
 - name: Make docker-compose directory
   file:
     state: directory
diff --git a/playbooks/roles/zuul-scheduler/templates/client.conf b/playbooks/roles/zuul-scheduler/templates/client.conf
new file mode 100644
index 0000000000..c250360670
--- /dev/null
+++ b/playbooks/roles/zuul-scheduler/templates/client.conf
@@ -0,0 +1,3 @@
+[opendev]
+url=https://zuul.opendev.org/
+auth_token={{ zuul_client_auth_token }}
diff --git a/playbooks/zuul/templates/group_vars/zuul-scheduler.yaml.j2 b/playbooks/zuul/templates/group_vars/zuul-scheduler.yaml.j2
index b2b5d86425..3e7adf263b 100644
--- a/playbooks/zuul/templates/group_vars/zuul-scheduler.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/zuul-scheduler.yaml.j2
@@ -1,3 +1,4 @@
+zuul_client_auth_token: testauthtoken
 zuul_scheduler_start: true
 
 gearman_server_ssl_key: |