diff --git a/helm/kitcaddy/templates/kitcaddy-deployment.yaml b/helm/kitcaddy/templates/kitcaddy-deployment.yaml
index 16df962..6bc2ab0 100644
--- a/helm/kitcaddy/templates/kitcaddy-deployment.yaml
+++ b/helm/kitcaddy/templates/kitcaddy-deployment.yaml
@@ -120,26 +120,14 @@ spec:
             - -config
             - /config/config.json
           env: []
+          {{- if .Values.kitcaddy.startupProbe }}
           startupProbe:
-            failureThreshold: {{ if and .Values.kitcaddy .Values.kitcaddy.startupProbe }}{{ .Values.kitcaddy.startupProbe.failureThreshold | default 5 }}{{ else }}5{{ end }}
-            httpGet:
-              path: {{ if and .Values.kitcaddy .Values.kitcaddy.startupProbe }}{{ .Values.kitcaddy.startupProbe.path | default "/metrics" }}{{ else }}/metrics{{ end }}
-              port: {{ if and .Values.kitcaddy .Values.kitcaddy.startupProbe }}{{ .Values.kitcaddy.startupProbe.port | default 80 }}{{ else }}80{{ end }}
-              scheme: HTTP
-            initialDelaySeconds: {{ if and .Values.kitcaddy .Values.kitcaddy.startupProbe }}{{ .Values.kitcaddy.startupProbe.initialDelaySeconds | default 50 }}{{ else }}50{{ end }}
-            periodSeconds: 10
-            successThreshold: 1
-            timeoutSeconds: 5
+            {{- toYaml .Values.kitcaddy.startupProbe | nindent 12 }}
+          {{- end }}
+          {{- if .Values.kitcaddy.readinessProbe }}
           readinessProbe:
-            failureThreshold: 3
-            httpGet:
-              path: {{ if and .Values.kitcaddy .Values.kitcaddy.readinessProbe }}{{ .Values.kitcaddy.readinessProbe.path | default "/metrics" }}{{ else }}/metrics{{ end }}
-              port: {{ if and .Values.kitcaddy .Values.kitcaddy.readinessProbe }}{{ .Values.kitcaddy.readinessProbe.port | default 80 }}{{ else }}80{{ end }}
-              scheme: HTTP
-            initialDelaySeconds: 5
-            periodSeconds: 5
-            successThreshold: 1
-            timeoutSeconds: 1
+            {{- toYaml .Values.kitcaddy.readinessProbe | nindent 12 }}
+          {{- end }}
           image: "{{ .Values.kitcaddy.image.repository }}:{{ .Values.kitcaddy.image.tag | default .Chart.AppVersion }}"
           ports:
             - containerPort: 80
diff --git a/helm/kitcaddy/values.yaml b/helm/kitcaddy/values.yaml
index 6058e6e..ba79c04 100644
--- a/helm/kitcaddy/values.yaml
+++ b/helm/kitcaddy/values.yaml
@@ -15,17 +15,31 @@ netpol:
   enabled: true
 
 kitcaddy:
+  startupProbe:
+    failureThreshold: 5
+    httpGet:
+      path: /metrics
+      port: 80
+      scheme: HTTP
+    initialDelaySeconds: 50
+    periodSeconds: 10
+    successThreshold: 1
+    timeoutSeconds: 5
+  readinessProbe:
+    failureThreshold: 3
+    httpGet:
+      path: /metrics
+      port: 80
+      scheme: HTTP
+    initialDelaySeconds: 5
+    periodSeconds: 5
+    successThreshold: 1
+    timeoutSeconds: 1
   logLevel: INFO
   admin:
     disabled: true
   image:
     repository: kvalitetsit/kitcaddy
-  startupProbe:
-    path: /metrics
-    port: 80
-  readinessProbe:
-    path: /metrics
-    port: 80
   resources:
     limits:
      cpu: 100m
diff --git a/helm/kitcaddyExampleValues.yaml b/helm/kitcaddyExampleValues.yaml
index e647a10..1367151 100644
--- a/helm/kitcaddyExampleValues.yaml
+++ b/helm/kitcaddyExampleValues.yaml
@@ -77,6 +77,18 @@ serviceAccount:
 deploymentStrategy: Recreate
 
 kitcaddy:
+  startupProbe: null
+  readinessProbe: 
+    httpGet:
+      path: /metrics
+      port: 80
+      scheme: HTTP
+    initialDelaySeconds: 5
+    failureThreshold: 3
+    periodSeconds: 5
+    successThreshold: 1
+    timeoutSeconds: 1
+    
   secretName: sts-public-cert
   extraVolumeMounts:
     sts-public-cert: