diff --git a/docs/getting-started.md b/docs/getting-started.md
index 10c007ff..13eea5a3 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -346,7 +346,9 @@ validation for incoming mails in place. Otherwise external senders could spoof i
 
 ```yaml
 smtp:
-  spamMilterHost: "rpamd.domain.internal"
+  spamMilter:
+    host: "rspamd.domain.internal"
+    port: "11332"
 ```
 
 ### TURN configuration
diff --git a/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl b/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
index 87f31eb5..64e2608a 100644
--- a/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
@@ -50,7 +50,7 @@ postfix:
   {{- if .Values.apps.dkimpy.enabled }}
   dkimpyHost: "opendesk-dkimpy-milter.{{ .Release.Namespace }}.svc.{{.Values.cluster.networking.domain }}:8892"
   {{- end }}
-  rspamdHost: {{ .Values.spamMilterHost | quote }}
+  rspamdHost: "{{ .Values.smtp.spamMilter.host }}:{{ .Values.smtp.spamMilter.port }}"
   minTLSVersion: "TLSv1.2"
   smtpdTLSMandatoryCiphers: "medium"
   {{- if .Values.smtp.host }}
diff --git a/helmfile/environments/default/smtp.yaml.gotmpl b/helmfile/environments/default/smtp.yaml.gotmpl
index 733f92cb..e48d7f99 100644
--- a/helmfile/environments/default/smtp.yaml.gotmpl
+++ b/helmfile/environments/default/smtp.yaml.gotmpl
@@ -7,7 +7,9 @@ smtp:
   username: ""
   password: {{ env "SMTP_PASSWORD" | quote }}
   localpartNoReply: "no-reply"
-  spamMilterHost: ""
+  spamMilter:
+    host: ""
+    port: ""
 
   # For the following settings to have effect `apps.dkimpy.enabled` must be `true`.
   dkim: