diff --git a/templates/compose/calcom.yaml b/templates/compose/calcom.yaml
index 2e7bca8ae..89f3376ee 100644
--- a/templates/compose/calcom.yaml
+++ b/templates/compose/calcom.yaml
@@ -59,10 +59,7 @@ services:
     volumes:
       - calcom-postgresql-data:/var/lib/postgresql/data
     healthcheck:
-      test:
-        - CMD-SHELL
-        - pg_isready -U ${SERVICE_USER_POSTGRES} -d ${POSTGRES_DB:-calendso}
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    restart: unless-stopped
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10