diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index a2998cf..c5c7f25 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -13,6 +13,15 @@ spec:
       labels:
         app: typebot-builder
     spec:
+      initContainers:
+        - name: wait-for-postgres
+          image: busybox
+          command:
+            - /bin/sh
+            - -c
+            - >
+              until nc -z typebot-postgres 5432;
+              do echo "Waiting for PostgreSQL..."; sleep 2; done;
       containers:
         - name: typebot-builder
           image: {{ .Values.image.builder.repository }}:{{ .Values.image.builder.tag }}
diff --git a/values.yaml b/values.yaml
index 6906d4c..a353bce 100644
--- a/values.yaml
+++ b/values.yaml
@@ -21,9 +21,6 @@ image:
     repository: postgres
     tag: 15
 
-studio:
-  enabled: true
-
 s3:
   enabled: true
   accessKey: minio