diff --git a/root/amery/opensde.net.zone.in b/root/amery/opensde.net.zone.in
index 87fe8be..0d69714 100644
--- a/root/amery/opensde.net.zone.in
+++ b/root/amery/opensde.net.zone.in
@@ -17,10 +17,10 @@
 Cdl.@@DOMAIN@@:de1.@@DOMAIN@@
 
 +@@DOMAIN@@:@@YODA2@@:3600
-+mx.@@DOMAIN@@:@@YODA0@@:3600
-+mx2.@@DOMAIN@@:@@YODA0@@:3600
-+mail.@@DOMAIN@@:@@YODA0@@:3600
-+smtp.@@DOMAIN@@:@@YODA0@@:3600
++mx.@@DOMAIN@@:@@NEWYODA0@@
++mx2.@@DOMAIN@@:@@NEWYODA0@@
++mail.@@DOMAIN@@:@@NEWYODA0@@
++smtp.@@DOMAIN@@:@@NEWYODA0@@
 
 +morfoh.@@DOMAIN@@:@@ATLIEN@@:3600
 +chris.@@DOMAIN@@:@@ATLIEN@@:3600
diff --git a/root/amery/opensde.org.zone.in b/root/amery/opensde.org.zone.in
index cec7815..ae8723e 100644
--- a/root/amery/opensde.org.zone.in
+++ b/root/amery/opensde.org.zone.in
@@ -1,7 +1,7 @@
 @@ECN_NS@@
 @@@DOMAIN@@::mx.@@DOMAIN@@
 
-+mx.@@DOMAIN@@:@@YODA0@@:3600
++mx.@@DOMAIN@@:@@NEWYODA0@@
 
 +@@DOMAIN@@:@@YODA2@@:3600
 +www.@@DOMAIN@@:@@YODA2@@:3600
diff --git a/root/karasz/easy-cloud.net.zone.in b/root/karasz/easy-cloud.net.zone.in
index e7a72ac..8d3b17c 100644
--- a/root/karasz/easy-cloud.net.zone.in
+++ b/root/karasz/easy-cloud.net.zone.in
@@ -51,7 +51,7 @@ Cgoogle287cfa595e73f248.@@DOMAIN@@:google.com
 Cnoisy.@@DOMAIN@@:@@NOISY@@
 
 # services - mail
-+mx.@@DOMAIN@@:@@YODA0@@:3600
++mx.@@DOMAIN@@:@@NEWYODA0@@
 +smtp.@@DOMAIN@@:@@NEWYODA0@@
 +send.@@DOMAIN@@:@@NEWYODA0@@
 +imap.@@DOMAIN@@:@@NEWYODA0@@
diff --git a/root/karasz/expert-erp.net.zone.in b/root/karasz/expert-erp.net.zone.in
index fe32e66..fae7be5 100644
--- a/root/karasz/expert-erp.net.zone.in
+++ b/root/karasz/expert-erp.net.zone.in
@@ -5,13 +5,12 @@
 +yoda.@@DOMAIN@@:@@YODA0@@:3600
 +yaddle.@@DOMAIN@@:@@YADDLE0@@
 
-#@@DOMAIN@@:@@YODA0@@:3600
-+@@DOMAIN@@:@@YODA0@@:3600
-+mx.@@DOMAIN@@:@@YODA0@@:3600
-+mail.@@DOMAIN@@:@@YODA0@@:3600
++@@DOMAIN@@:@@NEWYODA0@@
++mx.@@DOMAIN@@:@@NEWYODA0@@
++mail.@@DOMAIN@@:@@NEWYODA0@@
 +manage.@@DOMAIN@@:@@YODA0@@:3600
-+ldap.@@DOMAIN@@:@@YODA0@@:3600
-+webmail.@@DOMAIN@@:@@YODA0@@:3600
++ldap.@@DOMAIN@@:@@NEWYODA0@@
++webmail.@@DOMAIN@@:@@NEWYODA0@@
 +license.@@DOMAIN@@:@@CHEWBACCA1@@
 
 +ro.@@DOMAIN@@:@@X5RO@@
