diff --git a/.zuul.yaml b/.zuul.yaml
index b9a6c04..6e5962c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,6 @@
     run: tests/test.yaml
     required-projects:
       - name: openstack-infra/zuul
-        override-branch: feature/zuulv3
     roles:
       - zuul: openstack/ansible-role-zuul
 
@@ -19,9 +18,6 @@
 
 - project:
     name: openstack/ansible-role-zuul
-    templates:
-      - windmill-jobs-fedora-26
-      - windmill-jobs-xenial
     check:
       jobs:
         - ansible-role-zuul-fedora-26
diff --git a/defaults/main.yaml b/defaults/main.yaml
index c1c787e..bbed878 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -63,7 +63,7 @@ zuul_file_zuul_conf_src: etc/zuul/zuul.conf
 # tasks/install.yaml
 zuul_git_dest: /opt/ansible-role-zuul/git/openstack-infra/zuul
 zuul_git_uri: https://git.openstack.org/openstack-infra/zuul
-zuul_git_version: feature/zuulv3
+zuul_git_version: master
 # zuul_git_update:
 
 zuul_install_method: git