diff --git a/data/dns/as4242423270.dn42 b/data/dns/as4242423270.dn42
index 701332aa6..360491ca4 100644
--- a/data/dns/as4242423270.dn42
+++ b/data/dns/as4242423270.dn42
@@ -2,5 +2,6 @@ domain:             as4242423270.dn42
 admin-c:            TAAVI-DN42
 tech-c:             TAAVI-DN42
 mnt-by:             TAAVI-MNT
-nserver:            ns01.taavi.dn42
+nserver:            ns-auth1.svc.taavi.dn42
+nserver:            ns-auth2.svc.taavi.dn42
 source:             DN42
diff --git a/data/dns/taavi.dn42 b/data/dns/taavi.dn42
index e780085db..6ef600d78 100644
--- a/data/dns/taavi.dn42
+++ b/data/dns/taavi.dn42
@@ -2,6 +2,8 @@ domain:             taavi.dn42
 admin-c:            TAAVI-DN42
 tech-c:             TAAVI-DN42
 mnt-by:             TAAVI-MNT
-nserver:            ns01.taavi.dn42 172.22.130.129
-nserver:            ns01.taavi.dn42 fd96:70f6:b174::1
+nserver:            ns-auth1.svc.taavi.dn42 172.22.130.153
+nserver:            ns-auth1.svc.taavi.dn42 fd96:70f6:b174:ac::53a1
+nserver:            ns-auth2.svc.taavi.dn42 172.22.131.140
+nserver:            ns-auth2.svc.taavi.dn42 fdf4:e251:75d9:fffe::53a2
 source:             DN42
diff --git a/data/inet6num/fd96:70f6:b174::_48 b/data/inet6num/fd96:70f6:b174::_48
index d6f2a9303..687c4f973 100644
--- a/data/inet6num/fd96:70f6:b174::_48
+++ b/data/inet6num/fd96:70f6:b174::_48
@@ -7,5 +7,6 @@ admin-c:            TAAVI-DN42
 tech-c:             TAAVI-DN42
 mnt-by:             TAAVI-MNT
 status:             ASSIGNED
-nserver:            ns01.taavi.dn42
+nserver:            ns-auth1.svc.taavi.dn42
+nserver:            ns-auth2.svc.taavi.dn42
 source:             DN42
diff --git a/data/inet6num/fdf4:e251:75d9::_48 b/data/inet6num/fdf4:e251:75d9::_48
index 770538632..30df57b24 100644
--- a/data/inet6num/fdf4:e251:75d9::_48
+++ b/data/inet6num/fdf4:e251:75d9::_48
@@ -7,5 +7,6 @@ admin-c:            TAAVI-DN42
 tech-c:             TAAVI-DN42
 mnt-by:             TAAVI-MNT
 status:             ASSIGNED
-nserver:            ns01.taavi.dn42
+nserver:            ns-auth1.svc.taavi.dn42
+nserver:            ns-auth2.svc.taavi.dn42
 source:             DN42
diff --git a/data/inetnum/172.22.130.128_27 b/data/inetnum/172.22.130.128_27
index 9fa308faf..09af3becf 100644
--- a/data/inetnum/172.22.130.128_27
+++ b/data/inetnum/172.22.130.128_27
@@ -7,5 +7,6 @@ admin-c:            TAAVI-DN42
 tech-c:             TAAVI-DN42
 mnt-by:             TAAVI-MNT
 status:             ASSIGNED
-nserver:            ns01.taavi.dn42
+nserver:            ns-auth1.svc.taavi.dn42
+nserver:            ns-auth2.svc.taavi.dn42
 source:             DN42
diff --git a/data/inetnum/172.22.131.128_28 b/data/inetnum/172.22.131.128_28
index aa93eb397..db0d70c60 100644
--- a/data/inetnum/172.22.131.128_28
+++ b/data/inetnum/172.22.131.128_28
@@ -7,5 +7,6 @@ admin-c:            TAAVI-DN42
 tech-c:             TAAVI-DN42
 mnt-by:             TAAVI-MNT
 status:             ASSIGNED
-nserver:            ns01.taavi.dn42
+nserver:            ns-auth1.svc.taavi.dn42
+nserver:            ns-auth2.svc.taavi.dn42
 source:             DN42