diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27aea8f..ee2f56c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -246,8 +246,8 @@ jobs:
           kubectl set image deployment/web web=ghcr.io/groombook/web:$TAG -n groombook-dev
 
           # Wait for rollout
-          kubectl rollout status deployment/api -n groombook-dev --timeout=120s
-          kubectl rollout status deployment/web -n groombook-dev --timeout=120s
+          kubectl rollout status deployment/api -n groombook-dev --timeout=300s
+          kubectl rollout status deployment/web -n groombook-dev --timeout=300s
 
           echo "Deployment complete."
 
diff --git a/charts/groombook/templates/api-deployment.yaml b/charts/groombook/templates/api-deployment.yaml
index 8e118d4..aaee7b0 100644
--- a/charts/groombook/templates/api-deployment.yaml
+++ b/charts/groombook/templates/api-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/component: api
 spec:
   replicas: {{ .Values.api.replicas }}
+  progressDeadlineSeconds: 300
   selector:
     matchLabels:
       {{- include "groombook.selectorLabels" . | nindent 6 }}
diff --git a/charts/groombook/templates/web-deployment.yaml b/charts/groombook/templates/web-deployment.yaml
index 9652811..f757dcc 100644
--- a/charts/groombook/templates/web-deployment.yaml
+++ b/charts/groombook/templates/web-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/component: web
 spec:
   replicas: {{ .Values.web.replicas }}
+  progressDeadlineSeconds: 300
   selector:
     matchLabels:
       {{- include "groombook.selectorLabels" . | nindent 6 }}