diff --git a/docker-compose.yml b/docker-compose.yml
index e4631ef..9e288f5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,10 @@ services:
       - db-data:/var/lib/postgresql/data
     environment:
       - POSTGRES_PASSWORD=postgres
+    healthcheck:
+      test: pg_isready
+      start_interval: 2s
+      start_period: 1m
 
   plausible_events_db:
     image: clickhouse/clickhouse-server:24.3.3.102-alpine
@@ -17,6 +21,10 @@ services:
       - event-logs:/var/log/clickhouse-server
       - ./clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/logging.xml:ro
       - ./clickhouse/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/logging.xml:ro
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider http://127.0.0.1:8123/ping || exit 1
+      start_interval: 2s
+      start_period: 1m
     ulimits:
       nofile:
         soft: 262144
@@ -26,9 +34,15 @@ services:
     image: ghcr.io/plausible/community-edition:v2.1.1
     restart: always
     command: sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider http://127.0.0.1:8000 || exit 1
+      start_interval: 2s
+      start_period: 1m
     depends_on:
-      - plausible_db
-      - plausible_events_db
+      plausible_db:
+        condition: service_healthy
+      plausible_events_db:
+        condition: service_healthy
     ports:
       - 127.0.0.1:8000:8000
     env_file: