diff --git a/modules/openstack_project/manifests/zuul.pp b/modules/openstack_project/manifests/zuul.pp
index 5b542ed83f..f38abf7a6d 100644
--- a/modules/openstack_project/manifests/zuul.pp
+++ b/modules/openstack_project/manifests/zuul.pp
@@ -30,7 +30,8 @@ class openstack_project::zuul(
     gerrit_user          => $gerrit_user,
     zuul_ssh_private_key => $zuul_ssh_private_key,
     url_pattern          => $url_pattern,
-    push_change_refs     => true
+    push_change_refs     => false,
+    status_url           => "http://${::fqdn}/",
   }
 
   file { '/etc/zuul/layout.yaml':
diff --git a/modules/zuul/templates/zuul.vhost.erb b/modules/zuul/templates/zuul.vhost.erb
index 1c5351ed96..2dda185652 100644
--- a/modules/zuul/templates/zuul.vhost.erb
+++ b/modules/zuul/templates/zuul.vhost.erb
@@ -9,6 +9,7 @@
 
   RewriteEngine on
   RewriteRule /zuul/status http://127.0.0.1:8001/status [P]
+  RewriteCond %{REQUEST_URI} !^/p/
   RewriteRule / http://127.0.0.1:8001/status [P]
 
   SetEnv GIT_PROJECT_ROOT /var/lib/zuul/git/