diff --git a/apps/support/zammad/zammad-release.yaml b/apps/support/zammad/zammad-release.yaml
index 5fccc44..4a2388a 100644
--- a/apps/support/zammad/zammad-release.yaml
+++ b/apps/support/zammad/zammad-release.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: zammad
-      version: 10.3.4 # 12.5.1 # 14.0.1 requires db upgrade
+      version: 12.5.1 # 14.0.1 requires db upgrade
       # Migration: https://github.com/zammad/zammad-helm/tree/main/zammad#upgrading
       # Versions: https://github.com/zammad/zammad-helm/blob/main/zammad/Chart.yaml
       # History: https://github.com/zammad/zammad-helm/releases
diff --git a/apps/support/zammad/zammad-values-configmap.yaml b/apps/support/zammad/zammad-values-configmap.yaml
index 8e9e8d2..80daf1b 100644
--- a/apps/support/zammad/zammad-values-configmap.yaml
+++ b/apps/support/zammad/zammad-values-configmap.yaml
@@ -40,6 +40,8 @@ data:
 
     postgresql:
       # https://github.com/bitnami/charts/blob/main/bitnami/postgresql/values.yaml
+      commonLabels:
+        stackspin.net/backupSet: "zammad"
       auth:
         username: "zammad"
         database: "zammad"
diff --git a/overrides/stackspin-apps-custom.yaml b/overrides/stackspin-apps-custom.yaml
index 3f381c1..f4bfca5 100644
--- a/overrides/stackspin-apps-custom.yaml
+++ b/overrides/stackspin-apps-custom.yaml
@@ -37,7 +37,7 @@ data:
     url: "https://flow.${domain}"
   zammad: |
     name: "Zammad Customer Support"
-    version: "6.2.0"
+    version: "6.3.1"
     url: "https://support.${domain}"
   handbook: |
     name: "FTT Handbook"