diff --git a/charts/dateme-chart/templates/frontend-deployment.yaml b/charts/dateme-chart/templates/frontend-deployment.yaml
index 8973e53..c32a09f 100644
--- a/charts/dateme-chart/templates/frontend-deployment.yaml
+++ b/charts/dateme-chart/templates/frontend-deployment.yaml
@@ -17,6 +17,19 @@ spec:
         app: {{ .Release.Name }}-{{ .Values.frontend.name }}
         component: frontend
     spec:
+      initContainers:
+        - name: wait-for-backend
+          image: busybox:1.35
+          command:
+            - /bin/sh
+            - -c
+            - |
+              echo "Waiting for backend to be ready..."
+              until wget -q -O- http://{{ .Release.Name }}-{{ .Values.backend.name }}:{{ .Values.backend.service.port }}/health > /dev/null 2>&1; do
+                echo "Backend not ready, waiting..."
+                sleep 2
+              done
+              echo "Backend is ready!"
       containers:
         - name: {{ .Values.frontend.name }}
           image: "{{ .Values.frontend.image.repository }}:{{ .Values.frontend.image.tag }}"