diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
index 68ac6bf..e394543 100644
--- a/charts/common/Chart.yaml
+++ b/charts/common/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: common
 description: "Bedag's common Helm chart to use for creating other Helm charts"
-version: 12.11.0
+version: 12.12.0
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
diff --git a/charts/common/README.md b/charts/common/README.md
index b0e4fea..27903dd 100644
--- a/charts/common/README.md
+++ b/charts/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 12.11.0](https://img.shields.io/badge/Version-12.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 12.12.0](https://img.shields.io/badge/Version-12.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Bedag's common Helm chart to use for creating other Helm charts
 
diff --git a/charts/common/templates/_deployment.yaml b/charts/common/templates/_deployment.yaml
index cb83d3f..07a706f 100644
--- a/charts/common/templates/_deployment.yaml
+++ b/charts/common/templates/_deployment.yaml
@@ -59,19 +59,19 @@ spec:
         {{- range $containerName, $containerValues := $containers }}
         {{- $configMap := $containerValues.envConfigMap }}
         {{- if and $configMap (not $deployment.disableChecksumAnnotations) }}
-        checksum/envConfigMap: {{ print $configMap | sha256sum }}
+        checksum/envConfigMap-{{ $containerName }}: {{ print $configMap | sha256sum }}
         {{- end }}
         {{- $secret := $containerValues.envSecret }}
         {{- if and $secret (not $deployment.disableChecksumAnnotations) }}
-        checksum/envSecret: {{ print $secret | sha256sum }}
+        checksum/envSecret-{{ $containerName }}: {{ print $secret | sha256sum }}
         {{- end }}
         {{- $configFiles := $containerValues.configFiles }}
         {{- if and $configFiles (not $deployment.disableChecksumAnnotations) }}
-        checksum/configFiles: {{ print $configFiles | sha256sum }}
+        checksum/configFiles-{{ $containerName }}: {{ print $configFiles | sha256sum }}
         {{- end }}
         {{- $binaryFiles := $containerValues.binaryFiles }}
         {{- if and $binaryFiles (not $deployment.disableChecksumAnnotations) }}
-        checksum/binaryFiles: {{ print $binaryFiles | sha256sum }}
+        checksum/binaryFiles-{{ $containerName }}: {{ print $binaryFiles | sha256sum }}
         {{- end }}
         {{- end }}
         {{- end }}
diff --git a/charts/common/templates/_statefulset.yaml b/charts/common/templates/_statefulset.yaml
index 6b86e8b..c0b7959 100644
--- a/charts/common/templates/_statefulset.yaml
+++ b/charts/common/templates/_statefulset.yaml
@@ -53,19 +53,19 @@ spec:
         {{- range $containerName, $containerValues := $containers }}
         {{- $configMap := $containerValues.envConfigMap }}
         {{- if and $configMap (not $statefulset.disableChecksumAnnotations) }}
-        checksum/envConfigMap: {{ print $configMap | sha256sum }}
+        checksum/envConfigMap-{{ $containerName }}: {{ print $configMap | sha256sum }}
         {{- end }}
         {{- $secret := $containerValues.envSecret }}
         {{- if and $secret (not $statefulset.disableChecksumAnnotations) }}
-        checksum/envSecret: {{ print $secret | sha256sum }}
+        checksum/envSecret-{{ $containerName }}: {{ print $secret | sha256sum }}
         {{- end }}
         {{- $configFiles := $containerValues.configFiles }}
         {{- if and $configFiles (not $statefulset.disableChecksumAnnotations) }}
-        checksum/configFiles: {{ print $configFiles | sha256sum }}
+        checksum/configFiles-{{ $containerName }}: {{ print $configFiles | sha256sum }}
         {{- end }}
         {{- $binaryFiles := $containerValues.binaryFiles }}
         {{- if and $binaryFiles (not $statefulset.disableChecksumAnnotations) }}
-        checksum/binaryFiles: {{ print $binaryFiles | sha256sum }}
+        checksum/binaryFiles-{{ $containerName }}: {{ print $binaryFiles | sha256sum }}
         {{- end }}
         {{- end }}
         {{- end }}