diff --git a/scripts/test-env/setup.sh b/scripts/test-env/setup.sh
index 86bff77a..a6121f98 100755
--- a/scripts/test-env/setup.sh
+++ b/scripts/test-env/setup.sh
@@ -76,7 +76,10 @@ log_ok "Phase 2 complete"
 log_info "Phase 3/6: Docker infrastructure"
 cd "$SCRIPT_DIR"
 
-# Stop and remove any existing v2test containers (clean restart)
+# Stop and remove any existing v2test containers and conflicting containers
+log_info "Cleaning up existing containers..."
+docker rm -f v2test-consul v2test-redis v2test-kafka v2test-zookeeper v2test-nginx \
+  cw-frontend-local-nginx v2-test-redis 2>/dev/null || true
 docker compose -f docker-compose.infra.yml down --remove-orphans 2>/dev/null || true
 
 docker compose -f docker-compose.infra.yml up -d