diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 505714994..ac4dbc02b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -239,7 +239,7 @@ jobs:
         
     - name: Ensure DB is ready
       run: |
-        /usr/local/bin/wait-for db:3306 -- echo "DB ready"
+        /usr/local/bin/wait-for db:5432 -- echo "DB ready"
         
     - name: Start Datatracker
       run: |
diff --git a/.github/workflows/ci-run-tests.yml b/.github/workflows/ci-run-tests.yml
index e2924ceaa..17346ec65 100644
--- a/.github/workflows/ci-run-tests.yml
+++ b/.github/workflows/ci-run-tests.yml
@@ -20,14 +20,7 @@ jobs:
     
     services:
       db:
-        image: ghcr.io/ietf-tools/datatracker-db:latest
-        volumes:
-            - mariadb-data:/var/lib/mysql
-        env:
-            MYSQL_ROOT_PASSWORD: ietf
-            MYSQL_DATABASE: ietf_utf8
-            MYSQL_USER: django
-            MYSQL_PASSWORD: RkTkDPFnKpko
+        image: ghcr.io/ietf-tools/datatracker-db-pg:latest
     
     steps:
     - uses: actions/checkout@v3
@@ -39,7 +32,7 @@ jobs:
         
     - name: Ensure DB is ready
       run: |
-        /usr/local/bin/wait-for db:3306 -- echo "DB ready"
+        /usr/local/bin/wait-for db:5432 -- echo "DB ready"
         
     - name: Run all tests
       run: |
@@ -120,14 +113,7 @@ jobs:
     
     services:
       db:
-        image: ghcr.io/ietf-tools/datatracker-db:latest
-        volumes:
-            - mariadb-data:/var/lib/mysql
-        env:
-            MYSQL_ROOT_PASSWORD: ietf
-            MYSQL_DATABASE: ietf_utf8
-            MYSQL_USER: django
-            MYSQL_PASSWORD: RkTkDPFnKpko
+        image: ghcr.io/ietf-tools/datatracker-db-pg:latest
     
     steps:
     - uses: actions/checkout@v3
@@ -139,7 +125,7 @@ jobs:
         
     - name: Ensure DB is ready
       run: |
-        /usr/local/bin/wait-for db:3306 -- echo "DB ready"
+        /usr/local/bin/wait-for db:5432 -- echo "DB ready"
         
     - name: Start Datatracker
       run: |