diff --git a/root/morfoh/ixplanet.net.zone.in b/root/morfoh/ixplanet.net.zone.in
index 380e001..01db9be 100644
--- a/root/morfoh/ixplanet.net.zone.in
+++ b/root/morfoh/ixplanet.net.zone.in
@@ -4,7 +4,7 @@
 @@@DOMAIN@@::@@MX11UND1@@
 
 +atlien.@@DOMAIN@@:@@ATLIEN@@
-+waziweb.@@DOMAIN@@:@@YODA0@@
++waziweb.@@DOMAIN@@:@@NEWYODA0@@
 
 +@@DOMAIN@@:@@YODA2@@
 +www.@@DOMAIN@@:@@YODA2@@
diff --git a/root/morfoh/wazinet.com.zone.in b/root/morfoh/wazinet.com.zone.in
index 2ea7b9b..6b7c00d 100644
--- a/root/morfoh/wazinet.com.zone.in
+++ b/root/morfoh/wazinet.com.zone.in
@@ -1,8 +1,8 @@
 @@ECN_NS@@
-@@@DOMAIN@@::mail.@@DOMAIN@@:3600
+@@@DOMAIN@@::mx.@@DOMAIN@@
 
-+mx.@@DOMAIN@@:@@YODA0@@:3600
-+mail.@@DOMAIN@@:@@YODA0@@:3600
++mx.@@DOMAIN@@:@@NEWYODA0@@
++mail.@@DOMAIN@@:@@NEWYODA0@@
 
 +@@DOMAIN@@:@@YODA0@@
 +www.@@DOMAIN@@:@@YODA0@@
diff --git a/stage/easy-cloud.net.zone b/stage/easy-cloud.net.zone
index 1c927d0..56901e6 100644
--- a/stage/easy-cloud.net.zone
+++ b/stage/easy-cloud.net.zone
@@ -86,7 +86,7 @@ Cgoogle287cfa595e73f248.easy-cloud.net:google.com
 Cnoisy.easy-cloud.net:multimach.dyndns.org
 
 # services - mail
-+mx.easy-cloud.net:88.198.9.201:3600
++mx.easy-cloud.net:188.40.92.201
 +smtp.easy-cloud.net:188.40.92.201
 +send.easy-cloud.net:188.40.92.201
 +imap.easy-cloud.net:188.40.92.201
diff --git a/stage/expert-erp.asia.com.zone b/stage/expert-erp.asia.com.zone
index 2aefdd7..f0c90ef 100644
--- a/stage/expert-erp.asia.com.zone
+++ b/stage/expert-erp.asia.com.zone
@@ -23,13 +23,12 @@
 +yoda.expert-erp.asia.com:88.198.9.201:3600
 +yaddle.expert-erp.asia.com:78.46.77.108
 
-#expert-erp.asia.com:88.198.9.201:3600
-+expert-erp.asia.com:88.198.9.201:3600
-+mx.expert-erp.asia.com:88.198.9.201:3600
-+mail.expert-erp.asia.com:88.198.9.201:3600
++expert-erp.asia.com:188.40.92.201
++mx.expert-erp.asia.com:188.40.92.201
++mail.expert-erp.asia.com:188.40.92.201
 +manage.expert-erp.asia.com:88.198.9.201:3600
-+ldap.expert-erp.asia.com:88.198.9.201:3600
-+webmail.expert-erp.asia.com:88.198.9.201:3600
++ldap.expert-erp.asia.com:188.40.92.201
++webmail.expert-erp.asia.com:188.40.92.201
 +license.expert-erp.asia.com:188.40.102.238
 
 +ro.expert-erp.asia.com:82.77.60.55
diff --git a/stage/expert-erp.asia.zone b/stage/expert-erp.asia.zone
index bd42d54..c73871e 100644
--- a/stage/expert-erp.asia.zone
+++ b/stage/expert-erp.asia.zone
@@ -23,13 +23,12 @@
 +yoda.expert-erp.asia:88.198.9.201:3600
 +yaddle.expert-erp.asia:78.46.77.108
 
-#expert-erp.asia:88.198.9.201:3600
-+expert-erp.asia:88.198.9.201:3600
-+mx.expert-erp.asia:88.198.9.201:3600
-+mail.expert-erp.asia:88.198.9.201:3600
++expert-erp.asia:188.40.92.201
++mx.expert-erp.asia:188.40.92.201
++mail.expert-erp.asia:188.40.92.201
 +manage.expert-erp.asia:88.198.9.201:3600
