diff --git a/backend/charts/api/templates/_helpers.tpl b/backend/charts/api/templates/_helpers.tpl
index 099afaa0b8..7e5172aa7a 100644
--- a/backend/charts/api/templates/_helpers.tpl
+++ b/backend/charts/api/templates/_helpers.tpl
@@ -84,9 +84,6 @@ OTEL_EXPORTER_OTLP_PORT: {{ .Values.otel.otlpPort | quote }} # sends to gRPC rec
 {{- if .Values.nucleusEnv }}
 NUCLEUS_ENV: {{ .Values.nucleusEnv }}
 {{- end }}
-{{- if .Values.shutdownTimeoutSeconds }}
-SHUTDOWN_TIMEOUT_SECONDS: {{ .Values.shutdownTimeoutSeconds | quote }}
-{{- end }}
 {{- if and .Values.auth .Values.auth.enabled }}
 AUTH_ENABLED: {{ .Values.auth.enabled | default "false" | quote }}
 {{- end }}
diff --git a/backend/charts/api/templates/deployment.yaml b/backend/charts/api/templates/deployment.yaml
index f5e3ec174b..d815def0b6 100644
--- a/backend/charts/api/templates/deployment.yaml
+++ b/backend/charts/api/templates/deployment.yaml
@@ -64,8 +64,8 @@ spec:
       {{- if .Values.serviceAccount.create }}
       serviceAccountName: {{ include "neosync-api.serviceAccountName" . }}
       {{- end }}
-      {{- if .Values.terminationGracePeriod }}
-      terminationGracePeriod: {{ .Values.terminationGracePeriod }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriod: {{ .Values.terminationGracePeriodSeconds }}
       {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
diff --git a/docs/docs/deploy/environment-variables.md b/docs/docs/deploy/environment-variables.md
index 578d86b87f..e6fbb79672 100644
--- a/docs/docs/deploy/environment-variables.md
+++ b/docs/docs/deploy/environment-variables.md
@@ -30,7 +30,6 @@ These environment variables are loaded when running the `mgmt serve connect` com
 | HOST                                | The host that will be used when binding the HTTP server. Set this to "0.0.0.0" for production environments                                                                                                                                                                                       | false    | 127.0.0.1                                     |
 | PORT                                | The port that will be used to bind the HTTP server                                                                                                                                                                                                                                               | false    | 8080                                          |
 | NUCLEUS_ENV                         | The environment that is being deployed to. Useful for metrics                                                                                                                                                                                                                                    | false    | unknown                                       |
-| SHUTDOWN_TIMEOUT_SECONDS            | Configures the graceful shutdown of a pod in Kubernetes                                                                                                                                                                                                                                          | false    |                                               |
 | LOGS_FORMAT_JSON                    | Whether or not to format logs in JSON or in plaintext to stdout                                                                                                                                                                                                                                  | false    | true                                          |
 | AUTH_ENABLED                        | Whether or not to enable authentication in the API. Should be required for any production environment                                                                                                                                                                                            | false    | false                                         |
 | AUTH_BASEURL                        | The base URL for the authentication server. This is used to find the JWKS URL to validate JWT tokens                                                                                                                                                                                             | false    |                                               |
diff --git a/frontend/apps/web/charts/app/templates/_helpers.tpl b/frontend/apps/web/charts/app/templates/_helpers.tpl
index 0f829e6241..776b2367e0 100644
--- a/frontend/apps/web/charts/app/templates/_helpers.tpl
+++ b/frontend/apps/web/charts/app/templates/_helpers.tpl
@@ -75,9 +75,6 @@ OTEL_EXPORTER_OTLP_PORT: {{ .Values.otel.otlpPort | quote }} # sends to gRPC rec
 {{- if .Values.nucleusEnv }}
 NUCLEUS_ENV: {{ .Values.nucleusEnv }}
 {{- end }}
-{{- if .Values.shutdownTimeoutSeconds }}
-SHUTDOWN_TIMEOUT_SECONDS: {{ .Values.shutdownTimeoutSeconds | quote }}
-{{- end }}
 {{- if .Values.neosyncApi.url }}
 NEOSYNC_API_BASE_URL: {{ .Values.neosyncApi.url }}
 {{- end }}
diff --git a/frontend/apps/web/charts/app/templates/deployment.yaml b/frontend/apps/web/charts/app/templates/deployment.yaml
index a0c96bd8a1..6a4d10d128 100644
--- a/frontend/apps/web/charts/app/templates/deployment.yaml
+++ b/frontend/apps/web/charts/app/templates/deployment.yaml
@@ -58,8 +58,8 @@ spec:
       {{- if .Values.serviceAccount.create }}
       serviceAccountName: {{ include "neosync-app.serviceAccountName" . }}
       {{- end }}
-      {{- if .Values.terminationGracePeriod }}
-      terminationGracePeriod: {{ .Values.terminationGracePeriod }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriod: {{ .Values.terminationGracePeriodSeconds }}
       {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
diff --git a/worker/charts/worker/templates/_helpers.tpl b/worker/charts/worker/templates/_helpers.tpl
index 04f882b8f7..2a51d81612 100644
--- a/worker/charts/worker/templates/_helpers.tpl
+++ b/worker/charts/worker/templates/_helpers.tpl
@@ -77,9 +77,6 @@ OTEL_EXPORTER_OTLP_PORT: {{ .Values.otel.otlpPort | quote }} # sends to gRPC rec
 {{- if .Values.nucleusEnv }}
 NUCLEUS_ENV: {{ .Values.nucleusEnv }}
 {{- end }}
-{{- if .Values.shutdownTimeoutSeconds }}
-SHUTDOWN_TIMEOUT_SECONDS: {{ .Values.shutdownTimeoutSeconds | quote }}
-{{- end }}
 {{- if .Values.temporal.url }}
 TEMPORAL_URL: {{ .Values.temporal.url }}
 {{- end }}
diff --git a/worker/charts/worker/templates/deployment.yaml b/worker/charts/worker/templates/deployment.yaml
index ad6b837093..2be4452d1c 100644
--- a/worker/charts/worker/templates/deployment.yaml
+++ b/worker/charts/worker/templates/deployment.yaml
@@ -70,8 +70,8 @@ spec:
       {{- if .Values.serviceAccount.create }}
       serviceAccountName: {{ include "neosync-worker.serviceAccountName" . }}
       {{- end }}
-      {{- if .Values.terminationGracePeriod }}
-      terminationGracePeriod: {{ .Values.terminationGracePeriod }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriod: {{ .Values.terminationGracePeriodSeconds }}
       {{- end }}
       {{- if .Values.tolerations }}
       tolerations: