diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 04cc71f1f..4f726595f 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -53,6 +53,10 @@ jobs:
 
       - name: Fix null values
         run: docker compose exec tools psql -c "UPDATE main_2_7.tsearch SET label = 'no-label' WHERE label is NULL;"
+      - name: Rename schemas
+        run: |
+          docker compose exec tools psql -c "ALTER SCHEMA main_2_7 RENAME TO main_2_9;"
+          docker compose exec tools psql -c "ALTER SCHEMA static_2_7 RENAME TO static_2_9;"
 
       - name: Run the acceptance tests
         run: make acceptance
diff --git a/env.acceptance-test b/env.acceptance-test
index 1b4c32a72..6bdc8066d 100644
--- a/env.acceptance-test
+++ b/env.acceptance-test
@@ -3,8 +3,6 @@ PGPORT_SLAVE=5432
 PGDATABASE=balanced-woodcock
 PGUSER=balanced-woodcock
 PGPASSWORD=secret
-PGSCHEMA=main_2_7
-PGSCHEMA_STATIC=static_2_7
 
 OSM_PGHOST=db
 OSM_PGHOST_SLAVE=db