diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
index b1f9765a3..dd9403627 100644
--- a/.github/workflows/cicd.yaml
+++ b/.github/workflows/cicd.yaml
@@ -1,21 +1,21 @@
 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
@@ -123,4 +123,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/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