diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 789b9a418..3c38b080d 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -28,7 +28,7 @@ services:
       - ${HOME}/.cache/go-build:/root/.cache/go-build
       - ${GOPATH}/pkg/mod:/go/pkg/mod
   db-unit-test:
-    image: postgres:13
+    image: postgres:15
     environment:
       - POSTGRES_PASSWORD=toor
       - POSTGRES_DB=bcda_test
@@ -37,7 +37,7 @@ services:
     volumes:
       - ./db/testing/docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d/
     # Pass a flag so we'll log all queries executed on the test db.
-    command: [ "postgres", "-c", "log_statement=all" ]
+    command: ["postgres", "-c", "log_statement=all"]
   # Spin up a local S3 server for CCLF and Opt Out File import testing
   localstack:
     image: localstack/localstack:latest
@@ -47,12 +47,12 @@ services:
       - SERVICES=s3,ssm,sts,iam
       - DEBUG=1
     ports:
-      - '4566-4583:4566-4583'
+      - "4566-4583:4566-4583"
     volumes:
       - "./.localstack_volume:/var/lib/localstack"
-      - '/var/run/docker.sock:/var/run/docker.sock'
+      - "/var/run/docker.sock:/var/run/docker.sock"
     healthcheck:
-      test: "curl --silent --fail localstack:4566/_localstack/health | grep -E '\"s3\": \"(available|running)\"'"
+      test: 'curl --silent --fail localstack:4566/_localstack/health | grep -E ''"s3": "(available|running)"'''
       interval: 10s
       retries: 12
       start_period: 30s
diff --git a/docker-compose.yml b/docker-compose.yml
index f719222ae..8cec19656 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,14 +3,14 @@ version: "3"
 
 services:
   queue:
-    image: postgres:11
+    image: postgres:15
     environment:
       - POSTGRES_DB=bcda_queue
       - POSTGRES_PASSWORD=toor
     ports:
       - "5433:5432"
   db:
-    image: postgres:11
+    image: postgres:15
     environment:
       - POSTGRES_DB=bcda
       - POSTGRES_PASSWORD=toor
@@ -25,7 +25,7 @@ services:
       args:
         ENVIRONMENT: development
     entrypoint: ""
-    command: [ "../scripts/watch.sh", "api", "bcda", "start-api" ]
+    command: ["../scripts/watch.sh", "api", "bcda", "start-api"]
     env_file:
       - ./shared_files/decrypted/local.env
     environment:
@@ -48,7 +48,7 @@ services:
       args:
         ENVIRONMENT: development
     entrypoint: ""
-    command: [ "../scripts/watch.sh", "worker", "bcdaworker" ]
+    command: ["../scripts/watch.sh", "worker", "bcdaworker"]
     env_file:
       - ./shared_files/decrypted/local.env
     environment: