diff --git a/manifests/snappymail/values.yaml b/manifests/snappymail/values.yaml
index de5783e..f3cbe3a 100644
--- a/manifests/snappymail/values.yaml
+++ b/manifests/snappymail/values.yaml
@@ -7,7 +7,7 @@ namespace: mail
 ## Image configuration
 image:
   repository: djmaze/snappymail
-  tag: "2.39"
+  tag: latest
   pullPolicy: IfNotPresent
 
 ## Persistence - using NFS storage
diff --git a/manifests/stalwart/values.yaml b/manifests/stalwart/values.yaml
index 733afd2..3cb659b 100644
--- a/manifests/stalwart/values.yaml
+++ b/manifests/stalwart/values.yaml
@@ -7,7 +7,7 @@ namespace: mail
 ## Image configuration
 image:
   repository: stalwartlabs/mail-server
-  tag: v0.10.8
+  tag: latest
   pullPolicy: IfNotPresent
 
 ## Persistence - using NFS storage