diff --git a/etc/nginx/conf.d/proxyHeaders.conf b/etc/nginx/conf.d/proxyHeaders.conf
index 6a105c9..8e34a53 100644
--- a/etc/nginx/conf.d/proxyHeaders.conf
+++ b/etc/nginx/conf.d/proxyHeaders.conf
@@ -3,10 +3,14 @@
 #######
 
 proxy_set_header Host $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-Host $host;
-proxy_set_header X-Forwarded-Protocol $scheme;
-proxy_set_header X-Forwarded-For $remote_addr;
 proxy_set_header X-Forwarded-Port $server_port;
+proxy_set_header X-Forwarded-Protocol $scheme;
 proxy_set_header X-Forwarded-Server $host;
-proxy_set_header Early-Data $ssl_early_data;
+proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header X-Scheme $scheme;
+
+# if 'ssl_early_data' enabled in SSL configuration, then uncomment this
+#proxy_set_header Early-Data $ssl_early_data;