diff --git a/changelog.d/5-internal/pre-stop b/changelog.d/5-internal/pre-stop
new file mode 100644
index 00000000000..f7d0c0cf0fe
--- /dev/null
+++ b/changelog.d/5-internal/pre-stop
@@ -0,0 +1 @@
+charts/{brig,galley}: Allow setting a preStop hook for the deployments
diff --git a/charts/brig/templates/deployment.yaml b/charts/brig/templates/deployment.yaml
index cff8bffd9bb..fa59c13ed36 100644
--- a/charts/brig/templates/deployment.yaml
+++ b/charts/brig/templates/deployment.yaml
@@ -165,5 +165,10 @@ spec:
               scheme: HTTP
               path: /i/status
               port: {{ .Values.service.internalPort }}
+          {{- if .Values.preStop }}
+          lifecycle:
+            preStop:
+{{ toYaml .Values.preStop | indent 14 }}
+          {{- end }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/charts/brig/values.yaml b/charts/brig/values.yaml
index 7dcedbce2dc..c5f981d63bd 100644
--- a/charts/brig/values.yaml
+++ b/charts/brig/values.yaml
@@ -14,6 +14,10 @@ resources:
 metrics:
   serviceMonitor:
     enabled: false
+# This is not supported for production use, only here for testing:
+# preStop:
+#  exec: 
+#   command: ["sh", "-c", "curl http://acme.example"]
 config:
   logLevel: Info
   logFormat: StructuredJSON
diff --git a/charts/galley/templates/deployment.yaml b/charts/galley/templates/deployment.yaml
index ebfb5582abd..06ad8d1cd21 100644
--- a/charts/galley/templates/deployment.yaml
+++ b/charts/galley/templates/deployment.yaml
@@ -126,5 +126,10 @@ spec:
               scheme: HTTP
               path: /i/status
               port: {{ .Values.service.internalPort }}
+          {{- if .Values.preStop }}
+          lifecycle:
+            preStop:
+{{ toYaml .Values.preStop | indent 14 }}
+          {{- end }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/charts/galley/values.yaml b/charts/galley/values.yaml
index f6bda0eb643..947bb42c028 100644
--- a/charts/galley/values.yaml
+++ b/charts/galley/values.yaml
@@ -15,6 +15,10 @@ resources:
     cpu: "100m"
   limits:
     memory: "500Mi"
+# This is not supported for production use, only here for testing:
+# preStop:
+#  exec: 
+#   command: ["sh", "-c", "curl http://acme.example"]
 config:
   logLevel: Info
   logFormat: StructuredJSON