diff --git a/templates/nginx-rp-site.j2 b/templates/nginx-rp-site.j2
index f155d0c..515a614 100644
--- a/templates/nginx-rp-site.j2
+++ b/templates/nginx-rp-site.j2
@@ -14,8 +14,9 @@ server {
     location /ws {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $host;
         proxy_pass http://{{ zammad_host }}:80;
     }
-    location / { proxy_pass http://{{ zammad_host }}:80; }
+    location / {
+        proxy_pass http://{{ zammad_host }}:80;
+    }
 }
diff --git a/templates/nginx-site.j2 b/templates/nginx-site.j2
index 90ebff2..7a4b59c 100644
--- a/templates/nginx-site.j2
+++ b/templates/nginx-site.j2
@@ -15,8 +15,7 @@ server {
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "Upgrade";
-        proxy_set_header CLIENT_IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header CLIENT_IP $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_read_timeout 86400;
         proxy_pass http://127.0.0.1:6042;
@@ -24,8 +23,7 @@ server {
 
     location / {
         proxy_set_header Host $http_host;
-        proxy_set_header CLIENT_IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header CLIENT_IP $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto https;
         # Change this line in an SSO setup
         proxy_set_header X-Forwarded-User "";