diff --git a/etc/nginx/snippets/proxy.conf b/etc/nginx/snippets/proxy.conf
index fd9a270..465dd50 100644
--- a/etc/nginx/snippets/proxy.conf
+++ b/etc/nginx/snippets/proxy.conf
@@ -13,6 +13,7 @@ proxy_set_header X-Real-IP $remote_addr;
 # Restore original method & URL
 proxy_set_header X-Original-Method $request_method;
 proxy_set_header X-Original-URL $scheme://$http_host$request_uri;
+proxy_set_header X-Original-URI $request_uri;
 
 # Forward host header
 proxy_set_header Host $host;
@@ -23,5 +24,7 @@ proxy_set_header   Connection "upgrade";
 
 # Enable X-Forwarded headers
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Host $http_host;
+proxy_set_header X-Forwarded-Host $host;
 proxy_set_header X-Forwarded-Proto $scheme;
+proxy_set_header X-Forwarded-Ssl on;
+proxy_set_header X-Forwarded-Port $server_port;