diff --git a/scripts/test-local-ci-cd.sh b/scripts/test-local-ci-cd.sh
index 2953d8d..ca1e536 100755
--- a/scripts/test-local-ci-cd.sh
+++ b/scripts/test-local-ci-cd.sh
@@ -69,9 +69,7 @@ for i in {1..30}; do
 done
 
 # Set PostgreSQL environment variables for BDD tests
-# Use localhost since PostgreSQL port is mapped to host
-# Container name is only used when running INSIDE Docker containers
-export DLC_DATABASE_HOST="localhost"
+export DLC_DATABASE_HOST="localhost"  # PostgreSQL port is mapped to host
 export DLC_DATABASE_PORT=5432
 export DLC_DATABASE_USER=postgres
 export DLC_DATABASE_PASSWORD=postgres
@@ -132,7 +130,7 @@ if [ "$USE_DOCKER_CACHE" = true ]; then
       --network dance-lessons-coach-network \
       -v "$(pwd):/workspace" \
       -w /workspace \
-      -e DLC_DATABASE_HOST=localhost \
+      -e DLC_DATABASE_HOST=dance-lessons-coach-postgres \
       -e DLC_DATABASE_PORT=5432 \
       -e DLC_DATABASE_USER=postgres \
       -e DLC_DATABASE_PASSWORD=postgres \