diff --git a/web-server/apache/gitlab-omnibus-ssl-apache24.conf b/web-server/apache/gitlab-omnibus-ssl-apache24.conf
index 416ea208620b63cdf499d2b5c791b6b4b0aac3c2..ed68eba5a23de672140be7dcd7a250183a123ddf 100644
--- a/web-server/apache/gitlab-omnibus-ssl-apache24.conf
+++ b/web-server/apache/gitlab-omnibus-ssl-apache24.conf
@@ -19,9 +19,7 @@
   ServerName YOUR_SERVER_FQDN
   ServerSignature Off
 
-  RewriteEngine on
-  RewriteCond %{HTTPS} !=on
-  RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L]
+  Redirect permanent "/" https://%{SERVER_NAME}
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -39,8 +37,14 @@
 
   ServerName YOUR_SERVER_FQDN
   ServerSignature Off
-
+  
+  ProxyRequests Off
+  SSLProxyEngine On
   ProxyPreserveHost On
+  AllowEncodedSlashes NoDecode
+
+  ProxyPass / http://127.0.0.1:8181/ keepalive=On connectiontimeout=10 retry=0
+  ProxyPassReverse / http://127.0.0.1:8181/
 
   # Ensure that encoded slashes are not decoded but left in their encoded state.
   # http://doc.gitlab.com/ce/api/projects.html#get-single-project