diff --git a/docker-compose.yml b/docker-compose.yml
index 7f4f1fc705..167ea79b34 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,9 @@
 #SPDX-License-Identifier: MIT
 services:
   augur-db:
-    image: postgres:16
+    build:
+      context: .
+      dockerfile: ./docker/database/Dockerfile
     restart: unless-stopped
     environment:
       - "POSTGRES_DB=augur"
@@ -14,6 +16,12 @@ services:
       - augurpostgres:/var/lib/postgresql/data
     networks:
       - augur
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${AUGUR_DB_USER:-augur} -d ${AUGUR_DB_NAME:-augur}"]
+
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   redis:
     image: "redis:alpine"
@@ -77,11 +85,16 @@ services:
       - CACHE_DATADIR=/cache
       - CACHE_LOCKDIR=/cache
       - CELERYBEAT_SCHEDULE_DB=/tmp/celerybeat-schedule.db
+      - HOME=/tmp
     depends_on:
-      - augur-db
-      - redis
-      - augur-keyman
-      - rabbitmq
+      augur-db:
+        condition: service_healthy
+      redis:
+        condition: service_started
+      augur-keyman:
+        condition: service_started
+      rabbitmq:
+        condition: service_started
     networks:
       - augur
     user: 2345:2345  # Run as an arbitrary non-root user