diff --git a/roles/zuul_server/tasks/main.yaml b/roles/zuul_server/tasks/main.yaml
index 35b1d4a..00f9248 100644
--- a/roles/zuul_server/tasks/main.yaml
+++ b/roles/zuul_server/tasks/main.yaml
@@ -46,6 +46,14 @@
     name: zuul
     priv: "ALL"
 
+- name: script for retrieving Zuul tenant configuration from Gerrit
+  copy:
+    dest: /usr/local/bin/zuul-fetch-tenants-from-gerrit.sh
+    src: files/zuul/zuul-fetch-tenants-from-gerrit.sh
+    owner: root
+    group: root
+    mode: 0755
+
 # TODO: this is always marked as 'changed' for some reason...
 - name: Install Zuul
   include_role:
@@ -56,7 +64,7 @@
     zuul_pip_executable: /opt/rh/rh-python36/root/bin/pip
     zuul_pip_extra_args: "--install-option='--install-scripts=/usr/local/bin'"
     zuul_file_zuul_conf_src: files/zuul/zuul.conf
-    zuul_file_main_yaml_src: files/zuul/main.yaml
+    zuul_file_main_yaml_manage: false
 
 - name: Provision Zuul SSH directory
   file: