diff --git a/roles/grafana/templates/nginx.d.conf.j2 b/roles/grafana/templates/nginx.d.conf.j2
index afc6e76852420cdebeb08179bb1524fda7b07c6b..20ee1c0311a519879170d035ee4a5c0adeaf81ca 100644
--- a/roles/grafana/templates/nginx.d.conf.j2
+++ b/roles/grafana/templates/nginx.d.conf.j2
@@ -41,7 +41,7 @@ server {
 
 {% set proxy -%}
         proxy_pass http://grafana;
-        proxy_set_header X-Forwarded-For      $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-For      $remote_addr;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $connection_upgrade;
 {%- endset %}
diff --git a/roles/hedgedoc/templates/nginx.d.conf.j2 b/roles/hedgedoc/templates/nginx.d.conf.j2
index b9edcfd663abf967397b385a86c73b191e13dbbe..7680bdacae65fff4a144bcc07fc9a4062a59bba8 100644
--- a/roles/hedgedoc/templates/nginx.d.conf.j2
+++ b/roles/hedgedoc/templates/nginx.d.conf.j2
@@ -40,7 +40,7 @@ server {
         proxy_pass http://hedgedoc;
         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-For $remote_addr;
         proxy_set_header X-Forwarded-Proto $scheme;
 {%- endset %}
 
diff --git a/roles/keycloak/templates/nginx.d.conf.j2 b/roles/keycloak/templates/nginx.d.conf.j2
index f39f06ac8e24e8eb05fa3561819a5e7ff77d02ec..083a947df5c69f0812565690023629d67ab887ba 100644
--- a/roles/keycloak/templates/nginx.d.conf.j2
+++ b/roles/keycloak/templates/nginx.d.conf.j2
@@ -43,7 +43,7 @@ server {
         access_log   /var/log/nginx/{{ keycloak_domain }}/access.log.json json_main;
         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-For    $remote_addr;
         proxy_set_header    X-Forwarded-Proto  $scheme;
         proxy_ssl_verify    off;
         proxy_pass https://localhost:{{ keycloak_port }};
@@ -54,7 +54,7 @@ server {
         access_log   /var/log/nginx/{{ keycloak_domain }}/access.log.json json_main;
         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-For    $remote_addr;
         proxy_set_header    X-Forwarded-Proto  $scheme;
         proxy_ssl_verify    off;
         proxy_pass https://localhost:{{ keycloak_port }};