diff --git a/root/sis/expert-erp.asia.zone.in b/root/sis/expert-erp.asia.zone.in
index f606181..5c71b03 100644
--- a/root/sis/expert-erp.asia.zone.in
+++ b/root/sis/expert-erp.asia.zone.in
@@ -1,5 +1,5 @@
 @@ECN_NS_TEMP@@
-@@ECN_MX_TEMP@@
+@@SPAMEXPERTS_MX@@
 
 +@@DOMAIN@@:@@YODA0@@
 +yoda.@@DOMAIN@@:@@YODA0@@
diff --git a/root/sis/expert-erp.net.zone.in b/root/sis/expert-erp.net.zone.in
index f606181..5c71b03 100644
--- a/root/sis/expert-erp.net.zone.in
+++ b/root/sis/expert-erp.net.zone.in
@@ -1,5 +1,5 @@
 @@ECN_NS_TEMP@@
-@@ECN_MX_TEMP@@
+@@SPAMEXPERTS_MX@@
 
 +@@DOMAIN@@:@@YODA0@@
 +yoda.@@DOMAIN@@:@@YODA0@@
diff --git a/root/sis/expert-software.ro.zone.in b/root/sis/expert-software.ro.zone.in
index f606181..5c71b03 100644
--- a/root/sis/expert-software.ro.zone.in
+++ b/root/sis/expert-software.ro.zone.in
@@ -1,5 +1,5 @@
 @@ECN_NS_TEMP@@
-@@ECN_MX_TEMP@@
+@@SPAMEXPERTS_MX@@
 
 +@@DOMAIN@@:@@YODA0@@
 +yoda.@@DOMAIN@@:@@YODA0@@
diff --git a/root/sis/x5.ro.zone.in b/root/sis/x5.ro.zone.in
index f606181..5c71b03 100644
--- a/root/sis/x5.ro.zone.in
+++ b/root/sis/x5.ro.zone.in
@@ -1,5 +1,5 @@
 @@ECN_NS_TEMP@@
-@@ECN_MX_TEMP@@
+@@SPAMEXPERTS_MX@@
 
 +@@DOMAIN@@:@@YODA0@@
 +yoda.@@DOMAIN@@:@@YODA0@@
diff --git a/root/spamexperts_mx.in b/root/spamexperts_mx.in
index 4b3987c..f7b4ea0 100644
--- a/root/spamexperts_mx.in
+++ b/root/spamexperts_mx.in
@@ -1,6 +1,6 @@
 # MX@SPAMEXPERTS
 
-@@@DOMAIN@@@::mx.spamexperts.com:10:3600
-@@@DOMAIN@@@::fallbackmx.spamexperts.eu:20:3600
-@@@DOMAIN@@@::lastmx.spamexperts.net:30:3600
+@@@DOMAIN@@::mx.spamexperts.com:10:3600
+@@@DOMAIN@@::fallbackmx.spamexperts.eu:20:3600
+@@@DOMAIN@@::lastmx.spamexperts.net:30:3600
 
diff --git a/stage/expert-erp.asia.zone b/stage/expert-erp.asia.zone
index ed6fb99..5497bbc 100644
--- a/stage/expert-erp.asia.zone
+++ b/stage/expert-erp.asia.zone
@@ -9,14 +9,11 @@
 +ns2.expert-erp.asia:176.9.48.117
 +ns3.expert-erp.asia:82.77.61.226
 
-# MX@ECN
-@expert-erp.asia::mx.easy-cloud.net:1:86400
+# MX@SPAMEXPERTS
 
-# backward compatibility
-+mx.expert-erp.asia:88.198.198.174
-+mx2.expert-erp.asia:88.198.198.174
-+smtp.expert-erp.asia:88.198.198.174
-+imap.expert-erp.asia:88.198.198.174
+@expert-erp.asia::mx.spamexperts.com:10:3600
+@expert-erp.asia::fallbackmx.spamexperts.eu:20:3600
+@expert-erp.asia::lastmx.spamexperts.net:30:3600
 
 
 +expert-erp.asia:188.40.92.201
diff --git a/stage/expert-erp.net.zone b/stage/expert-erp.net.zone
index 628862c..58559e3 100644
--- a/stage/expert-erp.net.zone
+++ b/stage/expert-erp.net.zone
@@ -9,14 +9,11 @@
 +ns2.expert-erp.net:176.9.48.117
 +ns3.expert-erp.net:82.77.61.226
 
-# MX@ECN
-@expert-erp.net::mx.easy-cloud.net:1:86400
+# MX@SPAMEXPERTS
 
-# backward compatibility
-+mx.expert-erp.net:88.198.198.174
-+mx2.expert-erp.net:88.198.198.174
-+smtp.expert-erp.net:88.198.198.174
-+imap.expert-erp.net:88.198.198.174
+@expert-erp.net::mx.spamexperts.com:10:3600
+@expert-erp.net::fallbackmx.spamexperts.eu:20:3600
+@expert-erp.net::lastmx.spamexperts.net:30:3600
 
 
 +expert-erp.net:188.40.92.201
diff --git a/stage/expert-software.ro.zone b/stage/expert-software.ro.zone
index 887738e..a00e130 100644
--- a/stage/expert-software.ro.zone
+++ b/stage/expert-software.ro.zone
@@ -9,14 +9,11 @@
 +ns2.expert-software.ro:176.9.48.117
 +ns3.expert-software.ro:82.77.61.226
 
-# MX@ECN
-@expert-software.ro::mx.easy-cloud.net:1:86400
+# MX@SPAMEXPERTS
 
-# backward compatibility
-+mx.expert-software.ro:88.198.198.174
-+mx2.expert-software.ro:88.198.198.174
-+smtp.expert-software.ro:88.198.198.174
-+imap.expert-software.ro:88.198.198.174
+@expert-software.ro::mx.spamexperts.com:10:3600
+@expert-software.ro::fallbackmx.spamexperts.eu:20:3600
+@expert-software.ro::lastmx.spamexperts.net:30:3600
 
 
 +expert-software.ro:188.40.92.201
diff --git a/stage/x5.ro.zone b/stage/x5.ro.zone
index f732ec4..731e2d6 100644
--- a/stage/x5.ro.zone
+++ b/stage/x5.ro.zone
@@ -9,14 +9,11 @@
 +ns2.x5.ro:176.9.48.117
 +ns3.x5.ro:82.77.61.226
 
-# MX@ECN
-@x5.ro::mx.easy-cloud.net:1:86400
+# MX@SPAMEXPERTS
 
-# backward compatibility
-+mx.x5.ro:88.198.198.174
-+mx2.x5.ro:88.198.198.174
-+smtp.x5.ro:88.198.198.174
-+imap.x5.ro:88.198.198.174
+@x5.ro::mx.spamexperts.com:10:3600
+@x5.ro::fallbackmx.spamexperts.eu:20:3600
+@x5.ro::lastmx.spamexperts.net:30:3600
 
 
 +x5.ro:188.40.92.201