diff --git a/README.md b/README.md
index 565ce67..e6d5747 100644
--- a/README.md
+++ b/README.md
@@ -154,6 +154,7 @@ After successful installation, your services are up and running! Here's how to g
     - **RAGApp:** `ragapp.yourdomain.com`
     - **SearXNG:** `searxng.yourdomain.com`
     - **Supabase (Dashboard):** `supabase.yourdomain.com`
+    - **WAHA:** `waha.yourdomain.com` (WhatsApp HTTP API; engines: WEBJS, NOWEB, GOWS)
     - **Weaviate:** `weaviate.yourdomain.com`
 
 ### Optional Internal Utility: Python Runner
diff --git a/docker-compose.yml b/docker-compose.yml
index 9acbfd2..92dc63e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -796,8 +796,13 @@ services:
       - WAHA_DASHBOARD_PASSWORD=${WAHA_DASHBOARD_PASSWORD}
       - WHATSAPP_SWAGGER_USERNAME=${WHATSAPP_SWAGGER_USERNAME}
       - WHATSAPP_SWAGGER_PASSWORD=${WHATSAPP_SWAGGER_PASSWORD}
-      - WAHA_DASHBOARD_ENABLED=true
-      - WHATSAPP_SWAGGER_ENABLED=true
+      - WAHA_DASHBOARD_ENABLED=${WAHA_DASHBOARD_ENABLED:-true}
+      - WHATSAPP_SWAGGER_ENABLED=${WHATSAPP_SWAGGER_ENABLED:-true}
       - WAHA_BASE_URL=http://waha:3000
       - REDIS_URL=redis://redis:6379
       - WHATSAPP_SESSIONS_POSTGRESQL_URL=postgres://postgres:${POSTGRES_PASSWORD}@postgres:5432/postgres?sslmode=disable
+    depends_on:
+      redis:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
diff --git a/scripts/07_final_report.sh b/scripts/07_final_report.sh
index 93126cb..76238a0 100644
--- a/scripts/07_final_report.sh
+++ b/scripts/07_final_report.sh
@@ -231,7 +231,7 @@ if is_profile_active "waha"; then
   echo
   echo "Dashboard: https://${WAHA_HOSTNAME:-<hostname_not_set>}/dashboard"
   echo "Swagger:   https://${WAHA_HOSTNAME:-<hostname_not_set>}"
-  echo "Internal:  http://${WAHA_HOSTNAME:-<hostname_not_set>}:3000"
+  echo "Internal:  http://waha:3000"
   echo
   echo "Dashboard User: ${WAHA_DASHBOARD_USERNAME:-<not_set_in_env>}"
   echo "Dashboard Pass: ${WAHA_DASHBOARD_PASSWORD:-<not_set_in_env>}"