diff --git a/roles/nsd/templates/zones/libertus.eu.zone.j2 b/roles/nsd/templates/zones/libertus.eu.zone.j2
index 9441749..5f91cef 100644
--- a/roles/nsd/templates/zones/libertus.eu.zone.j2
+++ b/roles/nsd/templates/zones/libertus.eu.zone.j2
@@ -14,10 +14,10 @@ $TTL 86400
 $ORIGIN {{ item.name }}.
         IN CAA     0 issue "letsencrypt.org"
         IN MX     1 mail.dmz.mateu.be.
-    3600 IN TXT     "v=spf1 mx a:ks3370405.kimsufi.com -all"
-    3600 IN TXT     "spf2.0/mfrom mx a:ks3370405.kimsufi.com -all"
         IN A 82.66.135.228
         IN AAAA 2a01:e0a:9bd:2811::10
+    3600 IN TXT     "v=spf1 mx a:ks3370405.kimsufi.com -all"
+    3600 IN TXT     "spf2.0/mfrom mx a:ks3370405.kimsufi.com -all"
 _dmarc        3600 IN TXT     "v=DMARC1; p=reject; rua=mailto:postmaster@mateu.be; adkim=s; aspf=s"
 dkim._domainkey        3600 IN TXT     "v=DKIM1; k=rsa; t=s; s=email; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCv3kGIw5015Q35LLbkGwaBE+wC0PseodezDdkoGwzRsazEWINv1bg0mCIjtDbXLpv5VgRSynRyB+764i15DoFJp6mabcHlXxQVBWMClAtCJ9+Fn6SEwQjFbQeuFVQKH3xMwIq0S+ggP7qhFTaiLBn909Fi8oEMXGvqbBSlvoaeJwIDAQAB"
 _jabber._tcp        IN SRV     0 0 5269 jabber.dmz.mateu.be.
diff --git a/roles/nsd/templates/zones/nintendojo.fr.zone.j2 b/roles/nsd/templates/zones/nintendojo.fr.zone.j2
index 9cb896c..b0898d1 100644
--- a/roles/nsd/templates/zones/nintendojo.fr.zone.j2
+++ b/roles/nsd/templates/zones/nintendojo.fr.zone.j2
@@ -13,9 +13,9 @@ $TTL 86400
 
 $ORIGIN {{ item.name }}.
         IN CAA     0 issue "letsencrypt.org"
+        IN MX     1 mail.dmz.mateu.be.
         IN A     82.66.135.228
         IN AAAA     2a01:e0a:9bd:2811::6
-        IN MX     1 mail.dmz.mateu.be.
     3600 IN TXT     "v=spf1 mx a:ks3370405.kimsufi.com -all"
     3600 IN TXT     "spf2.0/mfrom mx a:ks3370405.kimsufi.com -all"
     3600 IN TXT     "google-site-verification=rIe1fnrQnv-E1H8qsMtEIhM4XYUqCELshWH9pHkwPBI"
diff --git a/roles/nsd/templates/zones/pipoworld.fr.zone.j2 b/roles/nsd/templates/zones/pipoworld.fr.zone.j2
deleted file mode 100644
index 74d5ce8..0000000
--- a/roles/nsd/templates/zones/pipoworld.fr.zone.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-$TTL 86400
-@		IN SOA {{ groups['master_nsdservers'] | first }}. tech.ovh.net. (
-				{{ dns_serial }}; timestamp serial number
-				28800; Refresh
-				7200; Retry
-				864000; Expire
-				86400; Min TTL
-			)
-
-{% for server in groups['nsdservers'] %}
-		IN NS	{{ server }}.
-{% endfor %}
-
-$ORIGIN {{ item.name }}.
-        IN CAA     0 issue "letsencrypt.org"
-        IN MX     1 mail.dmz.mateu.be.
-    3600 IN TXT     "spf2.0/mfrom mx a:ks3370405.kimsufi.com  -all"
-    3600 IN TXT     "v=spf1 mx a:ks3370405.kimsufi.com -all"
-_dmarc        3600 IN TXT     "v=DMARC1; p=reject; rua=mailto:postmaster@mateu.be; adkim=s; aspf=s"
-dkim._domainkey        3600 IN TXT     "v=DKIM1; k=rsa; t=s; s=email; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCv3kGIw5015Q35LLbkGwaBE+wC0PseodezDdkoGwzRsazEWINv1bg0mCIjtDbXLpv5VgRSynRyB+764i15DoFJp6mabcHlXxQVBWMClAtCJ9+Fn6SEwQjFbQeuFVQKH3xMwIq0S+ggP7qhFTaiLBn909Fi8oEMXGvqbBSlvoaeJwIDAQAB"
-{{ web_hostname_block }}