diff --git a/supabase/docker-compose.yml b/supabase/docker-compose.yml
index 5c8d3f1..26a713e 100644
--- a/supabase/docker-compose.yml
+++ b/supabase/docker-compose.yml
@@ -52,9 +52,8 @@ services:
     container_name: supabase-auth
     image: supabase/gotrue:v2.40.1
     depends_on:
-      - db
-      # db: # Disable this if you are using an external Postgres database
-      #   condition: service_healthy
+      db: # Disable this if you are using an external Postgres database
+        condition: service_healthy
     healthcheck:
       test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:9999/health" ]
       timeout: 5s
@@ -102,9 +101,8 @@ services:
     container_name: supabase-rest
     image: postgrest/postgrest:v9.0.1.20220717
     depends_on:
-      - db
-      # db: # Disable this if you are using an external Postgres database
-      #   condition: service_healthy
+      db: # Disable this if you are using an external Postgres database
+        condition: service_healthy
     restart: unless-stopped
     environment:
       PGRST_DB_URI: postgres://authenticator:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
@@ -117,9 +115,8 @@ services:
     container_name: realtime-dev.supabase-realtime
     image: supabase/realtime:v2.1.0
     depends_on:
-      - db
-      # db: # Disable this if you are using an external Postgres database
-      #   condition: service_healthy
+      db: # Disable this if you are using an external Postgres database
+        condition: service_healthy
     healthcheck:
       test: [ "CMD", "bash", "-c", "printf \\0 > /dev/tcp/localhost/4000" ]
       timeout: 5s
@@ -149,9 +146,8 @@ services:
     container_name: supabase-storage
     image: supabase/storage-api:v0.26.1
     depends_on:
-      - db
-      # db: # Disable this if you are using an external Postgres database
-      #   condition: service_healthy
+      db: # Disable this if you are using an external Postgres database
+        condition: service_healthy
       rest:
         condition: service_started
       imgproxy:
@@ -199,9 +195,8 @@ services:
     container_name: supabase-meta
     image: supabase/postgres-meta:v0.59.0
     depends_on:
-      - db
-      # db: # Disable this if you are using an external Postgres database
-      #   condition: service_healthy
+      db: # Disable this if you are using an external Postgres database
+        condition: service_healthy
     restart: unless-stopped
     environment:
       PG_META_PORT: 8080
@@ -217,8 +212,8 @@ services:
     image: supabase/postgres:14.1.0.106
     healthcheck:
       test: pg_isready -U postgres -h localhost
-      interval: 30s
-      timeout: 30s
+      interval: 5s
+      timeout: 5s
       retries: 10
     command:
       - postgres