diff --git a/passbolt/docker-compose.yml b/passbolt/docker-compose.yml
index 3b46f4e..858c5fe 100644
--- a/passbolt/docker-compose.yml
+++ b/passbolt/docker-compose.yml
@@ -68,9 +68,10 @@ services:
       - "traefik.http.services.${ROUTER_NAME}.loadbalancer.server.port=${CONTAINER_PORT}"
       - "traefik.docker.network=${TRAEFIK_NETWORK}"
 
-      - "traefik.http.middlewares.${ROUTER_NAME}-headers.headers.customrequestheaders.X-Forwarded-Proto=https"
-      - "traefik.http.routers.${ROUTER_NAME}.middlewares=${ROUTER_NAME}-headers"
-
+      - "traefik.http.routers.${ROUTER_NAME}.middlewares=passbolt-headers"
+      - "traefik.http.middlewares.passbolt-headers.headers.customrequestheaders.X-Forwarded-Proto=https"
+      - "traefik.http.middlewares.passbolt-headers.headers.customrequestheaders.X-Forwarded-For=$remote_addr"
+      
 networks:
   traefik:
     name: traefik