diff --git a/zones/dns-witch.net.eu.org.zone b/zones/dns-witch.net.eu.org.zone
index fb1fb81..8737a63 100644
--- a/zones/dns-witch.net.eu.org.zone
+++ b/zones/dns-witch.net.eu.org.zone
@@ -1,33 +1,18 @@
-@                          10800   IN  SOA     ns1.dns-witch.net.eu.org. june.lacoloc.cafe.  (
+@                          10800   IN  SOA     ns1.dns-witch.net. tech.dns-witch.eu.org  (
                              2021022002   ;  Numero
                              28800        ;  Refresh
                              14400        ;  Retry
                              3600000      ;  Expire
                              86400 )      ;  Minimum
 
-@			IN 3600   NS  ns1.dns-witch.net.eu.org.
-@			IN 3600	  NS  ns2.dns-witch.net.eu.org.
+@			IN 3600   NS  ns1.dns-witch.net.
+@			IN 3600	  NS  ns2.dns-witch.net.
 
-; A Records
 @	IN 3600   A   128.140.50.172
-ns1	IN 3600   A   128.140.50.172
-ns2	IN 3600	  A   135.181.158.2
-
-; AAAA Records
 @	IN 3600	  AAAA	 2a01:4f8:c012:90c6::1
+
+ns1	IN 3600   A   128.140.50.172
 ns1	IN 3600	  AAAA	 2a01:4f8:c012:90c6::1
+
+ns2	IN 3600	  A   135.181.158.2
 ns2	IN 3600	  AAAA	 2a01:4f9:c010:ed58::1
-
-; SSH Fingerprints
-@	IN 3600   SSHFP 1 1 920b4c6503c2250c6d0a5870f914e1ab4f32818d
-@	IN 3600   SSHFP 1 2 31fc246dd56bb427f62c649148968966fb8751382ca751902023c6531982398d
-@	IN 3600   SSHFP 2 1 7ca3a21d2e716527a2dc122b87ef51a8087b1ba8
-@	IN 3600   SSHFP 2 2 44f6f1776c80c2f6a58a0ebc09ba8e4547526ac9b409551c3484f0e86add4deb
-@	IN 3600   SSHFP 3 1 14c2141c4bd9111d5ac03d35d45aa8b156edc178
-@	IN 3600   SSHFP 3 2 a8ff0f47c638923f898f291ab79822fae9be9f6d5ece7be3bed00541e50d2296
-@	IN 3600   SSHFP 4 1 dbe6aecb2fa82980adb1782ca050755644d7784e
-@	IN 3600   SSHFP 4 2 b67e17f38d9fe459a70055d3296e3fde0c92e7aed6a80146e2dbe22bf43abd69
-
-; Mails related records
-@       IN 3600   MX 10 mail.familier.net.eu.org.
-@       IN 3600   TXT "v=spf1 redirect=mail.familier.net.eu.org"
diff --git a/zones/dns-witch.net.zone b/zones/dns-witch.net.zone
index 31eded8..1edde89 100644
--- a/zones/dns-witch.net.zone
+++ b/zones/dns-witch.net.zone
@@ -17,11 +17,10 @@ ns1 IN 3600 AAAA 2a01:4f8:c012:90c6::1
 ns2 IN 3600 A 135.181.158.2
 ns2 IN 3600 AAAA 2a01:4f9:c010:ed58::1
 
-mail IN 3600 A 49.12.207.40
-mail IN 3600 AAAA 2a01:4f8:1c1e:6880::1
+tools IN 3600 A 49.12.207.40
+tools IN 3600 AAAA 2a01:4f8:1c1e:6880::1
 
-forge IN 3600 A 49.12.207.40
-forge IN 3600 AAAA 2a01:4f8:1c1e:6880::1
+forge IN 3600 CNAME tools
 
-@       IN 3600   MX 10 mail.dns-witch.net.
-@       IN 3600   TXT "v=spf1 redirect=mail.dns-witch.net"
+@ IN 3600 MX 10 tools.dns-witch.net.
+@ IN 3600 TXT "v=spf1 mx -all"