diff --git a/Formbricks/docker-compose.yaml b/Formbricks/docker-compose.yaml
index 14db2e8..2e1e29d 100644
--- a/Formbricks/docker-compose.yaml
+++ b/Formbricks/docker-compose.yaml
@@ -2,7 +2,6 @@ services:
   postgres:
     image: pgvector/pgvector:pg15
     container_name: formbricks-db
-    restart: unless-stopped
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
@@ -15,23 +14,28 @@ services:
       timeout: 5s
       retries: 10
       start_period: 10s
+    restart: unless-stopped
 
   redis:
     image: redis:7-alpine
     container_name: formbricks-redis
-    restart: unless-stopped
     volumes:
       - redis-data:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    restart: unless-stopped
 
   formbricks:
     image: ghcr.io/formbricks/formbricks:latest
     container_name: formbricks-app
-    restart: unless-stopped
     depends_on:
       postgres:
         condition: service_healthy
       redis:
-        condition: service_started
+        condition: service_healthy
     ports:
       - ${PORT}:3000
     environment:
@@ -41,7 +45,19 @@ services:
       NEXTAUTH_URL: ${WEBAPP_URL}
       ENCRYPTION_KEY: ${ENCRYPTION_KEY}
       REDIS_URL: redis://redis:6379
+    volumes:
+      - uploads:/home/nextjs/apps/web/uploads
+      - saml:/home/nextjs/apps/web/saml-connection
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO- http://localhost:3000/health || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
+    restart: unless-stopped
 
 volumes:
   postgres-data:
-  redis-data:
\ No newline at end of file
+  redis-data:
+  uploads:
+  saml:
\ No newline at end of file