diff --git a/pkg/bdd/testserver/server.go b/pkg/bdd/testserver/server.go
index d3425c9..b0ff480 100644
--- a/pkg/bdd/testserver/server.go
+++ b/pkg/bdd/testserver/server.go
@@ -17,29 +17,6 @@ import (
 )
 
 // getPostgresHost returns the appropriate PostgreSQL host based on environment
-// Uses DLC_DATABASE_HOST environment variable or detects execution context
-func getPostgresHost() string {
-	host := os.Getenv("DLC_DATABASE_HOST")
-	if host != "" {
-		return host
-	}
-
-	// Detect if we're running inside a Docker container
-	// Check for Docker-specific environment variables or files
-	if os.Getenv("DOCKER_CONTAINER") != "" ||
-		os.Getenv("KUBERNETES_SERVICE_HOST") != "" ||
-		os.Getenv("container") == "docker" {
-		return "dance-lessons-coach-postgres" // Use container name in Docker
-	}
-
-	// Check for .dockerenv file (Docker-specific)
-	if _, err := os.Stat("/.dockerenv"); err == nil {
-		return "dance-lessons-coach-postgres" // Use container name in Docker
-	}
-
-	// Default to localhost for native execution (PostgreSQL port mapping)
-	return "localhost"
-}
 
 type Server struct {
 	httpServer *http.Server
@@ -286,7 +263,7 @@ func createTestConfig(port int) *config.Config {
 			AdminMasterPassword: "admin123",
 		},
 		Database: config.DatabaseConfig{
-			Host:            getPostgresHost(), // Use container name in Docker, localhost otherwise
+			Host:            "localhost", // Use localhost (PostgreSQL port is mapped)
 			Port:            5432,
 			User:            "postgres",
 			Password:        "postgres",