diff --git a/manifests/postgres/statefulset.yaml b/manifests/postgres/statefulset.yaml
index 28b3a33..4031d5b 100644
--- a/manifests/postgres/statefulset.yaml
+++ b/manifests/postgres/statefulset.yaml
@@ -17,7 +17,7 @@ spec:
       labels:
         app: postgres
     spec:
-      terminationGracePeriodSeconds: 30
+      terminationGracePeriodSeconds: 60
       imagePullSecrets:
       - name: registry-credentials
       securityContext:
@@ -96,6 +96,10 @@ spec:
           periodSeconds: 5
           timeoutSeconds: 3
           failureThreshold: 12
+        lifecycle:
+          preStop:
+            exec:
+              command: ["pg_ctl stop -w -t 60 -m fast"]
       volumes:
       - name: dshm
         emptyDir: