diff --git a/conf/server-base.conf b/conf/server-base.conf
index ac1cc883f..4a919ba5a 100644
--- a/conf/server-base.conf
+++ b/conf/server-base.conf
@@ -50,6 +50,11 @@ location ~ ^/(v1/repositories|v2/auth)/ {
 }
 
 location ~ ^/(v1|v2)/  {
+    # Setting ANY header clears all inherited proxy_set_header directives
+    proxy_set_header X-Forwarded-For $proper_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header Host $host;
+
     proxy_buffering off;
 
     proxy_request_buffering off;