diff --git a/docker/superset/init.sh b/docker/superset/init.sh
index dcd54d6..07dcefa 100755
--- a/docker/superset/init.sh
+++ b/docker/superset/init.sh
@@ -9,14 +9,15 @@ SUPERSET_ADMIN_PASSWORD="${SUPERSET_ADMIN_PASSWORD:-arcadia2026}"
 ARCADIA_DB_URL="${ARCADIA_DATABASE_URL:-postgresql://arcadia:arcadia123@db:5432/arcadia}"
 
 echo "[Superset Init] Aguardando PostgreSQL..."
-until python -c "
+cat > /tmp/pgcheck.py << 'EOF'
 import psycopg2, os, sys
+url = os.environ.get('SQLALCHEMY_DATABASE_URI', 'postgresql://arcadia:arcadia123@db:5432/superset')
 try:
-    url = os.environ.get('SQLALCHEMY_DATABASE_URI', os.environ.get('DATABASE_URL', 'postgresql://arcadia:arcadia123@db:5432/arcadia_superset'))
     psycopg2.connect(url)
-    sys.exit(0)
-except: sys.exit(1)
-" 2>/dev/null; do
+except Exception:
+    sys.exit(1)
+EOF
+until python /tmp/pgcheck.py 2>/dev/null; do
   sleep 2
 done
 echo "[Superset Init] PostgreSQL disponível!"
diff --git a/docker/superset/superset_config.py b/docker/superset/superset_config.py
index 97ad057..e370685 100644
--- a/docker/superset/superset_config.py
+++ b/docker/superset/superset_config.py
@@ -9,8 +9,8 @@ SECRET_KEY = os.environ.get("SUPERSET_SECRET_KEY", "change-in-production-use-ope
 
 # ── Banco de metadados do Superset ────────────────────────────────────────────
 SQLALCHEMY_DATABASE_URI = os.environ.get(
-    "DATABASE_URL",
-    "postgresql://arcadia:arcadia123@db:5432/arcadia_superset"
+    "SQLALCHEMY_DATABASE_URI",
+    os.environ.get("DATABASE_URL", "postgresql://arcadia:arcadia123@db:5432/superset")
 )
 
 # ── CORS — permite o gateway Arcádia (:5000) chamar a API ────────────────────