diff --git a/inventory/ghp/sample/group_vars/all/versions.yaml b/inventory/ghp/sample/group_vars/all/versions.yaml
index 6ed45f5..a2932ac 100644
--- a/inventory/ghp/sample/group_vars/all/versions.yaml
+++ b/inventory/ghp/sample/group_vars/all/versions.yaml
@@ -51,10 +51,10 @@ mastodon_version: 0.3.0
 nextcloud_version: 3.1.1
 
 # Email
-dovecot_version: 0.1.3
-postfix_version: 0.1.2
+dovecot_version: 0.1.4
+postfix_version: 0.1.3
 roundcube_version: 0.3.0
-rspamd_version: 0.2.0
+rspamd_version: 0.4.2
 
 # Pypi server
 pypiserver_version: 2.5.0
diff --git a/roles/dovecot/defaults/main.yaml b/roles/dovecot/defaults/main.yaml
index b065e1b..278d550 100644
--- a/roles/dovecot/defaults/main.yaml
+++ b/roles/dovecot/defaults/main.yaml
@@ -4,15 +4,10 @@ dovecot_default_values:
   persistence:
     enabled: true
     existingClaim: mailboxes
-  
   tls:
     enabled: true
     existingSecret: "{{ mail_short_name | default('mail') }}.{{ domain }}-secret"
-  
   dovecot:
-    image:
-      repository: "{{ docker_registry }}/dovecot"
-      tag: 2.3.8
     configmaps:
       dovecot: 
         dovecot: |
@@ -194,7 +189,6 @@ dovecot_default_values:
           service managesieve {
             process_limit = 1024
           }
-  
   service:
     type: LoadBalancer
     loadBalancerIP: "{{ dovecot_loadbalancer_ip | default(omit) }}"
diff --git a/roles/postfix/defaults/main.yaml b/roles/postfix/defaults/main.yaml
index 7cf638e..defd36e 100644
--- a/roles/postfix/defaults/main.yaml
+++ b/roles/postfix/defaults/main.yaml
@@ -4,15 +4,10 @@ postfix_default_values:
   persistence:
     enabled: true
     existingClaim: mailboxes
-  
   tls:
     enabled: true
     existingSecret: "{{ mail_short_name | default('mail') }}.{{ domain }}-secret"
-  
   postfix:
-    image:
-      repository: "{{ docker_registry }}/postfix"
-      tag: 3.5.8
     configmaps:
       main: |
         #smtp_host_lookup = native
diff --git a/roles/rspamd/defaults/main.yaml b/roles/rspamd/defaults/main.yaml
index e86b74a..c6b6413 100644
--- a/roles/rspamd/defaults/main.yaml
+++ b/roles/rspamd/defaults/main.yaml
@@ -7,10 +7,7 @@ rspamd_default_values:
     existingClaim: mailboxes
   redis:
     enabled: true
-    usePassword: false
-    password: ""
-    cluster:
-      enabled: false
+    architecture: standalone
   rspamd:
     local.d:
       redis.conf: |