diff --git a/doc/source/signing.rst b/doc/source/signing.rst
index 6001e6cccb..9cfa551954 100644
--- a/doc/source/signing.rst
+++ b/doc/source/signing.rst
@@ -457,7 +457,7 @@ as a secret to Zuul for use by release jobs.
     > --export-secret-subkeys 0xC0224DB5F541FB68\!
     root@puppetmaster:~# wget -O encrypt_secret.py \
     > https://git.openstack.org/cgit/openstack-infra/zuul/plain/tools/encrypt_secret.py?\
-    > h=feature/zuulv3
+    > h=master
     root@puppetmaster:~# python encrypt_secret.py --infile temporary.gnupg/for-zuul \
     > --outfile temporary.gnupg/zuul.yaml https://zuul.openstack.org gerrit \
     > openstack-infra/project-config
diff --git a/doc/source/zuulv3.rst b/doc/source/zuulv3.rst
index a46a0bc770..f99bb26b2b 100644
--- a/doc/source/zuulv3.rst
+++ b/doc/source/zuulv3.rst
@@ -28,7 +28,7 @@ At a Glance
   * :config:`zuul/main.yaml`
   * :config:`zuul.yaml`
 :Projects:
-  * https://git.openstack.org/cgit/openstack-infra/zuul/tree/?h=feature/zuulv3
+  * https://git.openstack.org/cgit/openstack-infra/zuul/tree/
 :Bugs:
   * https://storyboard.openstack.org/#!/project/679
 :Resources:
@@ -222,5 +222,5 @@ Information about the configuration of the OpenStack Zuul App itself can be
 found on the :ref:`github` page at :ref:`openstack_zuul_app`.
 
 .. _OpenStack Zuul: https://github.com/apps/openstack-zuul
-.. _Zuul Reference Manual: https://docs.openstack.org/infra/zuul/feature/zuulv3
+.. _Zuul Reference Manual: https://docs.openstack.org/infra/zuul
 .. _Zuul Status Page: http://zuul.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 2a14e73177..26e4ea50c5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1026,7 +1026,7 @@ node /^nl\d+\.openstack\.org$/ {
     project_config_repo      => 'https://git.openstack.org/openstack-infra/project-config',
     oscc_file_contents       => $clouds_yaml,
     statsd_host              => 'graphite.openstack.org',
-    revision                 => 'feature/zuulv3',
+    revision                 => 'master',
     python_version           => 3,
   }
 
@@ -1097,7 +1097,7 @@ node /^nb0[12].openstack\.org$/ {
     statsd_host                   => 'graphite.openstack.org',
     builder_logging_conf_template => 'openstack_project/nodepool/nodepool-builder.logging.conf.erb',
     upload_workers                => '16',
-    revision                      => 'feature/zuulv3',
+    revision                      => 'master',
     python_version                => 3,
     zuulv3                        => true,
   }
@@ -1221,7 +1221,7 @@ node /^ze\d+\.openstack\.org$/ {
   $zuul_static_private_key = hiera('jenkins_ssh_private_key_contents')
   $git_email               = 'zuul@openstack.org'
   $git_name                = 'OpenStack Zuul'
-  $revision                = 'feature/zuulv3'
+  $revision                = 'master'
 
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [79, 7900],
@@ -1302,7 +1302,7 @@ node 'zuulv3.openstack.org' {
   $zuul_url             = "http://${::fqdn}/p"
   $git_email            = 'zuul@openstack.org'
   $git_name             = 'OpenStack Zuul'
-  $revision             = 'feature/zuulv3'
+  $revision             = 'master'
 
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [79, 80, 443],
@@ -1397,7 +1397,7 @@ node /^zuul\d+\.openstack\.org$/ {
   $zuul_url             = "http://zuul.openstack.org/p"
   $git_email            = 'zuul@openstack.org'
   $git_name             = 'OpenStack Zuul'
-  $revision             = 'feature/zuulv3'
+  $revision             = 'master'
 
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [79, 80, 443],
@@ -1493,7 +1493,7 @@ node /^zm\d+.openstack\.org$/ {
   $zuul_url             = "http://${::fqdn}/p"
   $git_email            = 'zuul@openstack.org'
   $git_name             = 'OpenStack Zuul'
-  $revision             = 'feature/zuulv3'
+  $revision             = 'master'
 
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80],