diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8991797..7f667a1 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -16,6 +16,10 @@ services:
     depends_on:
       main_db:
         condition: service_healthy
+      maze:
+        condition: service_started
+      auth_api:
+        condition: service_started
     networks:
       - soaricarus-network
     restart: unless-stopped
@@ -56,13 +60,14 @@ services:
 #      - main_db
 #      - auth_api
 #      - auth_db
+#      - maze
 #    networks:
 #      - soaricarus-network
 
   # --- storage service ---
-  garage:
+  maze:
     image: dxflrs/garage:v2.3.0  # Use official Garage image
-    container_name: garage
+    container_name: maze
     restart: unless-stopped
     environment:
       # Garage configuration via environment variables
@@ -71,7 +76,7 @@ services:
       GARAGE_S3_API_BIND_ADDR: "0.0.0.0:3900"
       GARAGE_S3_API_PUBLIC_BIND_ADDR: "0.0.0.0:3901"
       GARAGE_S3_API_PUBLIC_ADDRS: "http://localhost:3901"
-      GARAGE_S3_API_ROOT_DOMAIN: "garage.local"
+      GARAGE_S3_API_ROOT_DOMAIN: "${GARAGE_ROOT_DOMAIN}"
       GARAGE_ADMIN_BIND_ADDR: "0.0.0.0:3902"
       GARAGE_ADMIN_PUBLIC_BIND_ADDR: "0.0.0.0:3902"
       
@@ -84,17 +89,18 @@ services:
       GARAGE_METADATA_DIR: "/data/meta"
       
       # RPC configuration
-      GARAGE_RPC_PUBLIC_ADDR: "http://garage:3901"
+      GARAGE_RPC_PUBLIC_ADDR: "http://maze:3901"
       GARAGE_RPC_BIND_ADDR: "0.0.0.0:3901"
       GARAGE_RPC_SECRET: "${GARAGE_RPC_SECRET}"  # 32+ chars
       
       # Web Admin
-      GARAGE_ADMIN_TOKEN: "${GARAGE_ADMIN_TOKEN:-garage-admin-token}"
+      GARAGE_ADMIN_TOKEN: "${GARAGE_ADMIN_TOKEN}"
       
       # Logging
       GARAGE_LOG_LEVEL: "info"
 
-      GARAGE_S3_BUCKET: "${S3_BUCKET_NAME}:-soaricarus-storage"
+      GARAGE_S3_BUCKET: "${S3_BUCKET_NAME}"
+
       GARAGE_DEFAULT_ACCESS_KEY: "${GARAGE_DEFAULT_ACCESS_KEY}"
       GARAGE_DEFAULT_SECRET_KEY: "${GARAGE_DEFAULT_SECRET_KEY}"
       GARAGE_DEFAULT_BUCKET: "${GARAGE_DEFAULT_BUCKET}"