diff --git a/docker-compose.yml b/docker-compose.yml
index 0e06fc2..1e60ca5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,10 +42,16 @@ services:
     image: git.hangman-lab.top/zhi/harborforge-backend:multi-stage
     ports:
       - "$HF_BACKEND_PORT:8000"
-    env_file:
-      - .env
+    volumes:
+      - wizard_config:/config:ro
+    environment:
+      CONFIG_DIR: /config
+      CONFIG_FILE: harborforge.json
+      SECRET_KEY: ${HF_SECRET_KEY:-change_me_in_production}
+      LOG_LEVEL: ${HF_LOG_LEVEL:-INFO}
     depends_on:
-      - mysql
+      mysql:
+        condition: service_healthy
     networks:
       - app-network
 
@@ -53,8 +59,13 @@ services:
     image: git.hangman-lab.top/zhi/harborforge-frontend:latest
     ports:
       - "$HF_FRONTEND_PORT:3000"
-    env_file:
-      - .env
+    environment:
+      VITE_API_BASE_URL: http://hf_backend:${HF_BACKEND_PORT:-8000}
+      VITE_WIZARD_PORT: ${WIZARD_PORT:-8082}
+      FRONTEND_DEV_MODE: ${HF_FRONTEND_DEV_MODE:-0}
+      NODE_ENV: production
+    depends_on:
+      - hf_backend
     networks:
       - app-network
 
@@ -62,10 +73,13 @@ services:
     image: git.hangman-lab.top/nav/abstract-wizard:latest
     ports:
       - "$WIZARD_PORT:8080"
-    env_file:
-      - .env
     volumes:
       - wizard_config:/config
+    environment:
+      CONFIG_DIR: /config
+      LISTEN_ADDR: "0.0.0.0:8080"
+      MAX_BACKUPS: "5"
+      CORS_ORIGINS: http://hf_frontend:${HF_FRONTEND_PORT:-3000},http://127.0.0.1:${HF_FRONTEND_PORT:-3000},http://localhost:${HF_FRONTEND_PORT:-3000}
     networks:
       - app-network