diff --git a/charts/mok/tests/__snapshot__/domains_test.yaml.snap b/charts/mok/tests/__snapshot__/domains_test.yaml.snap
index 9d7264b7ed8484632fae926bcc3c93f257efd0e0..bb1884ac8f26fb8623ebe94f4a39788941835e6a 100644
--- a/charts/mok/tests/__snapshot__/domains_test.yaml.snap
+++ b/charts/mok/tests/__snapshot__/domains_test.yaml.snap
@@ -8,7 +8,7 @@ keeps stays the same:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-dovecot-users
     stringData:
       passwd: |
@@ -23,7 +23,7 @@ keeps stays the same:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-postfix-maps
     stringData:
       aliases: |
diff --git a/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap b/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap
index c3b53ce133469640c0fe9c36b76077164a056bea..2147e19a5f3b5ed2b26ee6cdb778951eb34926fc 100644
--- a/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap
+++ b/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap
@@ -10,7 +10,7 @@ should match snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-dovecot
     spec:
       ports:
@@ -43,7 +43,7 @@ should match snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-dovecot-internal
     spec:
       ports:
@@ -67,7 +67,7 @@ should match snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-dovecot
     spec:
       replicas: 1
@@ -81,14 +81,14 @@ should match snapshot:
       template:
         metadata:
           annotations:
-            checksum/config: 1ccde744f84d15a511177495e8197c3e895b1077c3e180da583ea4d8a3202332
+            checksum/config: 66ea930a9b7e50528ddc0aa54786d07f78c7f56d1daea45b21d9eb94f8e5c4f2
           labels:
             app.kubernetes.io/component: dovecot
             app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/name: mok
         spec:
           containers:
-          - image: quay.io/shivering-isles/dovecot:0.1.0
+          - image: quay.io/shivering-isles/dovecot:4.5.6
             imagePullPolicy: IfNotPresent
             name: dovecot
             ports:
@@ -159,7 +159,7 @@ should match snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-dovecot-vmail
     spec:
       accessModes:
@@ -177,7 +177,7 @@ should match snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-dovecot-users
     stringData:
       passwd: ""
@@ -191,7 +191,7 @@ should match snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-postfix-maps
     stringData:
       aliases: ""
diff --git a/charts/mok/tests/__snapshot__/networkpolicies_test.yaml.snap b/charts/mok/tests/__snapshot__/networkpolicies_test.yaml.snap
index 872a2068400a040b6a5059121089de022cc16517..f0b0075c5974002754a6aeec6b770f9260d0a1f7 100644
--- a/charts/mok/tests/__snapshot__/networkpolicies_test.yaml.snap
+++ b/charts/mok/tests/__snapshot__/networkpolicies_test.yaml.snap
@@ -8,7 +8,7 @@ matches snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-dovecot
     spec:
       ingress:
@@ -53,7 +53,7 @@ matches snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-postfix
     spec:
       ingress:
diff --git a/charts/mok/tests/__snapshot__/postfix_test.yaml.snap b/charts/mok/tests/__snapshot__/postfix_test.yaml.snap
index 0472fa11813cd7f435a4b0ab4954fa1b34db9436..0a3b5cdefcce0a24c52d811d95cd323af7d947c6 100644
--- a/charts/mok/tests/__snapshot__/postfix_test.yaml.snap
+++ b/charts/mok/tests/__snapshot__/postfix_test.yaml.snap
@@ -10,7 +10,7 @@ should match snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-postfix
     spec:
       ports:
@@ -37,7 +37,7 @@ should match snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-postfix
     spec:
       replicas: 1
@@ -50,7 +50,7 @@ should match snapshot:
       template:
         metadata:
           annotations:
-            checksum/config: 1ccde744f84d15a511177495e8197c3e895b1077c3e180da583ea4d8a3202332
+            checksum/config: 66ea930a9b7e50528ddc0aa54786d07f78c7f56d1daea45b21d9eb94f8e5c4f2
           labels:
             app.kubernetes.io/component: postfix
             app.kubernetes.io/instance: RELEASE-NAME
@@ -60,7 +60,7 @@ should match snapshot:
           - env:
             - name: DOVECOT_SERVICE_NAME
               value: RELEASE-NAME-mok-dovecot-internal.NAMESPACE.svc.cluster.local
-            image: quay.io/shivering-isles/postfix:0.1.1
+            image: quay.io/shivering-isles/postfix:4.5.6
             imagePullPolicy: IfNotPresent
             lifecycle:
               preStop:
@@ -167,7 +167,7 @@ should match snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-dovecot-users
     stringData:
       passwd: ""
@@ -181,7 +181,7 @@ should match snapshot:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-postfix-maps
     stringData:
       aliases: ""
diff --git a/charts/mok/tests/__snapshot__/relay_test.yaml.snap b/charts/mok/tests/__snapshot__/relay_test.yaml.snap
index e4b2084c3d1f46c1a59232cb9869b4b8fa79932e..aed610e31b4d87ddfb0504d046baabd323208926 100644
--- a/charts/mok/tests/__snapshot__/relay_test.yaml.snap
+++ b/charts/mok/tests/__snapshot__/relay_test.yaml.snap
@@ -8,7 +8,7 @@ keeps stays the same:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-dovecot-users
     stringData:
       passwd: ""
@@ -22,7 +22,7 @@ keeps stays the same:
         app.kubernetes.io/instance: RELEASE-NAME
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: mok
-        helm.sh/chart: mok-0.2.0
+        helm.sh/chart: mok-1.2.3
       name: RELEASE-NAME-mok-postfix-maps
     stringData:
       aliases: ""
