diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index c0e21fc1..d96c73a8 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -44,21 +44,20 @@ jobs:
           eval $(op account add --address https://team-deloittedigital.1password.com --email $OP_EMAIL --secret-key $OP_SECRET_KEY --signin)
           eval $(op signin my)
 
-      - name: Wait for PostgreSQL instance to connect
+      - name: Wait for Postgres
         run: |
-          until pg_isready -h $DB_HOST -p 5432 -U $DATABASE_USERNAME; do echo waiting for postgres; sleep 2; done
-        env:
-          DB_HOST: ${{ env.DB_HOST }}
-          DATABASE_USERNAME: ${{ env.DATABASE_USERNAME }}
-          DATABASE_PASSWORD: ${{ env.DATABASE_PASSWORD }}
+          until pg_isready -h $DB_HOST -p 5432 -U $DATABASE_USERNAME; do
+            echo waiting for postgres;
+            sleep 2;
+          done
 
       - name: Build with Maven
         env:
-          DB_HOST: ${{ env.DB_HOST }}
+          DB_HOST: ${{ secrets.DB_HOST }}
           DB_PORT: ${{ secrets.DB_PORT }}
           DB_NAME: ${{ secrets.DB_NAME }}
-          DATABASE_USERNAME: ${{ env.DATABASE_USERNAME }}
-          DATABASE_PASSWORD: ${{ env.DATABASE_PASSWORD }}
+          DB_USER: ${{ secrets.DB_USER }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
           DATABASE_URL: ${{ secrets.DATABASE_URL }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -68,11 +67,11 @@ jobs:
 
       - name: Run tests
         env:
-          DB_HOST: ${{ env.DB_HOST }}
+          DB_HOST: ${{ secrets.DB_HOST }}
           DB_PORT: ${{ secrets.DB_PORT }}
           DB_NAME: ${{ secrets.DB_NAME }}
-          DATABASE_USERNAME: ${{ env.DATABASE_USERNAME }}
-          DATABASE_PASSWORD: ${{ env.DATABASE_PASSWORD }}
+          DB_USER: ${{ secrets.DB_USER }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
           DATABASE_URL: ${{ secrets.DATABASE_URL }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}