diff --git a/scripts/test-local-ci-cd.sh b/scripts/test-local-ci-cd.sh
index 0e29128..0a0ed2d 100755
--- a/scripts/test-local-ci-cd.sh
+++ b/scripts/test-local-ci-cd.sh
@@ -91,8 +91,13 @@ echo ""
 # 6. Generate Swagger Docs
 if [ "$USE_DOCKER_CACHE" = true ]; then
     echo "6. Generating Swagger documentation..."
-    echo "Running in Docker Compose container..."
-    docker compose -f docker-compose.build.yml run -w /workspace/pkg/server build-cache sh -c "go generate"
+    echo "Running in Docker container..."
+    docker run --rm \
+      --network dance-lessons-coach-network \
+      -v "$(pwd):/workspace" \
+      -w /workspace/pkg/server \
+      "$IMAGE_NAME" \
+      sh -c "go generate"
 else
     echo "6. Generating Swagger documentation..."
     echo "Running natively..."
@@ -105,8 +110,13 @@ echo ""
 # 7. Build and test
 if [ "$USE_DOCKER_CACHE" = true ]; then
     echo "7. Building and testing..."
-    echo "Running in Docker Compose container..."
-    docker compose -f docker-compose.build.yml run -w /workspace build-cache sh -c "go build ./..."
+    echo "Running in Docker container..."
+    docker run --rm \
+      --network dance-lessons-coach-network \
+      -v "$(pwd):/workspace" \
+      -w /workspace \
+      "$IMAGE_NAME" \
+      sh -c "go build ./..."
 else
     echo "7. Building and testing..."
     echo "Running natively..."
@@ -115,16 +125,18 @@ fi
 echo "✅ Code compiled successfully"
 
 if [ "$USE_DOCKER_CACHE" = true ]; then
-    echo "Running in Docker Compose container with PostgreSQL..."
-    docker compose -f docker-compose.build.yml run \
+    echo "Running in Docker container with PostgreSQL..."
+    docker run --rm \
+      --network dance-lessons-coach-network \
+      -v "$(pwd):/workspace" \
+      -w /workspace \
       -e DLC_DATABASE_HOST=dance-lessons-coach-postgres \
       -e DLC_DATABASE_PORT=5432 \
       -e DLC_DATABASE_USER=postgres \
       -e DLC_DATABASE_PASSWORD=postgres \
       -e DLC_DATABASE_NAME=dance_lessons_coach_bdd_test \
       -e DLC_DATABASE_SSL_MODE=disable \
-      -w /workspace \
-      build-cache \
+      "$IMAGE_NAME" \
       sh -c "go test ./... -coverprofile=coverage.out -v && go tool cover -func=coverage.out > coverage.txt"
 else
     echo "Running natively with Docker Compose PostgreSQL..."
@@ -137,8 +149,13 @@ echo ""
 # 8. Build binaries
 if [ "$USE_DOCKER_CACHE" = true ]; then
     echo "8. Building binaries..."
-    echo "Running in Docker Compose container..."
-    docker compose -f docker-compose.build.yml run -w /workspace build-cache sh -c "./scripts/build.sh"
+    echo "Running in Docker container..."
+    docker run --rm \
+      --network dance-lessons-coach-network \
+      -v "$(pwd):/workspace" \
+      -w /workspace \
+      "$IMAGE_NAME" \
+      sh -c "./scripts/build.sh"
 else
     echo "8. Building binaries..."
     echo "Running natively..."