diff --git a/docker-compose.yml b/docker-compose.yml
index bd32c5b..154f957 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,15 +19,10 @@ services:
     restart: unless-stopped
     ports:
       - "3000:3000"
+    env_file:
+      - ./nest-backend/.env
     environment:
       DATABASE_URL: postgresql://nest_user:nest_password@db:5432/nest_db
-      JWT_SECRET: ${JWT_SECRET:-change_me_in_production}
-      PORT: 3000
-      ADMIN_USERNAME: ${ADMIN_USERNAME:-admin}
-      ADMIN_EMAIL: ${ADMIN_EMAIL:-admin@crowmate.fr}
-      ADMIN_PASSWORD: ${ADMIN_PASSWORD:-change_me}
-      FRONT_ORIGIN: ${FRONT_ORIGIN:-http://localhost:5173}
-      INTRA_ORIGIN: ${INTRA_ORIGIN:-http://localhost:5174}
     depends_on:
       db:
         condition: service_healthy
@@ -39,12 +34,18 @@ services:
     restart: unless-stopped
     ports:
       - "5173:5173"
+    environment:
+      API_URL: http://api:3000
+    depends_on:
+      - api
 
   intra:
     build: ./nest-intra
     restart: unless-stopped
     ports:
       - "5174:5174"
+    depends_on:
+      - api
 
 volumes:
   db_data:
diff --git a/nest-front/Dockerfile b/nest-front/Dockerfile
index 58348d6..e8b0c94 100644
--- a/nest-front/Dockerfile
+++ b/nest-front/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22-alpine AS build
+FROM node:25-alpine AS build
 
 WORKDIR /app
 
diff --git a/nest-intra/Dockerfile b/nest-intra/Dockerfile
index e94f5ce..a3d24af 100644
--- a/nest-intra/Dockerfile
+++ b/nest-intra/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22-alpine AS build
+FROM node:25-alpine AS build
 
 WORKDIR /app
 
diff --git a/nest-intra/nginx.conf b/nest-intra/nginx.conf
index 6385a07..bf22cad 100644
--- a/nest-intra/nginx.conf
+++ b/nest-intra/nginx.conf
@@ -3,10 +3,15 @@ server {
     root /usr/share/nginx/html;
     index index.html;
 
+    # Docker DNS; resolve API service name at request time.
+    resolver 127.0.0.11 ipv6=off valid=10s;
+    set $api_upstream http://api:3000;
+
     location /api/ {
-        proxy_pass http://api:3000/api/;
+        proxy_pass $api_upstream/api/;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 
     location / {