diff --git a/docker-compose.yml b/docker-compose.yml
index 9eb003d0..e97271ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,15 +5,17 @@ services:
     build: .
     container_name: evo-ai-api
     depends_on:
-      - postgres
-      - redis
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     ports:
       - "8000:8000"
     environment:
-      POSTGRES_CONNECTION_STRING: postgresql://postgres:postgres@postgres:5432/evo_ai
+      POSTGRES_CONNECTION_STRING: postgresql://postgres:${POSTGRES_PASSWORD:-postgres}@postgres:5432/evo_ai
       REDIS_HOST: redis
       REDIS_PORT: 6379
-      REDIS_PASSWORD: ""
+      REDIS_PASSWORD: ${REDIS_PASSWORD:-""}
       REDIS_SSL: "false"
       REDIS_KEY_PREFIX: "a2a:"
       REDIS_TTL: 3600
@@ -25,38 +27,81 @@ services:
       SENDGRID_API_KEY: ${SENDGRID_API_KEY}
       EMAIL_FROM: ${EMAIL_FROM}
       APP_URL: ${APP_URL}
+      LOG_LEVEL: ${LOG_LEVEL:-INFO}
+      DEBUG: ${DEBUG:-false}
     volumes:
       - ./logs:/app/logs
+      - ./static:/app/static
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000/"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 15s
+    deploy:
+      resources:
+        limits:
+          cpus: "1"
+          memory: 1G
+    networks:
+      - evo-network
 
   postgres:
     image: postgres:14-alpine
     container_name: evo-ai-postgres
     environment:
       POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
       POSTGRES_DB: evo_ai
     ports:
-      - "5432:5432"
+      - "${POSTGRES_PORT:-5432}:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+    networks:
+      - evo-network
+    deploy:
+      resources:
+        limits:
+          cpus: "1"
+          memory: 1G
 
   redis:
     image: redis:alpine
     container_name: evo-ai-redis
+    command: redis-server --appendonly yes ${REDIS_PASSWORD:+--requirepass ${REDIS_PASSWORD}}
     ports:
-      - "6379:6379"
+      - "${REDIS_PORT:-6379}:6379"
     volumes:
       - redis_data:/data
-    command: redis-server --appendonly yes
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 5s
       timeout: 30s
       retries: 50
     restart: unless-stopped
+    networks:
+      - evo-network
+    deploy:
+      resources:
+        limits:
+          cpus: "0.5"
+          memory: 500M
 
 volumes:
   postgres_data:
+    name: ${POSTGRES_VOLUME_NAME:-evo-ai-postgres-data}
   redis_data:
+    name: ${REDIS_VOLUME_NAME:-evo-ai-redis-data}
+
+networks:
+  evo-network:
+    name: ${NETWORK_NAME:-evo-network}
+    driver: bridge
diff --git a/docker_build.sh b/docker_build.sh
new file mode 100755
index 00000000..17722803
--- /dev/null
+++ b/docker_build.sh
@@ -0,0 +1,2 @@
+docker build -t atendai/evoai-api:latest .
+docker push atendai/evoai-api:latest