diff --git a/bundles/rspamd/files/local.d/dmarc.conf b/bundles/rspamd/files/local.d/dmarc.conf
index ac1aa57..318bef3 100644
--- a/bundles/rspamd/files/local.d/dmarc.conf
+++ b/bundles/rspamd/files/local.d/dmarc.conf
@@ -1,10 +1,9 @@
 reporting {
-    # Required attributes
-    enabled = true; # Enable reports in general
-    email = 'dmarc@${node.metadata.get('hostname')}'; # Source of DMARC reports
-    domain = '${node.metadata.get('hostname')}'; # Domain to serve
-    org_name = 'kunbox.net'; # Organisation
-    smtp = '127.0.0.1'; # SMTP server IP
-    smtp_port = 25; # SMTP server port
-    from_name = 'rspamd @ ${node.metadata.get('hostname')}'; # SMTP FROM
+    enabled = true;
+    email = 'dmarc+${node.name.replace('.', '-')}@kunbox.net';
+    domain = '${node.metadata.get('hostname')}';
+    org_name = 'kunbox.net';
+    smtp = '127.0.0.1';
+    smtp_port = 25;
+    from_name = 'rspamd @ ${node.metadata.get('hostname')}';
 }