diff --git a/charts/funkwhale/templates/deployment.yaml b/charts/funkwhale/templates/deployment.yaml
index 6fbf379..bd80a91 100644
--- a/charts/funkwhale/templates/deployment.yaml
+++ b/charts/funkwhale/templates/deployment.yaml
@@ -52,6 +52,17 @@ spec:
               command:
                 - stat
                 - /run/funkwhale/funkwhale.sock
+            failureThreshold: {{ .Values.api.readinessProbe.failureThreshold | default 3 }}
+            periodSeconds: {{ .Values.api.readinessProbe.periodSeconds | default 5 }}
+            initialDelaySeconds:  {{ .Values.api.readinessProbe.initialDelaySeconds | default 5 }}
+          startupProbe:
+            exec:
+              command:
+                - stat
+                - /run/funkwhale/funkwhale.sock
+            failureThreshold: {{ .Values.api.startupProbe.failureThreshold | default 3 }}
+            periodSeconds: {{ .Values.api.startupProbe.periodSeconds | default 20 }}
+            initialDelaySeconds:  {{ .Values.api.startupProbe.initialDelaySeconds | default 5 }}
           envFrom:
           - configMapRef:
               name: {{ include "funkwhale.fullname" . }}
@@ -97,9 +108,21 @@ spec:
             httpGet:
               path: /
               port: http
+            failureThreshold: {{ .Values.front.livenessProbe.failureThreshold | default 3 }}
+            periodSeconds: {{ .Values.front.livenessProbe.periodSeconds | default 20 }}
+            initialDelaySeconds:  {{ .Values.front.livenessProbe.initialDelaySeconds | default 15 }}
           readinessProbe:
             tcpSocket:
               port: http
+            failureThreshold: {{ .Values.front.readinessProbe.failureThreshold | default 3 }}
+            periodSeconds: {{ .Values.front.readinessProbe.periodSeconds | default 5 }}
+            initialDelaySeconds:  {{ .Values.front.readinessProbe.initialDelaySeconds | default 5 }}
+          startupProbe:
+            tcpSocket:
+              port: http
+            failureThreshold: {{ .Values.front.startupProbe.failureThreshold | default 3 }}
+            periodSeconds: {{ .Values.front.startupProbe.periodSeconds | default 20 }}
+            initialDelaySeconds:  {{ .Values.front.startupProbe.initialDelaySeconds | default 5 }}
           volumeMounts:
             - mountPath: /run/funkwhale
               name: funkwhale-sock
diff --git a/charts/funkwhale/values.yaml b/charts/funkwhale/values.yaml
index 3f217a5..345ef6c 100644
--- a/charts/funkwhale/values.yaml
+++ b/charts/funkwhale/values.yaml
@@ -127,6 +127,8 @@ api:
   tolerations: []
 
   affinity: {}
+  readinessProbe: {}
+  startupProbe: {}
 
 front:
   image:
@@ -158,6 +160,9 @@ front:
   tolerations: []
 
   affinity: {}
+  readinessProbe: {}
+  livenessProbe: {}
+  startupProbe: {}
 
 celery:
   beat: