diff --git a/templates/compose/unsend.yaml b/templates/compose/unsend.yaml
index 6929e5dc1..f838c8632 100644
--- a/templates/compose/unsend.yaml
+++ b/templates/compose/unsend.yaml
@@ -12,10 +12,10 @@ services:
       - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
       - POSTGRES_DB=${SERVICE_DB_POSTGRES:-unsend}
     healthcheck:
-      test: ["CMD", "pg_isready", "-U", "${SERVICE_USER_POSTGRES}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
     volumes:
       - unsend-postgres-data:/var/lib/postgresql/data
 
@@ -43,8 +43,8 @@ services:
       - AWS_ACCESS_KEY=${SERVICE_AWS_ACCESS_KEY}
       - AWS_SECRET_KEY=${SERVICE_AWS_SECRET_KEY}
       - AWS_DEFAULT_REGION=${SERVICE_AWS_DEFAULT_REGION}
-      - GITHUB_ID=${SERVICE_GITHUB_ID:-1234567890}
-      - GITHUB_SECRET=${SERVICE_GITHUB_SECRET:-abcde1234567890}
+      - GITHUB_ID=${SERVICE_GITHUB_ID}
+      - GITHUB_SECRET=${SERVICE_GITHUB_SECRET}
       - REDIS_URL=redis://redis:6379
       - NEXT_PUBLIC_IS_CLOUD=${NEXT_PUBLIC_IS_CLOUD:-false}
       - API_RATE_LIMIT=${SERVICE_API_RATE_LIMIT:-1}
@@ -54,7 +54,7 @@ services:
       redis:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:3000"]
-      interval: 2s
-      timeout: 10s
-      retries: 15
+      test: [ "CMD-SHELL", "wget -qO- http://127.0.0.1:3000 || exit 1" ]
+      interval: 5s
+      retries: 10
+      timeout: 2s