diff --git a/charts/stalwart/values.yaml b/charts/stalwart/values.yaml
index 117fbdd..bef4062 100644
--- a/charts/stalwart/values.yaml
+++ b/charts/stalwart/values.yaml
@@ -4,8 +4,8 @@
 ## Image configuration
 image:
   repository: stalwartlabs/mail-server
-  tag: latest
-  pullPolicy: Always
+  tag: v0.11.8
+  pullPolicy: IfNotPresent
 
 ## Namespace
 namespace: mail-services
diff --git a/manifests/stalwart/values.yaml b/manifests/stalwart/values.yaml
index 4a24d55..7c99402 100644
--- a/manifests/stalwart/values.yaml
+++ b/manifests/stalwart/values.yaml
@@ -7,8 +7,8 @@ namespace: mail-services
 ## Image configuration
 image:
   repository: stalwartlabs/mail-server
-  tag: latest
-  pullPolicy: Always
+  tag: v0.11.8
+  pullPolicy: IfNotPresent
 
 ## Persistence - using NFS storage
 persistence: