diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md
index fd5ea7f..42ecb03 100644
--- a/charts/spire/charts/spire-server/README.md
+++ b/charts/spire/charts/spire-server/README.md
@@ -116,6 +116,7 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
 | `tolerations`                                                                                | List of tolerations                                                                                                                                                                                                                                                                                                                                                                                  | `[]`                                                                                                        |
 | `affinity`                                                                                   | List of node affinities                                                                                                                                                                                                                                                                                                                                                                              | `{}`                                                                                                        |
 | `topologySpreadConstraints`                                                                  | Topology spread constraints for resilience                                                                                                                                                                                                                                                                                                                                                           | `[]`                                                                                                        |
+| `terminationGracePeriodSeconds`                                                              | Override the termination grace period for the pod. Increase to allow time for load balancer target deregistration and in-flight gRPC drain before SIGKILL.                                                                                                                                                                                                                                           | `nil`                                                                                                       |
 | `livenessProbe.failureThreshold`                                                             | Failure threshold count for livenessProbe                                                                                                                                                                                                                                                                                                                                                            | `2`                                                                                                         |
 | `livenessProbe.initialDelaySeconds`                                                          | Initial delay seconds for livenessProbe                                                                                                                                                                                                                                                                                                                                                              | `15`                                                                                                        |
 | `livenessProbe.periodSeconds`                                                                | Period seconds for livenessProbe                                                                                                                                                                                                                                                                                                                                                                     | `60`                                                                                                        |
diff --git a/charts/spire/charts/spire-server/templates/server-resource.yaml b/charts/spire/charts/spire-server/templates/server-resource.yaml
index 9846b6f..b849916 100644
--- a/charts/spire/charts/spire-server/templates/server-resource.yaml
+++ b/charts/spire/charts/spire-server/templates/server-resource.yaml
@@ -528,6 +528,9 @@ spec:
       topologySpreadConstraints:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- end }}
       volumes:
         - name: server-tmp
           emptyDir: {}
diff --git a/charts/spire/charts/spire-server/values.yaml b/charts/spire/charts/spire-server/values.yaml
index b45640d..9577990 100644
--- a/charts/spire/charts/spire-server/values.yaml
+++ b/charts/spire/charts/spire-server/values.yaml
@@ -126,6 +126,9 @@ affinity: {}
 ## @param topologySpreadConstraints [array] Topology spread constraints for resilience
 topologySpreadConstraints: []
 
+## @param terminationGracePeriodSeconds [nullable] Override the termination grace period for the pod. Increase to allow time for load balancer target deregistration and in-flight gRPC drain before SIGKILL.
+terminationGracePeriodSeconds: ~
+
 ## @param livenessProbe.failureThreshold Failure threshold count for livenessProbe
 ## @param livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe
 ## @param livenessProbe.periodSeconds Period seconds for livenessProbe