diff --git a/postgresql/templates/statefulset.yaml b/postgresql/templates/statefulset.yaml
index 1ce8b94e9..07cd0c178 100644
--- a/postgresql/templates/statefulset.yaml
+++ b/postgresql/templates/statefulset.yaml
@@ -132,6 +132,8 @@ spec:
 {{ tuple $envAll "postgresql" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
+
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.server.timeout | default "180" }}
       initContainers:
 {{ tuple $envAll "postgresql" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: set-volume-perms
diff --git a/postgresql/values.yaml b/postgresql/values.yaml
index 6ee4381eb..2a60d486a 100644
--- a/postgresql/values.yaml
+++ b/postgresql/values.yaml
@@ -70,6 +70,8 @@ pod:
     termination_grace_period:
       prometheus_postgresql_exporter:
         timeout: 30
+      server:
+        timeout: 180
   resources:
     enabled: false
     server: