diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml
index 630d1cb..16ae80c 100644
--- a/.gitea/workflows/ci-cd.yml
+++ b/.gitea/workflows/ci-cd.yml
@@ -21,7 +21,7 @@ jobs:
           - ${{ secrets.TEST_PG_PORT }}:5432
         # Ensure Postgres is completely booted before running tests
         options: >-
-          --health-cmd "pg_isready -U test_user -d test_db"
+          --health-cmd "pg_isready -U ${{ secrets.TEST_PG_USER }} -d ${{ secrets.TEST_PG_DATABASE }}"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
@@ -48,7 +48,7 @@ jobs:
         working-directory: ./api
         run: npx dbmate up
         env:
-          DATABASE_URL: "postgres://${{ secrets.TEST_PG_USER }}:${{ secrets.TEST_PG_USER_PASSWORD }}@postgres:${{ secrets.TEST_PG_PORT }}/${{ secrets.TEST_PG_DATABASE }}?sslmode=disable"
+          DATABASE_URL: "postgres://${{ secrets.TEST_PG_USER }}:${{ secrets.TEST_PG_USER_PASSWORD }}@${{ secrets.TEST_PG_HOST }}:${{ secrets.TEST_PG_PORT }}/${{ secrets.TEST_PG_DATABASE }}?sslmode=disable"
 
       # - name: Generate PgTyped Types
       #   run: npm run pgtyped:compile