diff --git a/mailu/templates/admin/deployment.yaml b/mailu/templates/admin/deployment.yaml
index 9c44c6bf..27a5ebff 100644
--- a/mailu/templates/admin/deployment.yaml
+++ b/mailu/templates/admin/deployment.yaml
@@ -28,9 +28,11 @@ spec:
         {{- if .Values.admin.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.admin.podLabels "context" $) | nindent 8 }}
         {{- end }}
-      {{- if .Values.admin.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.admin.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
+      annotations:
+        checksum/envvars-configmap.yaml: {{ include (print .Template.BasePath "/envvars-configmap.yaml") . | sha256sum }}
+        {{- if .Values.admin.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.admin.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "common.images.pullSecrets" (dict "images" (list .Values.admin.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.admin.hostAliases }}
diff --git a/mailu/templates/clamav/statefulset.yaml b/mailu/templates/clamav/statefulset.yaml
index 7e063f0f..58fdf2d7 100644
--- a/mailu/templates/clamav/statefulset.yaml
+++ b/mailu/templates/clamav/statefulset.yaml
@@ -30,9 +30,11 @@ spec:
         {{- if .Values.clamav.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.clamav.podLabels "context" $) | nindent 8 }}
         {{- end }}
-      {{- if .Values.clamav.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.clamav.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
+      annotations:
+        checksum/envvars-configmap.yaml: {{ include (print .Template.BasePath "/envvars-configmap.yaml") . | sha256sum }}
+        {{- if .Values.clamav.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.clamav.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "common.images.pullSecrets" (dict "images" (list .Values.clamav.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.clamav.hostAliases }}
diff --git a/mailu/templates/dovecot/deployment.yaml b/mailu/templates/dovecot/deployment.yaml
index 48479726..13cce57b 100644
--- a/mailu/templates/dovecot/deployment.yaml
+++ b/mailu/templates/dovecot/deployment.yaml
@@ -29,9 +29,11 @@ spec:
         {{- if .Values.dovecot.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.dovecot.podLabels "context" $) | nindent 8 }}
         {{- end }}
-      {{- if .Values.dovecot.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.dovecot.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
+      annotations:
+        checksum/envvars-configmap.yaml: {{ include (print .Template.BasePath "/envvars-configmap.yaml") . | sha256sum }}
+        {{- if .Values.dovecot.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.dovecot.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "common.images.pullSecrets" (dict "images" (list .Values.dovecot.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.dovecot.hostAliases }}
diff --git a/mailu/templates/fetchmail/deployment.yaml b/mailu/templates/fetchmail/deployment.yaml
index 0038b67c..03f7d0b9 100644
--- a/mailu/templates/fetchmail/deployment.yaml
+++ b/mailu/templates/fetchmail/deployment.yaml
@@ -29,9 +29,11 @@ spec:
         {{- if .Values.fetchmail.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.fetchmail.podLabels "context" $) | nindent 8 }}
         {{- end }}
-      {{- if .Values.fetchmail.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.fetchmail.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
+      annotations:
+        checksum/envvars-configmap.yaml: {{ include (print .Template.BasePath "/envvars-configmap.yaml") . | sha256sum }}
+        {{- if .Values.fetchmail.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.fetchmail.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "common.images.pullSecrets" (dict "images" (list .Values.fetchmail.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.fetchmail.hostAliases }}
diff --git a/mailu/templates/front/deployment.yaml b/mailu/templates/front/deployment.yaml
index 8d1b4444..92e774b4 100644
--- a/mailu/templates/front/deployment.yaml
+++ b/mailu/templates/front/deployment.yaml
@@ -33,9 +33,11 @@ spec:
         {{- if .Values.front.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.front.podLabels "context" $) | nindent 8 }}
         {{- end }}
-      {{- if .Values.front.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.front.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
+      annotations:
+        checksum/envvars-configmap.yaml: {{ include (print .Template.BasePath "/envvars-configmap.yaml") . | sha256sum }}
+        {{- if .Values.front.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.front.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "common.images.pullSecrets" (dict "images" (list .Values.front.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.front.hostAliases }}
diff --git a/mailu/templates/oletools/deployment.yaml b/mailu/templates/oletools/deployment.yaml
index 3eefb7ea..ab2ce278 100644
--- a/mailu/templates/oletools/deployment.yaml
+++ b/mailu/templates/oletools/deployment.yaml
@@ -29,9 +29,11 @@ spec:
         {{- if .Values.oletools.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.oletools.podLabels "context" $) | nindent 8 }}
         {{- end }}
-      {{- if .Values.oletools.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.oletools.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
+      annotations:
+        checksum/envvars-configmap.yaml: {{ include (print .Template.BasePath "/envvars-configmap.yaml") . | sha256sum }}
+        {{- if .Values.oletools.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.oletools.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "common.images.pullSecrets" (dict "images" (list .Values.oletools.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.oletools.hostAliases }}
diff --git a/mailu/templates/postfix/deployment.yaml b/mailu/templates/postfix/deployment.yaml
index 34f1b1cf..5cc71caf 100644
--- a/mailu/templates/postfix/deployment.yaml
+++ b/mailu/templates/postfix/deployment.yaml
@@ -28,9 +28,11 @@ spec:
         {{- if .Values.postfix.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.postfix.podLabels "context" $) | nindent 8 }}
         {{- end }}
-      {{- if .Values.postfix.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.postfix.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
+      annotations:
+        checksum/envvars-configmap.yaml: {{ include (print .Template.BasePath "/envvars-configmap.yaml") . | sha256sum }}
+        {{- if .Values.postfix.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.postfix.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "common.images.pullSecrets" (dict "images" (list .Values.postfix.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.postfix.hostAliases }}
diff --git a/mailu/templates/rspamd/deployment.yaml b/mailu/templates/rspamd/deployment.yaml
index 1c2ffaf9..6fb1c23f 100644
--- a/mailu/templates/rspamd/deployment.yaml
+++ b/mailu/templates/rspamd/deployment.yaml
@@ -29,9 +29,11 @@ spec:
         {{- if .Values.rspamd.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.rspamd.podLabels "context" $) | nindent 8 }}
         {{- end }}
-      {{- if .Values.rspamd.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.rspamd.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
+      annotations:
+        checksum/envvars-configmap.yaml: {{ include (print .Template.BasePath "/envvars-configmap.yaml") . | sha256sum }}
+        {{- if .Values.rspamd.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.rspamd.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "common.images.pullSecrets" (dict "images" (list .Values.rspamd.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.rspamd.hostAliases }}
diff --git a/mailu/templates/tika/deployment.yaml b/mailu/templates/tika/deployment.yaml
index 125d2e94..b85010d9 100644
--- a/mailu/templates/tika/deployment.yaml
+++ b/mailu/templates/tika/deployment.yaml
@@ -29,9 +29,11 @@ spec:
         {{- if .Values.tika.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.tika.podLabels "context" $) | nindent 8 }}
         {{- end }}
-      {{- if .Values.tika.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.tika.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
+      annotations:
+        checksum/envvars-configmap.yaml: {{ include (print .Template.BasePath "/envvars-configmap.yaml") . | sha256sum }}
+        {{- if .Values.tika.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.tika.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "common.images.pullSecrets" (dict "images" (list .Values.tika.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.tika.hostAliases }}
diff --git a/mailu/templates/webdav/deployment.yaml b/mailu/templates/webdav/deployment.yaml
index 2ab9cc67..4265a910 100644
--- a/mailu/templates/webdav/deployment.yaml
+++ b/mailu/templates/webdav/deployment.yaml
@@ -29,9 +29,11 @@ spec:
         {{- if .Values.webdav.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.webdav.podLabels "context" $) | nindent 8 }}
         {{- end }}
-      {{- if .Values.webdav.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.webdav.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
+      annotations:
+        checksum/envvars-configmap.yaml: {{ include (print .Template.BasePath "/envvars-configmap.yaml") . | sha256sum }}
+        {{- if .Values.webdav.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.webdav.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "common.images.pullSecrets" (dict "images" (list .Values.webdav.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.webdav.hostAliases }}
diff --git a/mailu/templates/webmail/deployment.yaml b/mailu/templates/webmail/deployment.yaml
index 1b02c26d..d1b45f92 100644
--- a/mailu/templates/webmail/deployment.yaml
+++ b/mailu/templates/webmail/deployment.yaml
@@ -29,9 +29,11 @@ spec:
         {{- if .Values.webmail.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.webmail.podLabels "context" $) | nindent 8 }}
         {{- end }}
-      {{- if .Values.webmail.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.webmail.podAnnotations "context" $) | nindent 8 }}
-      {{- end }}
+      annotations:
+        checksum/envvars-configmap.yaml: {{ include (print .Template.BasePath "/envvars-configmap.yaml") . | sha256sum }}
+        {{- if .Values.webmail.podAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.webmail.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "common.images.pullSecrets" (dict "images" (list .Values.webmail.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.webmail.hostAliases }}