diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index c5c7f25..490ccd8 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -104,6 +104,15 @@ spec:
       labels:
         app: typebot-viewer
     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: viewer
           image: {{ .Values.image.viewer.repository }}:{{ .Values.image.viewer.tag }}