diff --git a/.github/workflows/registry-ci.yml b/.github/workflows/registry-ci.yml
index 47b8af380..e2adc9723 100644
--- a/.github/workflows/registry-ci.yml
+++ b/.github/workflows/registry-ci.yml
@@ -52,6 +52,13 @@ jobs:
     env:
       COMANAGE_REGISTRY_DIR: /srv/comanage-registry
 
+      # Matrix DB selection for this run
+      DB_ENGINE: ${{ matrix.db.engine }}
+
+      # DB service connection info (because you publish ports)
+      COMANAGE_REGISTRY_DATABASE_HOST: 127.0.0.1
+      COMANAGE_REGISTRY_DATABASE_PORT: ${{ matrix.db.port }}
+
       # Values used by your PHPUnit setup test
       COMANAGE_REGISTRY_ADMIN_GIVEN_NAME: Admin
       COMANAGE_REGISTRY_ADMIN_FAMILY_NAME: User
@@ -193,8 +200,6 @@ jobs:
       - name: Run PHPUnit (DB_ENGINE=${{ matrix.db_engine }})
         shell: bash
         working-directory: /srv/comanage-registry/app
-        env:
-          DB_ENGINE: ${{ matrix.db_engine }}
         run: |
           set -euxo pipefail
           cd "${COMANAGE_REGISTRY_DIR}"/app