diff --git a/charts/mok/tests/domains_test.yaml b/charts/mok/tests/domains_test.yaml
index 43cff2e70341e7acad27c6e4aa166fb7030582f5..48467004e76c6c322f052725cd67ffb9b90fca1c 100644
--- a/charts/mok/tests/domains_test.yaml
+++ b/charts/mok/tests/domains_test.yaml
@@ -44,6 +44,8 @@ tests:
             john@example.com:{ARGON2ID}$argon2id$v=19$m=65536,t=3,p=1$FSJttpvCBJDcjH/mXjRNhA$ND42CDWAA6dOF2RgtzhYuYsS3Sjpab5p3pCWQHrB8Cg
         documentIndex: 0
   - it: keeps stays the same
+    chart:
+      version: 1.2.3
     set:
       domains:
         "example.com":
diff --git a/charts/mok/tests/dovecot_test.yaml b/charts/mok/tests/dovecot_test.yaml
index 92314baaf31e3b05f8ee01aefebe80c5269f183c..67282401ab5993d6974f7aae54272a86beffc6df 100644
--- a/charts/mok/tests/dovecot_test.yaml
+++ b/charts/mok/tests/dovecot_test.yaml
@@ -5,8 +5,12 @@ templates:
   - secret.yaml
 tests:
   - it: should match snapshot
+    chart:
+      version: 1.2.3
     set:
       dovecot:
+        image:
+          tag: "4.5.6"
         tls:
           secretName: example-tls
     asserts:
@@ -85,16 +89,20 @@ tests:
         documentIndex: 2
         template: dovecot.yaml
   - it: has config hash for auto-reload
+    chart:
+      version: 1.2.3
     set:
       dovecot:
         secretName: example-tls
     asserts:
       - equal:
           path: spec.template.metadata.annotations.[checksum/config]
-          value: 1ccde744f84d15a511177495e8197c3e895b1077c3e180da583ea4d8a3202332
+          value: 66ea930a9b7e50528ddc0aa54786d07f78c7f56d1daea45b21d9eb94f8e5c4f2
         documentIndex: 2
         template: dovecot.yaml
   - it: has a changing config hash for auto-reload
+    chart:
+      version: 1.2.3
     set:
       dovecot:
         secretName: example-tls
@@ -106,6 +114,6 @@ tests:
     asserts:
       - equal:
           path: spec.template.metadata.annotations.[checksum/config]
-          value: ac3f477cdba7cd408edee56403b1c480ab9765791edd3fdf9fe5f60cfe0b80e9
+          value: 9215abccdd6c1f21fd329db0133f6f8e892c50aab3dcde3259ea797e8ad2a959
         documentIndex: 2
         template: dovecot.yaml
diff --git a/charts/mok/tests/networkpolicies_test.yaml b/charts/mok/tests/networkpolicies_test.yaml
index 2f2aa564b2685663878fd800230384fb9167261c..1e16993c8fb357aff31269f7a7f6c98e08f21ea9 100644
--- a/charts/mok/tests/networkpolicies_test.yaml
+++ b/charts/mok/tests/networkpolicies_test.yaml
@@ -252,5 +252,7 @@ tests:
         documentIndex: 1
         template: networkpolicy.yaml
   - it: matches snapshot
+    chart:
+      version: 1.2.3
     asserts:
       - matchSnapshot: {}
diff --git a/charts/mok/tests/postfix_test.yaml b/charts/mok/tests/postfix_test.yaml
index b85c8d39d42fa0d8cfde55bb34da3d86cd5c54f1..851d32d1e232c591d19211f0d26e8d17ea8d2e28 100644
--- a/charts/mok/tests/postfix_test.yaml
+++ b/charts/mok/tests/postfix_test.yaml
@@ -4,8 +4,12 @@ templates:
   - secret.yaml
 tests:
   - it: should match snapshot
+    chart:
+      version: 1.2.3
     set:
       postfix:
+        image:
+          tag: 4.5.6
         tls:
           secretName: example-tls
     asserts:
@@ -71,16 +75,20 @@ tests:
         documentIndex: 1
         template: postfix.yaml
   - it: has config hash for auto-reload
+    chart:
+      version: 1.2.3
     set:
       dovecot:
         secretName: example-tls
     asserts:
       - equal:
           path: spec.template.metadata.annotations.[checksum/config]
-          value: 1ccde744f84d15a511177495e8197c3e895b1077c3e180da583ea4d8a3202332
+          value: 66ea930a9b7e50528ddc0aa54786d07f78c7f56d1daea45b21d9eb94f8e5c4f2
         documentIndex: 1
         template: postfix.yaml
   - it: has a changing config hash for auto-reload
+    chart:
+      version: 1.2.3
     set:
       dovecot:
         secretName: example-tls
@@ -92,6 +100,6 @@ tests:
     asserts:
       - equal:
           path: spec.template.metadata.annotations.[checksum/config]
-          value: ac3f477cdba7cd408edee56403b1c480ab9765791edd3fdf9fe5f60cfe0b80e9
+          value: 9215abccdd6c1f21fd329db0133f6f8e892c50aab3dcde3259ea797e8ad2a959
         documentIndex: 1
         template: postfix.yaml
diff --git a/charts/mok/tests/relay_test.yaml b/charts/mok/tests/relay_test.yaml
index c46334066c1706a19e5146a1ae63167adb7aee86..c8c03ceabb72d80bc1cf53102a8b1469131fbc84 100644
--- a/charts/mok/tests/relay_test.yaml
+++ b/charts/mok/tests/relay_test.yaml
@@ -36,6 +36,8 @@ tests:
             example.edu             none
         documentIndex: 1
   - it: keeps stays the same
+    chart:
+      version: 1.2.3
     set:
       relay:
         relayHosts: