diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index 29a17c795b5..667f07ef3b3 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -28,8 +28,10 @@ services:
     extra_hosts:
       - 'auth-server:host-gateway'
     depends_on:
-      - redis
-      - database
+      redis:
+        condition: service_started
+      database:
+        condition: service_healthy
     ports:
       - 2285:2285
 
@@ -45,3 +47,9 @@ services:
       POSTGRES_DB: immich
     ports:
       - 5435:5432
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U postgres -d immich']
+      interval: 1s
+      timeout: 5s
+      retries: 30
+      start_period: 10s