diff --git a/.gitea/workflows/ci-cd.yaml b/.gitea/workflows/ci-cd.yaml
index ecb9b40..225fe76 100644
--- a/.gitea/workflows/ci-cd.yaml
+++ b/.gitea/workflows/ci-cd.yaml
@@ -194,13 +194,13 @@ jobs:
           export DLC_DATABASE_PASSWORD=postgres
           export DLC_DATABASE_NAME=dance_lessons_coach_bdd_test
           export DLC_DATABASE_SSL_MODE=disable
+          ./scripts/run-bdd-tests.sh
           
-          # Run BDD tests and capture output
-          test_output=$(./scripts/run-bdd-tests.sh 2>&1)
-          echo "$test_output"
+          # Generate BDD coverage report
+          go tool cover -func=coverage.out > bdd_coverage.txt
           
-          # Extract BDD coverage percentage from the output
-          BDD_COVERAGE=$(echo "$test_output" | grep "coverage:" | grep -oP '\d+\.\d+' | head -1)
+          # Extract BDD coverage percentage
+          BDD_COVERAGE=$(grep "total:" bdd_coverage.txt | grep -oP '\d+\.\d+' | head -1)
           echo "BDD Coverage: ${BDD_COVERAGE}%"
           
           # Update BDD coverage badge
@@ -212,10 +212,13 @@ jobs:
         run: |
           echo "Running unit tests with PostgreSQL service..."
           # Run unit tests excluding BDD tests (already run above)
-          go test ./pkg/... ./cmd/... -coverprofile=coverage.out -v && go tool cover -func=coverage.out > coverage.txt
+          go test ./pkg/... ./cmd/... -coverprofile=unit_coverage.out -v
+          
+          # Generate unit coverage report
+          go tool cover -func=unit_coverage.out > unit_coverage.txt
           
           # Extract unit test coverage percentage
-          UNIT_COVERAGE=$(grep "total:" coverage.txt | grep -oP '\d+\.\d+' | head -1)
+          UNIT_COVERAGE=$(grep "total:" unit_coverage.txt | grep -oP '\d+\.\d+' | head -1)
           echo "Unit Coverage: ${UNIT_COVERAGE}%"
           
           # Update unit test coverage badge