diff --git a/apps/calcom/config.json b/apps/calcom/config.json
index 181876d8..65002763 100644
--- a/apps/calcom/config.json
+++ b/apps/calcom/config.json
@@ -19,8 +19,8 @@
     {
       "env_variable": "CALENDSO_ENCRYPTION_KEY",
       "label": "Random string",
-      "max": 50,
-      "min": 50,
+      "max": 32,
+      "min": 32,
       "type": "random"
     },
     {
@@ -69,6 +69,14 @@
       "required": true,
       "type": "email"
     },
+    {
+        "type": "email",
+        "label": "Email server username (SMTP)",
+        "required": true,
+        "min": 1,
+        "max": 1024,
+        "env_variable": "EMAIL_SERVER_USER"
+    },
     {
       "env_variable": "EMAIL_SERVER_HOST",
       "label": "Email server host (SMTP)",
@@ -102,7 +110,7 @@
   "supported_architectures": [
     "amd64"
   ],
-  "tipi_version": 4,
+  "tipi_version": 6,
   "version": "3.7.16",
   "website": "https://cal.com/"
 }
diff --git a/apps/calcom/docker-compose.yml b/apps/calcom/docker-compose.yml
index 78450be1..6f47ce21 100644
--- a/apps/calcom/docker-compose.yml
+++ b/apps/calcom/docker-compose.yml
@@ -15,6 +15,7 @@ services:
     environment:
       - DATABASE_HOST=db-calcom
       - DATABASE_URL=postgresql://${POSTGRES_USERNAME}:${POSTGRES_PASSWORD}@db-calcom/calcom
+      - DATABASE_DIRECT_URL=postgresql://${POSTGRES_USERNAME}:${POSTGRES_PASSWORD}@db-calcom/calcom
       - POSTGRES_USER=${POSTGRES_USERNAME}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_DB=calcom
@@ -32,6 +33,7 @@ services:
       - EMAIL_SERVER_HOST=${EMAIL_SERVER_HOST}
       - EMAIL_SERVER_PORT=${EMAIL_SERVER_PORT}
       - EMAIL_SERVER_PASSWORD=${EMAIL_SERVER_PASSWORD}
+      - EMAIL_SERVER_USER=${EMAIL_SERVER_USER}
       - NODE_ENV=production
     labels:
       # Main