diff --git a/scripts/run-bdd-tests.sh b/scripts/run-bdd-tests.sh
index 09b4c54..0eabd16 100755
--- a/scripts/run-bdd-tests.sh
+++ b/scripts/run-bdd-tests.sh
@@ -109,7 +109,7 @@ run_tests_with_tags() {
         fi
     fi
     
-    # Set database environment variables for local environment
+    # Set database environment variables
     if [ -z "$GITHUB_ACTIONS" ] && [ -z "$GITEA_ACTIONS" ]; then
         echo "🔧 Setting database environment variables for local environment..."
         export DLC_DATABASE_HOST="localhost"
@@ -120,6 +120,13 @@ run_tests_with_tags() {
         export DLC_DATABASE_SSL_MODE="disable"
     else
         echo "🏗️ CI environment detected, using service configuration"
+        echo "🔧 Setting database environment variables for CI environment..."
+        export DLC_DATABASE_HOST="postgres"
+        export DLC_DATABASE_PORT="5432"
+        export DLC_DATABASE_USER="postgres"
+        export DLC_DATABASE_PASSWORD="postgres"
+        export DLC_DATABASE_NAME="dance_lessons_coach_bdd_test"
+        export DLC_DATABASE_SSL_MODE="disable"
     fi
     
     # Run tests with proper coverage measurement and tag exclusion