diff --git a/el9/templates/mail-configmap.yaml b/el9/templates/mail-configmap.yaml
index 6c614bc7ab4b23da2288c6aa1b7a7b074f3a9a25..24684c0fe5159abbeb1583f08259f5dfb29afbaf 100644
--- a/el9/templates/mail-configmap.yaml
+++ b/el9/templates/mail-configmap.yaml
@@ -71,11 +71,13 @@ data:
     ignore received in-reply-to message-id references
     ignore mime-version content-transfer-encoding
 
-    # Only include selected header fields when forwarding messages.
-    fwdretain subject date from to
-
     # For Linux and BSD, this should be set.
     set bsdcompat
 
     # CERN-specific configuration
-    set smtp=cernmx.cern.ch
+    set v15-compat=yes
+    set mta=smtp://cernmx.cern.ch:25 smtp-use-starttls smtp-auth=none
+    # By default sender (if not specified when sending mail) looks like <apache@webeos-project-i01-el9-78c9646546-shqmf> and this is considered spoofing by mail servers.
+    # Mail team tells us to use an address @cern.ch, it does not have to actually exist.
+    # Generic <no-reply@cern.ch> is discouraged as all mails from that address count against a single per-sender limit.
+    set from="WebEOS web sites <webeos-no-reply@cern.ch>"