diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 37040d7442..e43676edbd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -19,7 +19,7 @@ jobs:
       # Label used to access the service container
       postgres:
         # Docker Hub image
-        image: 'bitnami/postgresql:latest'
+        image: 'postgres'
         # Provide the password for postgres
         env:
           POSTGRES_PASSWORD: postgres
diff --git a/.github/workflows/build_prs_jest_report.yaml b/.github/workflows/build_prs_jest_report.yaml
index 21a0072175..32f11daea8 100644
--- a/.github/workflows/build_prs_jest_report.yaml
+++ b/.github/workflows/build_prs_jest_report.yaml
@@ -17,14 +17,15 @@ jobs:
         image: 'bitnami/postgresql:latest'
         # Provide the password for postgres
         env:
-          POSTGRES_PASSWORD: postgres
+          POSTGRESQL_DATABASE: postgres
+          POSTGRESQL_USERNAME: postgres
+          POSTGRESQL_PASSWORD: postgres
           POSTGRESQL_FSYNC: 'off'
-        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd "pg_isready -d postgres -U postgres -p 5432" --health-interval 10s --health-timeout 5s --health-retries 5
+
         ports:
           - 5432:5432
-        options: >-
-          --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
 
     steps:
       - uses: actions/checkout@v3