diff --git a/templates/jenkins.vhost.erb b/templates/jenkins.vhost.erb
index ef0f8ce..de9f22e 100644
--- a/templates/jenkins.vhost.erb
+++ b/templates/jenkins.vhost.erb
@@ -36,12 +36,9 @@
              # MSIE 7 and newer should be able to use keepalive
              BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
 
-             RewriteEngine on
-             RewriteCond %{HTTP_HOST} !<%= scope.lookupvar("::jenkins::master::vhost_name") %>
-             RewriteRule ^.*$ https://<%= scope.lookupvar("::jenkins::master::vhost_name") %>/
-
-             RewriteRule /zuul/status http://127.0.0.1:8001/status [P]
-
-             ProxyPass / http://127.0.0.1:8080/ retry=0
+             AllowEncodedSlashes NoDecode
+             ProxyPass / http://127.0.0.1:8080/ retry=0 nocanon
              ProxyPassReverse / http://127.0.0.1:8080/
+             RequestHeader set X-Forwarded-Proto "https"
+             RequestHeader set X-Forwarded-Port "443"
 </VirtualHost>