-+ldap.expert-erp.asia:88.198.9.201:3600
-+webmail.expert-erp.asia:88.198.9.201:3600
++ldap.expert-erp.asia:188.40.92.201
++webmail.expert-erp.asia:188.40.92.201
 +license.expert-erp.asia:188.40.102.238
 
 +ro.expert-erp.asia:82.77.60.55
diff --git a/stage/expert-erp.net.zone b/stage/expert-erp.net.zone
index 84ca4b2..e8f33d5 100644
--- a/stage/expert-erp.net.zone
+++ b/stage/expert-erp.net.zone
@@ -23,13 +23,12 @@
 +yoda.expert-erp.net:88.198.9.201:3600
 +yaddle.expert-erp.net:78.46.77.108
 
-#expert-erp.net:88.198.9.201:3600
-+expert-erp.net:88.198.9.201:3600
-+mx.expert-erp.net:88.198.9.201:3600
-+mail.expert-erp.net:88.198.9.201:3600
++expert-erp.net:188.40.92.201
++mx.expert-erp.net:188.40.92.201
++mail.expert-erp.net:188.40.92.201
 +manage.expert-erp.net:88.198.9.201:3600
-+ldap.expert-erp.net:88.198.9.201:3600
-+webmail.expert-erp.net:88.198.9.201:3600
++ldap.expert-erp.net:188.40.92.201
++webmail.expert-erp.net:188.40.92.201
 +license.expert-erp.net:188.40.102.238
 
 +ro.expert-erp.net:82.77.60.55
diff --git a/stage/expert-software.ro.zone b/stage/expert-software.ro.zone
index 43260f6..ff7e286 100644
--- a/stage/expert-software.ro.zone
+++ b/stage/expert-software.ro.zone
@@ -23,13 +23,12 @@
 +yoda.expert-software.ro:88.198.9.201:3600
 +yaddle.expert-software.ro:78.46.77.108
 
-#expert-software.ro:88.198.9.201:3600
-+expert-software.ro:88.198.9.201:3600
-+mx.expert-software.ro:88.198.9.201:3600
-+mail.expert-software.ro:88.198.9.201:3600
++expert-software.ro:188.40.92.201
++mx.expert-software.ro:188.40.92.201
++mail.expert-software.ro:188.40.92.201
 +manage.expert-software.ro:88.198.9.201:3600
-+ldap.expert-software.ro:88.198.9.201:3600
-+webmail.expert-software.ro:88.198.9.201:3600
++ldap.expert-software.ro:188.40.92.201
++webmail.expert-software.ro:188.40.92.201
 +license.expert-software.ro:188.40.102.238
 
 +ro.expert-software.ro:82.77.60.55
diff --git a/stage/ixplanet.net.zone b/stage/ixplanet.net.zone
index f3ff003..3261715 100644
--- a/stage/ixplanet.net.zone
+++ b/stage/ixplanet.net.zone
@@ -8,7 +8,7 @@
 @ixplanet.net::mx01.kundenserver.de
 
 +atlien.ixplanet.net:213.239.204.184
-+waziweb.ixplanet.net:88.198.9.201
++waziweb.ixplanet.net:188.40.92.201
 
 +ixplanet.net:78.47.159.178
 +www.ixplanet.net:78.47.159.178
diff --git a/stage/opensde.net.zone b/stage/opensde.net.zone
index e659156..0b104a6 100644
--- a/stage/opensde.net.zone
+++ b/stage/opensde.net.zone
@@ -21,10 +21,10 @@
 Cdl.opensde.net:de1.opensde.net
 
 +opensde.net:78.47.159.178:3600
-+mx.opensde.net:88.198.9.201:3600
-+mx2.opensde.net:88.198.9.201:3600
-+mail.opensde.net:88.198.9.201:3600
-+smtp.opensde.net:88.198.9.201:3600
++mx.opensde.net:188.40.92.201
++mx2.opensde.net:188.40.92.201
++mail.opensde.net:188.40.92.201
++smtp.opensde.net:188.40.92.201
 
 +morfoh.opensde.net:213.239.204.184:3600
 +chris.opensde.net:213.239.204.184:3600
