diff --git a/docker-compose/docker-compose.development.yml b/docker-compose/docker-compose.development.yml
index 3ae1b9c5d6f98baea8d13acc96cf2d57c051f37f..84ce2fa300b8aec393366a4f22cc6a822487817e 100644
--- a/docker-compose/docker-compose.development.yml
+++ b/docker-compose/docker-compose.development.yml
@@ -11,6 +11,7 @@ services:
       - "./app:/home/nopaque/app"
       - "./boot.sh:/home/nopaque/boot.sh"
       - "./config.py:/home/nopaque/config.py"
+      - "./docker-entrypoint.sh:/home/nopaque/docker-entrypoint.sh"
       - "./migrations:/home/nopaque/migrations"
       - "./nopaque.py:/home/nopaque/nopaque.py"
       - "./requirements.txt:/home/nopaque/requirements.txt"
diff --git a/docker-compose/docker-compose.traefik.yml b/docker-compose/docker-compose.traefik.yml
index d0f7f4d338e9cb0ba2825d60b0438ac03010e8ea..51655c5c3b8331e2c016fa9979eb983aea4feaab 100644
--- a/docker-compose/docker-compose.traefik.yml
+++ b/docker-compose/docker-compose.traefik.yml
@@ -1,7 +1,3 @@
-################################################################################
-# Don't forget to set the proxy variables in your nopaque.env                  #
-# Traefik sets the X_FOR, X_HOST, X_PORT and X_PROTO headers by default        #
-################################################################################
 version: "3.5"
 
 networks:
@@ -11,6 +7,12 @@ networks:
 
 services:
   nopaque:
+    environment:
+      - NOPAQUE_PROXY_FIX_X_FOR=1
+      - NOPAQUE_PROXY_FIX_X_HOST=1
+      - NOPAQUE_PROXY_FIX_X_PORT=1
+      - NOPAQUE_PROXY_FIX_X_PREFIX=0
+      - NOPAQUE_PROXY_FIX_X_PROTO=1
     labels:
       - "traefik.docker.network=traefik"
       - "traefik.enable=true"