diff --git a/metadata/com.er.json b/metadata/com.er.json
index 2f1d97765..f13216acf 100644
--- a/metadata/com.er.json
+++ b/metadata/com.er.json
@@ -2,8 +2,6 @@
 	"domain": "com.er",
 	"nameServers": [
 		"er.cctld.authdns.ripe.net",
-		"ns0.punchdown.org",
-		"ns1.punchdown.net",
 		"sawanew.noc.net.er",
 		"zaranew.noc.net.er"
 	]
diff --git a/metadata/edu.er.json b/metadata/edu.er.json
index 4cafd3dd0..a3ddc7375 100644
--- a/metadata/edu.er.json
+++ b/metadata/edu.er.json
@@ -2,8 +2,6 @@
 	"domain": "edu.er",
 	"nameServers": [
 		"er.cctld.authdns.ripe.net",
-		"ns0.punchdown.org",
-		"ns1.punchdown.net",
 		"sawanew.noc.net.er",
 		"zaranew.noc.net.er"
 	],
diff --git a/metadata/edu.sb.json b/metadata/edu.sb.json
index 042870884..79485d8d1 100644
--- a/metadata/edu.sb.json
+++ b/metadata/edu.sb.json
@@ -1,9 +1,8 @@
 {
 	"domain": "edu.sb",
 	"nameServers": [
-		"a.sb.dyntld.net",
-		"b.sb.dyntld.net",
-		"ns.cocca.fr"
+		"ns.cocca.fr",
+		"pch.nic.sb"
 	],
 	"policies": [
 		{
diff --git a/metadata/gov.er.json b/metadata/gov.er.json
index 72b2d6fdd..2ff52b577 100644
--- a/metadata/gov.er.json
+++ b/metadata/gov.er.json
@@ -2,8 +2,6 @@
 	"domain": "gov.er",
 	"nameServers": [
 		"er.cctld.authdns.ripe.net",
-		"ns0.punchdown.org",
-		"ns1.punchdown.net",
 		"sawanew.noc.net.er",
 		"zaranew.noc.net.er"
 	],
diff --git a/metadata/net.cy.json b/metadata/net.cy.json
index f34fd46b2..6745563c6 100644
--- a/metadata/net.cy.json
+++ b/metadata/net.cy.json
@@ -7,8 +7,6 @@
 		"cynic6.dns.cy",
 		"estia.ics.forth.gr",
 		"ns02.savvis.net",
-		"ns1.ucy.ac.cy",
-		"ns2.ucy.ac.cy",
 		"ns4.apnic.net"
 	],
 	"policies": [
diff --git a/metadata/net.er.json b/metadata/net.er.json
index d013a3b13..95b7c796d 100644
--- a/metadata/net.er.json
+++ b/metadata/net.er.json
@@ -2,8 +2,6 @@
 	"domain": "net.er",
 	"nameServers": [
 		"er.cctld.authdns.ripe.net",
-		"ns0.punchdown.org",
-		"ns1.punchdown.net",
 		"sawanew.noc.net.er",
 		"zaranew.noc.net.er"
 	],
diff --git a/metadata/org.er.json b/metadata/org.er.json
index da239465c..0011535b9 100644
--- a/metadata/org.er.json
+++ b/metadata/org.er.json
@@ -2,8 +2,6 @@
 	"domain": "org.er",
 	"nameServers": [
 		"er.cctld.authdns.ripe.net",
-		"ns0.punchdown.org",
-		"ns1.punchdown.net",
 		"sawanew.noc.net.er",
 		"zaranew.noc.net.er"
 	],
diff --git a/zones.go b/zones.go
index 34edc1407..5b7ad012d 100644
--- a/zones.go
+++ b/zones.go
@@ -2408,7 +2408,7 @@ var y = [4936]Zone{
 	{"gov.cy", &z[354], x, s{"dns.cit.cornell.edu", "ns01.gov.cy", "ns02.gov.cy", "sns0.grnet.gr", "sns1.grnet.gr"}, n, n, e, e, e, 0x0, f},
 	{"ltd.cy", &z[354], x, s{"cy-ns.anycast.pch.net", "cynic.dns.cy", "cynic4.dns.cy", "cynic6.dns.cy", "estia.ics.forth.gr", "ns1.ucy.ac.cy", "ns2.ucy.ac.cy", "ns4.apnic.net"}, n, n, e, e, e, 0x0, f},
 	{"name.cy", &z[354], x, s{"cy-ns.anycast.pch.net", "cynic.dns.cy", "cynic4.dns.cy", "cynic6.dns.cy", "estia.ics.forth.gr", "ns1.ucy.ac.cy", "ns2.ucy.ac.cy", "ns4.apnic.net"}, n, n, e, e, e, 0x0, f},
-	{"net.cy", &z[354], x, s{"cy-ns.anycast.pch.net", "cynic.dns.cy", "cynic4.dns.cy", "cynic6.dns.cy", "estia.ics.forth.gr", "ns02.savvis.net", "ns1.ucy.ac.cy", "ns2.ucy.ac.cy", "ns4.apnic.net"}, n, n, e, e, e, 0x0, f},
+	{"net.cy", &z[354], x, s{"cy-ns.anycast.pch.net", "cynic.dns.cy", "cynic4.dns.cy", "cynic6.dns.cy", "estia.ics.forth.gr", "ns02.savvis.net", "ns4.apnic.net"}, n, n, e, e, e, 0x0, f},
 	{"org.cy", &z[354], x, s{"cy-ns.anycast.pch.net", "cynic.dns.cy", "cynic4.dns.cy", "cynic6.dns.cy", "estia.ics.forth.gr", "ns02.savvis.net", "ns4.apnic.net"}, n, n, e, e, e, 0x0, f},
 	{"parliament.cy", &z[354], x, s{"ns01.gov.cy", "ns02.gov.cy"}, n, n, e, e, e, 0x0, f},
 	{"press.cy", &z[354], x, s{"cy-ns.anycast.pch.net", "cynic.dns.cy", "cynic4.dns.cy", "cynic6.dns.cy", "estia.ics.forth.gr", "ns1.ucy.ac.cy", "ns2.ucy.ac.cy", "ns4.apnic.net"}, n, n, e, e, e, 0x0, f},
@@ -2482,13 +2482,13 @@ var y = [4936]Zone{
 	{"sci.eg", &z[435], x, s{"frcu.eun.eg", "ns.idsc.gov.eg", "rip.psg.com"}, n, n, e, e, e, 0x0, f},
 	{"sport.eg", &z[435], x, s{"frcu.eun.eg", "ns.idsc.gov.eg", "rip.psg.com"}, n, n, e, e, e, 0x0, t},
 	{"tv.eg", &z[435], x, s{"frcu.eun.eg", "ns.idsc.gov.eg", "rip.psg.com"}, n, n, e, e, e, 0x0, f},
-	{"com.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "ns0.punchdown.org", "ns1.punchdown.net", "sawanew.noc.net.er", "zaranew.noc.net.er"}, n, n, e, e, e, 0x0, t},
-	{"edu.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "ns0.punchdown.org", "ns1.punchdown.net", "sawanew.noc.net.er", "zaranew.noc.net.er"}, n, n, e, e, e, 0x0, f},
-	{"gov.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "ns0.punchdown.org", "ns1.punchdown.net", "sawanew.noc.net.er", "zaranew.noc.net.er"}, n, n, e, e, e, 0x0, f},
+	{"com.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "sawanew.noc.net.er", "zaranew.noc.net.er"}, n, n, e, e, e, 0x0, t},
+	{"edu.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "sawanew.noc.net.er", "zaranew.noc.net.er"}, n, n, e, e, e, 0x0, f},
+	{"gov.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "sawanew.noc.net.er", "zaranew.noc.net.er"}, n, n, e, e, e, 0x0, f},
 	{"ind.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "ns0.punchdown.org", "ns1.punchdown.net", "sawanew.noc.net.er", "sawaold.noc.net.er", "zaranew.noc.net.er", "zaraold.noc.net.er"}, n, n, e, e, e, 0x0, f},
 	{"mil.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "ns0.punchdown.org", "ns1.punchdown.net", "sawanew.noc.net.er", "sawaold.noc.net.er", "zaranew.noc.net.er", "zaraold.noc.net.er"}, n, n, e, e, e, 0x0, f},
-	{"net.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "ns0.punchdown.org", "ns1.punchdown.net", "sawanew.noc.net.er", "zaranew.noc.net.er"}, n, n, e, e, e, 0x0, f},
-	{"org.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "ns0.punchdown.org", "ns1.punchdown.net", "sawanew.noc.net.er", "zaranew.noc.net.er"}, n, n, e, e, e, 0x0, f},
+	{"net.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "sawanew.noc.net.er", "zaranew.noc.net.er"}, n, n, e, e, e, 0x0, f},
+	{"org.er", &z[446], x, s{"er.cctld.authdns.ripe.net", "sawanew.noc.net.er", "zaranew.noc.net.er"}, n, n, e, e, e, 0x0, f},
 	{"com.es", &z[449], x, s{"fnicdos.rediris.es", "g.nic.es", "h.nic.es", "n3ns.nic.es", "ns3.nic.mx", "sns-pb.isc.org"}, n, n, e, e, e, 0x0, f},
 	{"edu.es", &z[449], x, s{"fnicdos.rediris.es", "g.nic.es", "h.nic.es", "n3ns.nic.es", "ns3.nic.mx", "sns-pb.isc.org"}, n, n, e, e, e, 0x0, f},
 	{"gob.es", &z[449], x, s{"fnicdos.rediris.es", "g.nic.es", "h.nic.es", "n3ns.nic.es", "ns3.nic.mx", "sns-pb.isc.org"}, n, n, e, e, e, 0x0, f},
@@ -4302,7 +4302,7 @@ var y = [4936]Zone{
 	{"pub.sa", &z[1203], x, s{"i.nic.net.sa", "n.nic.net.sa", "ns1.nic.net.sa", "ns2.nic.net.sa", "p.nic.net.sa", "s.nic.net.sa", "s2.nic.net.sa"}, n, n, e, e, e, 0x0, f},
 	{"sch.sa", &z[1203], x, s{"i.nic.net.sa", "n.nic.net.sa", "ns1.nic.net.sa", "ns2.nic.net.sa", "p.nic.net.sa", "s.nic.net.sa", "s2.nic.net.sa"}, n, n, e, e, e, 0x0, f},
 	{"com.sb", &z[1223], x, s{"ns.cocca.fr", "pch.nic.sb"}, n, n, e, e, e, 0x0, f},
-	{"edu.sb", &z[1223], x, s{"a.sb.dyntld.net", "b.sb.dyntld.net", "ns.cocca.fr"}, n, n, e, e, e, 0x0, f},
+	{"edu.sb", &z[1223], x, s{"ns.cocca.fr", "pch.nic.sb"}, n, n, e, e, e, 0x0, f},
 	{"gov.sb", &z[1223], x, s{"ns.cocca.fr", "pch.nic.sb"}, n, n, e, e, e, 0x0, f},
 	{"net.sb", &z[1223], x, s{"ns.cocca.fr", "pch.nic.sb"}, n, n, e, e, e, 0x0, f},
 	{"org.sb", &z[1223], x, s{"ns.cocca.fr", "pch.nic.sb"}, n, n, e, e, e, 0x0, f},