diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
index b1f9765a3..4aa71faad 100644
--- a/.github/workflows/cicd.yaml
+++ b/.github/workflows/cicd.yaml
@@ -1,27 +1,30 @@
 name: stac-fastapi
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.8', '3.9', '3.10']
+        python-version: ["3.8", "3.9", "3.10"]
     timeout-minutes: 10
 
     services:
       db_service:
-        image: bitner/pgstac:0.2.7
+        image: ghcr.io/stac-utils/pgstac:v0.6.12
         env:
           POSTGRES_USER: username
           POSTGRES_PASSWORD: password
           POSTGRES_DB: postgis
           POSTGRES_HOST: localhost
           POSTGRES_PORT: 5432
+          PGUSER: username
+          PGPASSWORD: password
+          PGDATABASE: postgis
           ALLOW_IP_RANGE: 0.0.0.0/0
         # Set health checks to wait until postgres has started
         options: >-
@@ -123,4 +126,4 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Test generating docs
-        run: make docs
\ No newline at end of file
+        run: make docs
diff --git a/CHANGES.md b/CHANGES.md
index 00d46787b..e6fe8d64c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,8 @@
 
 ### Changed
 
+* Updated CI to test against [pgstac v0.6.12](https://github.com/stac-utils/pgstac/releases/tag/v0.6.12) ([#511](https://github.com/stac-utils/stac-fastapi/pull/511))
+
 ### Removed
 
 ### Fixed
diff --git a/docker-compose.yml b/docker-compose.yml
index 613f98cf1..b4a55bb1d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,8 +26,7 @@ services:
       - ./scripts:/app/scripts
     depends_on:
       - database
-    command:
-      bash -c "./scripts/wait-for-it.sh database:5432 && python -m stac_fastapi.sqlalchemy.app"
+    command: bash -c "./scripts/wait-for-it.sh database:5432 && python -m stac_fastapi.sqlalchemy.app"
 
   app-pgstac:
     container_name: stac-fastapi-pgstac
@@ -58,12 +57,11 @@ services:
       - ./scripts:/app/scripts
     depends_on:
       - database
-    command:
-      bash -c "./scripts/wait-for-it.sh database:5432 && python -m stac_fastapi.pgstac.app"
+    command: bash -c "./scripts/wait-for-it.sh database:5432 && python -m stac_fastapi.pgstac.app"
 
   database:
     container_name: stac-db
-    image: ghcr.io/stac-utils/pgstac:v0.6.10
+    image: ghcr.io/stac-utils/pgstac:v0.6.12
     environment:
       - POSTGRES_USER=username
       - POSTGRES_PASSWORD=password