diff --git a/.gitea/workflows/ci-cd.yaml b/.gitea/workflows/ci-cd.yaml
index dd05051..1be0859 100644
--- a/.gitea/workflows/ci-cd.yaml
+++ b/.gitea/workflows/ci-cd.yaml
@@ -219,6 +219,10 @@ jobs:
           export DLC_DATABASE_PASSWORD=postgres
           export DLC_DATABASE_NAME=dance_lessons_coach_bdd_test
           export DLC_DATABASE_SSL_MODE=disable
+          # Enable per-scenario schema isolation (ADR-0025) to prevent flaky AuthBDD failures.
+          # Without this, scenarios share the public schema and pollute each other's state.
+          # Observed flakiness: same code passes in #605, fails in #606 on TestAuthBDD/*.
+          export BDD_SCHEMA_ISOLATION=true
           ./scripts/run-bdd-tests.sh
           
           # Generate BDD coverage report