diff --git a/charts/mok/Chart.yaml b/charts/mok/Chart.yaml
index 102bc05abb0ac44f3492daf47492457e4e94e56b..a50ec04eda1d345176a104889284811b1cce8115 100644
--- a/charts/mok/Chart.yaml
+++ b/charts/mok/Chart.yaml
@@ -3,7 +3,7 @@ name: mok
 description: |
   Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
 type: application
-version: 0.9.6
+version: 0.9.7
 sources:
   - https://de.postfix.org/ftpmirror/index.html
   - https://github.com/dovecot/core
diff --git a/charts/mok/README.md b/charts/mok/README.md
index c9a7bae7809b77dd3ced0b4f44eac12b795882ba..35d03532fbd7873d0bfba7c531f10c9739403596 100644
--- a/charts/mok/README.md
+++ b/charts/mok/README.md
@@ -1,6 +1,6 @@
 # mok
 
-![Version: 0.9.6](https://img.shields.io/badge/Version-0.9.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.9.7](https://img.shields.io/badge/Version-0.9.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
 
@@ -23,7 +23,7 @@ Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that run
 | dovecot.affinity | object | `{}` |  |
 | dovecot.image.pullPolicy | string | `"IfNotPresent"` |  |
 | dovecot.image.repository | string | `"quay.io/shivering-isles/dovecot"` | dovecot container image |
-| dovecot.image.tag | string | `"0.3.1"` | Overrides the image tag whose default is "latest" |
+| dovecot.image.tag | string | `"0.3.2"` | Overrides the image tag whose default is "latest" |
 | dovecot.imagePullSecrets | list | `[]` | pull secret to access the afore defined image |
 | dovecot.nodeSelector | object | `{}` |  |
 | dovecot.podAnnotations | object | `{}` |  |
@@ -56,7 +56,7 @@ Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that run
 | postfix.hostname | string | `nil` | explicitly set postfix hostname |
 | postfix.image.pullPolicy | string | `"IfNotPresent"` |  |
 | postfix.image.repository | string | `"quay.io/shivering-isles/postfix"` | postfix container image |
-| postfix.image.tag | string | `"0.5.1"` | Overrides the image tag whose default is "latest" |
+| postfix.image.tag | string | `"0.5.2"` | Overrides the image tag whose default is "latest" |
 | postfix.imagePullSecrets | list | `[]` |  |
 | postfix.nodeSelector | object | `{}` |  |
 | postfix.podAnnotations | object | `{}` |  |
diff --git a/charts/mok/values.yaml b/charts/mok/values.yaml
index 5bf2be5c579713703a6f22e4e0a3a865f276d046..0c20e064c4fcf92ff5a7a4eaeecc575ada927845 100644
--- a/charts/mok/values.yaml
+++ b/charts/mok/values.yaml
@@ -46,7 +46,7 @@ postfix:
     repository: quay.io/shivering-isles/postfix
     pullPolicy: IfNotPresent
     # -- Overrides the image tag whose default is "latest"
-    tag: "0.5.1"
+    tag: "0.5.2"
 
   imagePullSecrets: []
 
@@ -126,7 +126,7 @@ dovecot:
     repository: quay.io/shivering-isles/dovecot
     pullPolicy: IfNotPresent
     # -- Overrides the image tag whose default is "latest"
-    tag: "0.3.1"
+    tag: "0.3.2"
 
   # -- pull secret to access the afore defined image
   imagePullSecrets: []
diff --git a/images/dovecot/.release b/images/dovecot/.release
index 20765e296bf1bebe89c694a3b55ed854c79ec672..c0fd37de2f48075dc70ff839e1b30c4e0a832f4f 100644
--- a/images/dovecot/.release
+++ b/images/dovecot/.release
@@ -1 +1 @@
-release=0.3.1
+release=0.3.2
diff --git a/images/dovecot/Earthfile b/images/dovecot/Earthfile
index de17c28664bdcf55a6648dd7339eb32f0bcf4cd4..afb3bf13abb9ea9c6fc3d94198ab95643347ae1c 100644
--- a/images/dovecot/Earthfile
+++ b/images/dovecot/Earthfile
@@ -1,7 +1,5 @@
 VERSION 0.7
 
-
-
 container:
     FROM ../mirror+alpine
     ARG registry=quay.io/shivering-isles/dovecot
@@ -52,6 +50,7 @@ container:
     EXPOSE 24 110 143 993 995 4190 12345
 
     ENTRYPOINT ["/usr/sbin/dovecot", "-F"]
+    DO ../.utils/+LABEL --image=dovecot --version=main
     IF [ $latest = "true" ]
         SAVE IMAGE --push ${registry}:latest
     ELSE
diff --git a/images/postfix/.release b/images/postfix/.release
index 81392602ca60700756708cce8a5c159c91423b4d..70915b5acdce4da97b688b10608bfd1b6f31cda8 100644
--- a/images/postfix/.release
+++ b/images/postfix/.release
@@ -1 +1 @@
-release=0.5.1
+release=0.5.2
diff --git a/images/postfix/Earthfile b/images/postfix/Earthfile
index 6462b303d2838aecba6daf55cb35b29b0137f482..56e150739dc853b89114826f53051e936a8a0968 100644
--- a/images/postfix/Earthfile
+++ b/images/postfix/Earthfile
@@ -38,6 +38,7 @@ container:
     EXPOSE 25 465 587 10025
 
     ENTRYPOINT [ "sh" , "/usr/local/libexec/start.sh" ]
+    DO ../.utils/+LABEL --image=postfix --version=main
     IF [ $latest = "true" ]
         SAVE IMAGE --push ${registry}:latest
     ELSE