diff --git a/pkg/bdd/testserver/server.go b/pkg/bdd/testserver/server.go
index dedecad..4ef4e0d 100644
--- a/pkg/bdd/testserver/server.go
+++ b/pkg/bdd/testserver/server.go
@@ -24,11 +24,8 @@ func getPostgresHost() string {
 		return host
 	}
 	// Default to localhost for native execution, container name for Docker
-	// Check if we're running in a container by looking for Docker-specific env vars
-	if os.Getenv("DOCKER_CONTAINER") != "" || os.Getenv("KUBERNETES_SERVICE_HOST") != "" {
-		return "dance-lessons-coach-postgres"
-	}
-	// Native execution - use localhost with container port mapping
+	// When running natively but PostgreSQL is in Docker, use localhost (port mapping)
+	// When running in Docker containers, use container name
 	return "localhost"
 }
 
diff --git a/scripts/test-local-ci-cd.sh b/scripts/test-local-ci-cd.sh
index 0a0ed2d..2953d8d 100755
--- a/scripts/test-local-ci-cd.sh
+++ b/scripts/test-local-ci-cd.sh
@@ -69,7 +69,9 @@ for i in {1..30}; do
 done
 
 # Set PostgreSQL environment variables for BDD tests
-export DLC_DATABASE_HOST="dance-lessons-coach-postgres"
+# 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_PORT=5432
 export DLC_DATABASE_USER=postgres
 export DLC_DATABASE_PASSWORD=postgres
@@ -130,7 +132,7 @@ if [ "$USE_DOCKER_CACHE" = true ]; then
       --network dance-lessons-coach-network \
       -v "$(pwd):/workspace" \
       -w /workspace \
-      -e DLC_DATABASE_HOST=dance-lessons-coach-postgres \
+      -e DLC_DATABASE_HOST=localhost \
       -e DLC_DATABASE_PORT=5432 \
       -e DLC_DATABASE_USER=postgres \
       -e DLC_DATABASE_PASSWORD=postgres \