diff --git a/deployment/k3s/templates/deployments/calendar/calendar-deployment.yaml b/deployment/k3s/templates/deployments/calendar/calendar-deployment.yaml
index 2d3fefd24..8117886c2 100644
--- a/deployment/k3s/templates/deployments/calendar/calendar-deployment.yaml
+++ b/deployment/k3s/templates/deployments/calendar/calendar-deployment.yaml
@@ -63,11 +63,11 @@ spec:
             httpGet:
               path: /api/calendar/status
               port: calendar
-            failureThreshold: 2
-            periodSeconds: 10
+            failureThreshold: 5
+            periodSeconds: 1
           startupProbe:
             httpGet:
               path: /api/calendar/status
               port: calendar
-            failureThreshold: 60
+            failureThreshold: 240
             periodSeconds: 1
diff --git a/deployment/k3s/templates/deployments/data-deployment.yaml b/deployment/k3s/templates/deployments/data-deployment.yaml
index 43ecf5167..70ab174e0 100644
--- a/deployment/k3s/templates/deployments/data-deployment.yaml
+++ b/deployment/k3s/templates/deployments/data-deployment.yaml
@@ -42,7 +42,7 @@ spec:
             httpGet:
               path: /cdn/health
               port: http
-            failureThreshold: 3
+            failureThreshold: 5
             periodSeconds: 1
           startupProbe:
             httpGet:
diff --git a/deployment/k3s/templates/deployments/feedback-deployment.yaml b/deployment/k3s/templates/deployments/feedback-deployment.yaml
index db539a31f..52395cfe0 100644
--- a/deployment/k3s/templates/deployments/feedback-deployment.yaml
+++ b/deployment/k3s/templates/deployments/feedback-deployment.yaml
@@ -71,13 +71,13 @@ spec:
             httpGet:
               path: /api/feedback/status
               port: feedback
-            failureThreshold: 2
+            failureThreshold: 5
             periodSeconds: 1
           startupProbe:
             httpGet:
               path: /api/feedback/status
               port: feedback
-            failureThreshold: 6
+            failureThreshold: 60
             periodSeconds: 1
 {{ if or (.Values.server.GITHUB_TOKEN) (.Values.server.JWT_KEY) }}
 ---
diff --git a/deployment/k3s/templates/deployments/server-deployment.yaml b/deployment/k3s/templates/deployments/server-deployment.yaml
index 706bccd6a..de272823d 100644
--- a/deployment/k3s/templates/deployments/server-deployment.yaml
+++ b/deployment/k3s/templates/deployments/server-deployment.yaml
@@ -69,13 +69,14 @@ spec:
             httpGet:
               path: /api/status
               port: api
-            failureThreshold: 1
+            failureThreshold: 5
             periodSeconds: 1
           startupProbe:
             httpGet:
               path: /api/status
               port: api
-            failureThreshold: 60
+            failureThreshold: 240
+            initialDelaySeconds: 30
             periodSeconds: 1
         - name: mieli-search
           image: {{ $.Values.mielisearch.image.repository }}:{{ $.Values.mielisearch.image.tag }}
@@ -97,24 +98,26 @@ spec:
               memory: {{ if eq "nav.tum.de" $.Values.url }}200Mi{{ else }}50Mi{{ end }}
             limits:
               memory: 500Mi
-          startupProbe:
+          livenessProbe:
             httpGet:
               path: /health
               port: http
-            periodSeconds: 1
-            initialDelaySeconds: 20
-            failureThreshold: 240
-          readinessProbe:
+            failureThreshold: 2
+            periodSeconds: 10
+          startupProbe:
             httpGet:
               path: /health
               port: http
-            periodSeconds: 10
-          livenessProbe:
+            periodSeconds: 1
+            initialDelaySeconds: 10
+            failureThreshold: 60
+          readinessProbe:
             httpGet:
               path: /health
               port: http
             periodSeconds: 10
-{{ if $.Values.server.MEILI_MASTER_KEY }}
+            failureThreshold: 2
+  {{ if $.Values.server.MEILI_MASTER_KEY }}
 ---
 apiVersion: v1
 kind: Secret
@@ -127,6 +130,6 @@ metadata:
     app.kubernetes.io/name: api
 data:
   {{ if $.Values.server.MEILI_MASTER_KEY }}
-    MEILI_MASTER_KEY: {{ $.Values.server.MEILI_MASTER_KEY }}
+  MEILI_MASTER_KEY: {{ $.Values.server.MEILI_MASTER_KEY }}
+  {{ end }}
   {{ end }}
-{{ end }}