diff --git a/docker-compose.yml b/docker-compose.yml
index 940cd0f6d..03c728817 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,9 +10,9 @@ services:
       POSTGRES_DB: rrr
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U rrr"]
-      interval: 30s
-      timeout: 30s
-      retries: 3
+      interval: 5s
+      timeout: 5s
+      retries: 20
   lemmy:
     build: 
       context: .
@@ -22,6 +22,7 @@ services:
     environment:
       LEMMY_FRONT_END_DIR: /app/dist
       DATABASE_URL: postgres://rrr:rrr@db:5432/rrr
+    restart: always
     depends_on: 
       db: 
         condition: service_healthy