diff --git a/docker-compose.yml b/docker-compose.yml
index 0ecdb38..2eed45d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,16 +30,16 @@ services:
     # Environment variables
     environment:
       # Next.js runtime
-      PORT: 3000
+      PORT: ${APP_PORT:-3000}
       HOSTNAME: "0.0.0.0"
-      NODE_ENV: production
+      NODE_ENV: ${NODE_ENV:-production}
       NEXT_TELEMETRY_DISABLED: 1
 
       # API configuration
       NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
       NEXT_PUBLIC_CLIENT_ID: ${NEXT_PUBLIC_CLIENT_ID}
       NEXT_PUBLIC_CLIENT_SECRET: ${NEXT_PUBLIC_CLIENT_SECRET}
-      DEV_MODE: "false"
+      DEV_MODE: ${DEV_MODE:-FALSE}
 
     # Health check (uses Dockerfile HEALTHCHECK)
     healthcheck: