diff --git a/conf/server-base.conf b/conf/server-base.conf
index 22889a5e9..ac1cc883f 100644
--- a/conf/server-base.conf
+++ b/conf/server-base.conf
@@ -19,7 +19,7 @@ add_header X-Frame-Options DENY;
 # Proxy Headers
 proxy_set_header X-Forwarded-For $proper_forwarded_for;
 proxy_set_header X-Forwarded-Proto $scheme;
-proxy_set_header Host $http_host;
+proxy_set_header Host $host;
 proxy_redirect off;
 
 proxy_set_header Transfer-Encoding $http_transfer_encoding;
@@ -55,8 +55,6 @@ location ~ ^/(v1|v2)/  {
     proxy_request_buffering off;
 
     proxy_http_version 1.1;
-    proxy_set_header Connection "";
-    proxy_set_header Host $host;
 
     proxy_pass   http://registry_app_server;
     proxy_temp_path /tmp 1 2;
@@ -71,20 +69,6 @@ location /v1/_ping {
     return 200 'true';
 }
 
-location /v2/ {
-    proxy_buffering off;
-
-    proxy_request_buffering off;
-
-    proxy_http_version 1.1;
-    proxy_set_header Connection "";
-
-    proxy_pass   http://registry_app_server;
-    proxy_temp_path /tmp 1 2;
-
-    client_max_body_size 20G;
-}
-
 location /c1/ {
     proxy_buffering off;