diff --git a/.env.example b/.env.example
index ffa7373..4ecafa2 100644
--- a/.env.example
+++ b/.env.example
@@ -451,6 +451,7 @@ MASTODON_CLIENT_SECRET=
 # Engine: NOWEB | WEBJS | GOWS
 ############
 WAHA_ENGINE=NOWEB
+WAHA_PUBLIC_URL=https://waha.yourdomain.com
 
 # API key (hashed). Value must look like: sha512:HEX
 WAHA_API_KEY=
diff --git a/docker-compose.yml b/docker-compose.yml
index 84499b0..9acbfd2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -796,3 +796,8 @@ 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_BASE_URL=http://waha:3000
+      - REDIS_URL=redis://redis:6379
+      - WHATSAPP_SESSIONS_POSTGRESQL_URL=postgres://postgres:${POSTGRES_PASSWORD}@postgres:5432/postgres?sslmode=disable
diff --git a/scripts/07_final_report.sh b/scripts/07_final_report.sh
index c4a2ca3..93126cb 100644
--- a/scripts/07_final_report.sh
+++ b/scripts/07_final_report.sh
@@ -229,10 +229,9 @@ if is_profile_active "waha"; then
   echo
   echo "============================== WAHA (WhatsApp HTTP API) =============================="
   echo
-  echo "Host: ${WAHA_HOSTNAME:-<hostname_not_set>}"
   echo "Dashboard: https://${WAHA_HOSTNAME:-<hostname_not_set>}/dashboard"
-  echo "Swagger:   https://${WAHA_HOSTNAME:-<hostname_not_set>}/swagger"
-  echo "Internal:  http://waha:3000"
+  echo "Swagger:   https://${WAHA_HOSTNAME:-<hostname_not_set>}"
+  echo "Internal:  http://${WAHA_HOSTNAME:-<hostname_not_set>}:3000"
   echo
   echo "Dashboard User: ${WAHA_DASHBOARD_USERNAME:-<not_set_in_env>}"
   echo "Dashboard Pass: ${WAHA_DASHBOARD_PASSWORD:-<not_set_in_env>}"