diff --git a/nginx-ssl.sample.conf b/nginx-ssl.sample.conf
index 41cc093..f2330f2 100644
--- a/nginx-ssl.sample.conf
+++ b/nginx-ssl.sample.conf
@@ -3,7 +3,7 @@ upstream backend {
 }
 
 map $sent_http_content_type $charset {
-	~^text/ utf-8;
+    ~^text/ utf-8;
 }
 
 server {
@@ -17,8 +17,8 @@ server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
 
-	server_name lolisafe.moe;
-	server_tokens off;
+    server_name lolisafe.moe;
+    server_tokens off;
 
     ssl_certificate /path/to/your/fullchain.pem;
     ssl_certificate_key /path/to/your/privkey.pem;
@@ -26,31 +26,39 @@ server {
 
     client_max_body_size 100M; # Change this to the max file size you want to allow
 
-	charset $charset;
-	charset_types *;
+    charset $charset;
+    charset_types *;
 
-	# Uncomment if you are running lolisafe behind CloudFlare.
-	# This requires NGINX compiled from source with:
-	#	--with-http_realip_module
-	#include /path/to/lolisafe/real-ip-from-cf;
+    # Uncomment if you are running lolisafe behind CloudFlare.
+    # This requires NGINX compiled from source with:
+    #	--with-http_realip_module
+    #include /path/to/lolisafe/real-ip-from-cf;
 
-	location / {
-		add_header Access-Control-Allow-Origin *;
-		root /path/to/your/uploads/folder;
-		try_files $uri @proxy;
-	}
+    location / {
+        add_header Access-Control-Allow-Origin *;
+        root /path/to/your/uploads/folder;
+        try_files $uri @proxy;
+    }
 
     location @proxy {
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-NginX-Proxy true;
         proxy_pass http://backend;
         proxy_redirect off;
         proxy_http_version 1.1;
+
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
-        proxy_redirect off;
-        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Host $host;
+        proxy_set_header X-Forwarded-Port $server_port;
+        proxy_set_header X-Forwarded-Protocol $scheme;
+        proxy_set_header X-NginX-Proxy true;
+
+        # Enabling these may help with clients with slow upload speeds.
+        #proxy_connect_timeout 300s;
+        #proxy_send_timeout 300s;
+        #proxy_read_timeout 600s;
+        #send_timeout 300s;
     }
 }
diff --git a/nginx.sample.conf b/nginx.sample.conf
index 6da3429..b695c85 100644
--- a/nginx.sample.conf
+++ b/nginx.sample.conf
@@ -3,43 +3,51 @@ upstream backend {
 }
 
 map $sent_http_content_type $charset {
-	~^text/ utf-8;
+    ~^text/ utf-8;
 }
 
 server {
     listen 80;
     listen [::]:80;
 
-	server_name lolisafe.moe;
-	server_tokens off;
+    server_name lolisafe.moe;
+    server_tokens off;
 
     client_max_body_size 100M; # Change this to the max file size you want to allow
 
-	charset $charset;
-	charset_types *;
+    charset $charset;
+    charset_types *;
 
-	# Uncomment if you are running lolisafe behind CloudFlare.
-	# This requires NGINX compiled from source with:
-	#	--with-http_realip_module
-	#include /path/to/lolisafe/real-ip-from-cf;
+    # Uncomment if you are running lolisafe behind CloudFlare.
+    # This requires NGINX compiled from source with:
+    #	--with-http_realip_module
+    #include /path/to/lolisafe/real-ip-from-cf;
 
-	location / {
-		add_header Access-Control-Allow-Origin *;
-		root /path/to/your/uploads/folder;
-		try_files $uri @proxy;
-	}
+    location / {
+        add_header Access-Control-Allow-Origin *;
+        root /path/to/your/uploads/folder;
+        try_files $uri @proxy;
+    }
 
     location @proxy {
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-NginX-Proxy true;
         proxy_pass http://backend;
         proxy_redirect off;
         proxy_http_version 1.1;
+
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
-        proxy_redirect off;
-        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Host $host;
+        proxy_set_header X-Forwarded-Port $server_port;
+        proxy_set_header X-Forwarded-Protocol $scheme;
+        proxy_set_header X-NginX-Proxy true;
+
+        # Enabling these may help with clients with slow upload speeds.
+        #proxy_connect_timeout 300s;
+        #proxy_send_timeout 300s;
+        #proxy_read_timeout 600s;
+        #end_timeout 300s;
     }
 }