diff --git a/Formbricks/docker-compose.yaml b/Formbricks/docker-compose.yaml
index 6528a16..c5877f2 100644
--- a/Formbricks/docker-compose.yaml
+++ b/Formbricks/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   postgres:
-    image: postgres:15-alpine
+    image: pgvector/pgvector:pg15
     container_name: formbricks-db
     environment:
       POSTGRES_USER: postgres
@@ -8,13 +8,34 @@ services:
       POSTGRES_DB: formbricks
     volumes:
       - postgres-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "psql -U postgres -d formbricks -c 'SELECT 1' > /dev/null 2>&1"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+      start_period: 10s
+    restart: unless-stopped
+
+  redis:
+    image: redis:7-alpine
+    container_name: formbricks-redis
+    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
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     ports:
       - ${PORT}:3000
     environment:
@@ -23,13 +44,14 @@ services:
       NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
       NEXTAUTH_URL: ${WEBAPP_URL}
       ENCRYPTION_KEY: ${ENCRYPTION_KEY}
-      MAIL_FROM: ${MAIL_FROM}
-      SMTP_HOST: ${SMTP_HOST}
-      SMTP_PORT: ${SMTP_PORT}
-      SMTP_SECURE_ENABLED: ${SMTP_SECURE_ENABLED}
-      SMTP_USER: ${SMTP_USER}
-      SMTP_PASSWORD: ${SMTP_PASSWORD}
+      REDIS_URL: redis://redis:6379
+    volumes:
+      - uploads:/home/nextjs/apps/web/uploads
+      - saml:/home/nextjs/apps/web/saml-connection
     restart: unless-stopped
 
 volumes:
-  postgres-data:
\ No newline at end of file
+  postgres-data:
+  redis-data:
+  uploads:
+  saml:
\ No newline at end of file