diff --git a/data/dns/tbspace.dn42 b/data/dns/tbspace.dn42
index 11ade2605..d27680188 100644
--- a/data/dns/tbspace.dn42
+++ b/data/dns/tbspace.dn42
@@ -3,5 +3,6 @@ descr:              main domain
 admin-c:            TBSPACE-DN42
 tech-c:             TBSPACE-DN42
 mnt-by:             TBSPACE-MNT
-nserver:            ns1.loaderror.dn42
+nserver:            ns1.tbspace.de
+nserver:            ns2.tbspace.de
 source:             DN42
diff --git a/data/inet6num/fda0:23:748b::_48 b/data/inet6num/fda0:23:748b::_48
index d525169f6..1ac9ebe55 100644
--- a/data/inet6num/fda0:23:748b::_48
+++ b/data/inet6num/fda0:23:748b::_48
@@ -5,7 +5,8 @@ country:            DE
 admin-c:            TBSPACE-DN42
 tech-c:             TBSPACE-DN42
 mnt-by:             TBSPACE-MNT
-nserver:            ns1.loaderror.dn42
+nserver:            ns1.tbspace.de
+nserver:            ns2.tbspace.de
 status:             ASSIGNED
 cidr:               fda0:23:748b::/48
 source:             DN42
diff --git a/data/inetnum/172.23.235.0_24 b/data/inetnum/172.23.235.0_24
index 35349ed5b..4351d29b1 100644
--- a/data/inetnum/172.23.235.0_24
+++ b/data/inetnum/172.23.235.0_24
@@ -1,7 +1,8 @@
 inetnum:            172.23.235.0 - 172.23.235.255
 netname:            TBSPACE-DE1
 descr:              TBSPACE VPS
-nserver:            ns1.loaderror.dn42
+nserver:            ns1.tbspace.de
+nserver:            ns2.tbspace.de
 country:            DE
 admin-c:            TBSPACE-DN42
 tech-c:             TBSPACE-DN42
diff --git a/data/inetnum/172.23.236.0_25 b/data/inetnum/172.23.236.0_25
index f2851fb11..fd483013f 100644
--- a/data/inetnum/172.23.236.0_25
+++ b/data/inetnum/172.23.236.0_25
@@ -1,7 +1,8 @@
 inetnum:            172.23.236.0 - 172.23.236.127
 netname:            TBSPACE-TRANSFERNET
 descr:              TBSPACE TRANSFERNET
-nserver:            ns1.loaderror.dn42
+nserver:            ns1.tbspace.de
+nserver:            ns2.tbspace.de
 country:            DE
 admin-c:            TBSPACE-DN42
 tech-c:             TBSPACE-DN42