diff --git a/docker-compose.yml b/docker-compose.yml
index 6540acf..4562ef6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
             COMMIT_SHA: dev
             PROXY_PORT: 8000
             DNS_RESOLVER: '127.0.0.11 valid=0s'
-            LISTEN_IPV6: 'true'
+            LISTEN_IPV6: 'false'
             CLIENT_MAX_BODY_SIZE: 20m
             ERROR_LOG_LEVEL: error
             WEB_SDK_HOST: web-sdk.smartlook.com
diff --git a/nginx/templates/default.conf.template b/nginx/templates/default.conf.template
index 66f25d5..952b146 100644
--- a/nginx/templates/default.conf.template
+++ b/nginx/templates/default.conf.template
@@ -4,7 +4,7 @@ map $status $loggable {
 }
 
 server {
-    listen ${PROXY_PORT};
+    listen ${PROXY_PORT} proxy_protocol;
     
     proxy_cache off;
 
@@ -36,8 +36,6 @@ server {
 
         proxy_set_header Host $manager_host;
         proxy_set_header X-Forwarded-Host $manager_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-By smartlook-relay-proxy;
     }
@@ -48,8 +46,6 @@ server {
 
         proxy_set_header Host $assets_proxy_host;
         proxy_set_header X-Forwarded-Host $assets_proxy_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-By smartlook-relay-proxy;
     }
@@ -60,8 +56,6 @@ server {
 
         proxy_set_header Host $web_sdk_writer_host;
         proxy_set_header X-Forwarded-Host $web_sdk_writer_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-By smartlook-relay-proxy;
     }
@@ -72,8 +66,6 @@ server {
 
         proxy_set_header Host $mobile_sdk_writer_host;
         proxy_set_header X-Forwarded-Host $mobile_sdk_writer_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-By smartlook-relay-proxy;
     }
@@ -83,8 +75,6 @@ server {
 
         proxy_set_header Host $web_sdk_host;
         proxy_set_header X-Forwarded-Host $web_sdk_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-By smartlook-relay-proxy;
     }