diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md
index 5bd0724..dee4c3c 100644
--- a/charts/spire/charts/spire-server/README.md
+++ b/charts/spire/charts/spire-server/README.md
@@ -287,6 +287,14 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `controllerManager.leaderElection.leaseDuration`                                             | Duration that non-leader candidates will wait to force acquire leadership. Increase this in high-load clusters to reduce API server pressure.                                                                                                                                                                                                                                                        | `15s`                                                                                          |
 | `controllerManager.leaderElection.renewDeadline`                                             | Duration the acting leader will retry refreshing leadership before giving up. Must be less than leaseDuration.                                                                                                                                                                                                                                                                                       | `10s`                                                                                          |
 | `controllerManager.leaderElection.retryPeriod`                                               | Duration the LeaderElector clients should wait between tries of actions. Must be less than renewDeadline.                                                                                                                                                                                                                                                                                            | `2s`                                                                                           |
+| `controllerManager.livenessProbe.initialDelaySeconds`                                        | Initial delay seconds for livenessProbe                                                                                                                                                                                                                                                                                                                                                              | `5`                                                                                            |
+| `controllerManager.livenessProbe.periodSeconds`                                              | Period seconds for livenessProbe                                                                                                                                                                                                                                                                                                                                                                     | `10`                                                                                           |
+| `controllerManager.livenessProbe.timeoutSeconds`                                             | Timeout seconds for livenessProbe                                                                                                                                                                                                                                                                                                                                                                    | `5`                                                                                            |
+| `controllerManager.livenessProbe.failureThreshold`                                           | Failure threshold for livenessProbe                                                                                                                                                                                                                                                                                                                                                                  | `3`                                                                                            |
+| `controllerManager.readinessProbe.initialDelaySeconds`                                       | Initial delay seconds for readinessProbe                                                                                                                                                                                                                                                                                                                                                             | `5`                                                                                            |
+| `controllerManager.readinessProbe.periodSeconds`                                             | Period seconds for readinessProbe                                                                                                                                                                                                                                                                                                                                                                    | `10`                                                                                           |
+| `controllerManager.readinessProbe.timeoutSeconds`                                            | Timeout seconds for readinessProbe                                                                                                                                                                                                                                                                                                                                                                   | `5`                                                                                            |
+| `controllerManager.readinessProbe.failureThreshold`                                          | Failure threshold for readinessProbe                                                                                                                                                                                                                                                                                                                                                                 | `3`                                                                                            |
 | `controllerManager.parentIDTemplate`                                                         | The template that is used to register workloads.                                                                                                                                                                                                                                                                                                                                                     | `spiffe://{{ .TrustDomain }}/spire/agent/k8s_psat/{{ .ClusterName }}/{{ .NodeMeta.UID }}`      |
 | `controllerManager.expandEnv`                                                                | Set to true to enable environment variable substitution of config file options                                                                                                                                                                                                                                                                                                                       | `false`                                                                                        |
 | `controllerManager.extraEnv`                                                                 | Extra environment variables to add to the controller manager                                                                                                                                                                                                                                                                                                                                         | `[]`                                                                                           |
diff --git a/charts/spire/charts/spire-server/templates/_controller-manager-container.tpl b/charts/spire/charts/spire-server/templates/_controller-manager-container.tpl
index 2b56b78..177c593 100644
--- a/charts/spire/charts/spire-server/templates/_controller-manager-container.tpl
+++ b/charts/spire/charts/spire-server/templates/_controller-manager-container.tpl
@@ -146,10 +146,12 @@ Auto-generation preserves trailing numbers from cluster names or uses hash for u
     httpGet:
       path: /healthz
       port: {{ $hpName }}
+    {{- toYaml .Values.controllerManager.livenessProbe | nindent 4 }}
   readinessProbe:
     httpGet:
       path: /readyz
       port: {{ $hpName }}
+    {{- toYaml .Values.controllerManager.readinessProbe | nindent 4 }}
 {{- end }}
   resources:
     {{- toYaml .Values.controllerManager.resources | nindent 4 }}
diff --git a/charts/spire/charts/spire-server/values.yaml b/charts/spire/charts/spire-server/values.yaml
index 9ff42f1..d1fa7d5 100644
--- a/charts/spire/charts/spire-server/values.yaml
+++ b/charts/spire/charts/spire-server/values.yaml
@@ -596,6 +596,26 @@ controllerManager:
     renewDeadline: "10s"
     retryPeriod: "2s"
 
+  ## @param controllerManager.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe
+  ## @param controllerManager.livenessProbe.periodSeconds Period seconds for livenessProbe
+  ## @param controllerManager.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe
+  ## @param controllerManager.livenessProbe.failureThreshold Failure threshold for livenessProbe
+  livenessProbe:
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 3
+
+  ## @param controllerManager.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe
+  ## @param controllerManager.readinessProbe.periodSeconds Period seconds for readinessProbe
+  ## @param controllerManager.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe
+  ## @param controllerManager.readinessProbe.failureThreshold Failure threshold for readinessProbe
+  readinessProbe:
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 3
+
   ## @param controllerManager.parentIDTemplate The template that is used to register workloads.
   parentIDTemplate: "spiffe://{{ .TrustDomain }}/spire/agent/k8s_psat/{{ .ClusterName }}/{{ .NodeMeta.UID }}"