diff --git a/stage/opensde.org.zone b/stage/opensde.org.zone
index f3c5ec4..821bea5 100644
--- a/stage/opensde.org.zone
+++ b/stage/opensde.org.zone
@@ -5,7 +5,7 @@
 
 @opensde.org::mx.opensde.org
 
-+mx.opensde.org:88.198.9.201:3600
++mx.opensde.org:188.40.92.201
 
 +opensde.org:78.47.159.178:3600
 +www.opensde.org:78.47.159.178:3600
diff --git a/stage/waziairtime.com.zone b/stage/waziairtime.com.zone
index 3ad7878..a3bea2d 100644
--- a/stage/waziairtime.com.zone
+++ b/stage/waziairtime.com.zone
@@ -3,10 +3,10 @@
 &waziairtime.com::ns2.easy-cloud.net:86400
 &waziairtime.com::ns3.easy-cloud.net:86400
 
-@waziairtime.com::mail.waziairtime.com:3600
+@waziairtime.com::mx.waziairtime.com
 
-+mx.waziairtime.com:88.198.9.201:3600
-+mail.waziairtime.com:88.198.9.201:3600
++mx.waziairtime.com:188.40.92.201
++mail.waziairtime.com:188.40.92.201
 
 +waziairtime.com:88.198.9.201
 +www.waziairtime.com:88.198.9.201
diff --git a/stage/wazinet.com.zone b/stage/wazinet.com.zone
index 8a0b255..6ec52d8 100644
--- a/stage/wazinet.com.zone
+++ b/stage/wazinet.com.zone
@@ -3,10 +3,10 @@
 &wazinet.com::ns2.easy-cloud.net:86400
 &wazinet.com::ns3.easy-cloud.net:86400
 
-@wazinet.com::mail.wazinet.com:3600
+@wazinet.com::mx.wazinet.com
 
-+mx.wazinet.com:88.198.9.201:3600
-+mail.wazinet.com:88.198.9.201:3600
++mx.wazinet.com:188.40.92.201
++mail.wazinet.com:188.40.92.201
 
 +wazinet.com:88.198.9.201
 +www.wazinet.com:88.198.9.201
diff --git a/stage/wazipay.com.zone b/stage/wazipay.com.zone
index 3a7cc04..04bfa51 100644
--- a/stage/wazipay.com.zone
+++ b/stage/wazipay.com.zone
@@ -3,10 +3,10 @@
 &wazipay.com::ns2.easy-cloud.net:86400
 &wazipay.com::ns3.easy-cloud.net:86400
 
-@wazipay.com::mail.wazipay.com:3600
+@wazipay.com::mx.wazipay.com
 
-+mx.wazipay.com:88.198.9.201:3600
-+mail.wazipay.com:88.198.9.201:3600
++mx.wazipay.com:188.40.92.201
++mail.wazipay.com:188.40.92.201
 
 +wazipay.com:88.198.9.201
 +www.wazipay.com:88.198.9.201
diff --git a/stage/x5.ro.zone b/stage/x5.ro.zone
index 0eab2d4..07d9f72 100644
--- a/stage/x5.ro.zone
+++ b/stage/x5.ro.zone
@@ -23,13 +23,12 @@
 +yoda.x5.ro:88.198.9.201:3600
 +yaddle.x5.ro:78.46.77.108
 
-#x5.ro:88.198.9.201:3600
-+x5.ro:88.198.9.201:3600
-+mx.x5.ro:88.198.9.201:3600
-+mail.x5.ro:88.198.9.201:3600
++x5.ro:188.40.92.201
++mx.x5.ro:188.40.92.201
++mail.x5.ro:188.40.92.201
 +manage.x5.ro:88.198.9.201:3600
-+ldap.x5.ro:88.198.9.201:3600
-+webmail.x5.ro:88.198.9.201:3600
++ldap.x5.ro:188.40.92.201
++webmail.x5.ro:188.40.92.201
 +license.x5.ro:188.40.102.238
 
 +ro.x5.ro:82.77.60.55