diff --git a/.env.test b/.env.test
index 30a953ffb..16a3792a9 100644
--- a/.env.test
+++ b/.env.test
@@ -6,8 +6,10 @@ 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_URL="postgresql://mbin:ChangeThisPostgresPass@${DATABASE_HOST}:5433/mbin?serverVersion=16&charset=utf8"
+REDIS_HOST=127.0.0.1
+REDIS_DNS=redis://123456789@${REDIS_HOST}:6380
 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..06bd00016 100644
--- a/.github/workflows/action.yaml
+++ b/.github/workflows/action.yaml
@@ -107,6 +107,8 @@ jobs:
         env:
           COMPOSER_CACHE_DIR: ${{ steps.composer-cache.outputs.dir }}
           SYMFONY_DEPRECATIONS_HELPER: disabled
+          DATABASE_HOST: postgres
+          REDIS_HOST: redis
         run: php bin/phpunit tests/Functional
     services:
       postgres:
@@ -123,6 +125,9 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+        ports:
+          # Maps port 6379 on service container to the host
+          - 5433:5432
       redis:
         # Docker Hub image
         image: redis