diff --git a/.env.test b/.env.test
index 30a953ffb..fe545eafc 100644
--- a/.env.test
+++ b/.env.test
@@ -6,8 +6,12 @@ PANTHER_APP_ENV=panther
 PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
 
 # Mbin variables
-DATABASE_URL="postgresql://mbin:ChangeThisPostgresPass@127.0.0.1:5433/mbin?serverVersion=16&charset=utf8"
-REDIS_DNS=redis://123456789@127.0.0.1:6380
+DATABASE_HOST=127.0.0.1
+DATABASE_PORT=5433
+DATABASE_URL="postgresql://mbin:ChangeThisPostgresPass@${DATABASE_HOST}:${DATABASE_PORT}/mbin?serverVersion=16&charset=utf8"
+REDIS_HOST=127.0.0.1
+REDIS_PORT=6380
+REDIS_DNS=redis://123456789@${REDIS_HOST}:${REDIS_PORT}
 MAILER_DSN=null://default
 KBIN_JS_ENABLED=false
 KBIN_DEFAULT_LANG=en
diff --git a/.github/workflows/action.yaml b/.github/workflows/action.yaml
index 5ff3af3db..b0ceb6c10 100644
--- a/.github/workflows/action.yaml
+++ b/.github/workflows/action.yaml
@@ -107,11 +107,15 @@ jobs:
         env:
           COMPOSER_CACHE_DIR: ${{ steps.composer-cache.outputs.dir }}
           SYMFONY_DEPRECATIONS_HELPER: disabled
+          DATABASE_HOST: postgres
+          DATABASE_PORT: 5432
+          REDIS_HOST: redis
+          REDIS_PORT: 6379
         run: php bin/phpunit tests/Functional
     services:
       postgres:
         # Docker Hub image
-        image: postgres
+        image: postgres:16
         # Provide the password for postgres
         env:
           POSTGRES_DB: mbin_test
@@ -132,9 +136,6 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-        ports:
-          # Maps port 6379 on service container to the host
-          - 6380:6379
 
   audit-check:
     runs-on: ubuntu-latest