diff --git a/data/aut-num/AS4242421816 b/data/aut-num/AS4242421816
index 8489f63d8..56dcd0a88 100644
--- a/data/aut-num/AS4242421816
+++ b/data/aut-num/AS4242421816
@@ -1,6 +1,6 @@
 aut-num:            AS4242421816
 as-name:            POTAT0-AS
-descr:              Peer with me at dn42@potat0.cc
+descr:              Peer info: https://dn42.potat0.cc/
 admin-c:            POTAT0-DN42
 tech-c:             POTAT0-DN42
 mnt-by:             POTAT0-MNT
diff --git a/data/dns/potat0.dn42 b/data/dns/potat0.dn42
new file mode 100644
index 000000000..f32cd7548
--- /dev/null
+++ b/data/dns/potat0.dn42
@@ -0,0 +1,8 @@
+domain:             potat0.dn42
+admin-c:            POTAT0-DN42
+tech-c:             POTAT0-DN42
+mnt-by:             POTAT0-MNT
+nserver:            ns1.potat0.dn42 172.23.246.1
+nserver:            ns1.potat0.dn42 fd2c:1323:4042::1
+ds-rdata:           29004 13 2 28AFACEA2ACDA38340C7BFF8240FF971EC4803B0B766A1F33B1B4ACF 0EF56AED
+source:             DN42
diff --git a/data/inet6num/fd2c:1323:4042::_48 b/data/inet6num/fd2c:1323:4042::_48
index 2b3bce222..445c7d1fe 100644
--- a/data/inet6num/fd2c:1323:4042::_48
+++ b/data/inet6num/fd2c:1323:4042::_48
@@ -1,10 +1,13 @@
 inet6num:           fd2c:1323:4042:0000:0000:0000:0000:0000 - fd2c:1323:4042:ffff:ffff:ffff:ffff:ffff
 netname:            POTAT0-IPV6
-descr:              Peer with me at dn42@potat0.cc
+remarks:            Peer info: https://dn42.potat0.cc/
+descr:              Peer info: https://dn42.potat0.cc/
 country:            CN
 admin-c:            POTAT0-DN42
 tech-c:             POTAT0-DN42
 mnt-by:             POTAT0-MNT
+nserver:            ns1.potat0.dn42
 status:             ASSIGNED
 cidr:               fd2c:1323:4042::/48
+ds-rdata:           10391 13 2 EF1C0B2656C17FDC5B01680D121E61610C179FC18C9D38855973727D 6BA98C41
 source:             DN42
diff --git a/data/inetnum/172.23.246.0_26 b/data/inetnum/172.23.246.0_26
index ff8e46a97..c3314ff8f 100644
--- a/data/inetnum/172.23.246.0_26
+++ b/data/inetnum/172.23.246.0_26
@@ -1,10 +1,13 @@
 inetnum:            172.23.246.0 - 172.23.246.63
 netname:            POTAT0-IPV4
-descr:              Peer with me at dn42@potat0.cc
+remarks:            Peer info: https://dn42.potat0.cc/
+descr:              Peer info: https://dn42.potat0.cc/
 country:            CN
 admin-c:            POTAT0-DN42
 tech-c:             POTAT0-DN42
 mnt-by:             POTAT0-MNT
+nserver:            ns1.potat0.dn42
 status:             ASSIGNED
 cidr:               172.23.246.0/26
+ds-rdata:           3657 13 2 0039D1E8DA560685830A7B6B06ED37A735B62A0480D0BFCB9663A84F D49D9065
 source:             DN42
diff --git a/data/mntner/POTAT0-MNT b/data/mntner/POTAT0-MNT
index 9c93f0132..7c17a9c63 100644
--- a/data/mntner/POTAT0-MNT
+++ b/data/mntner/POTAT0-MNT
@@ -4,6 +4,8 @@ tech-c:             POTAT0-DN42
 mnt-by:             POTAT0-MNT
 source:             DN42
 auth:               pgp-fingerprint B3FBC99E398213E2025E40D029D3D8961153DB02
-auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYEtwqvi8kU0RI127aD2mLVZlVB6CzcSHjyB5LHn9LRV4VOST/WimFm/5xU11xe3aiOGbkM3fgw8KQIvJBKRS221Got3mgH2QIoGVot3pEbB8OgNl+gZCjlZgh2Infz6VwVSiUVwfw1Qk+rSb5XxgEevPWQRUVALDfafq1HBooSh9HqV7XG9dLzoclZ4MhqnbopDVDEXdK7pXPebflOKCfB9xYY2Bb2hzxEvqu+T3yLl4s74BnnvZkQ/oB6bjZjvZmcOow2GKD/tG+emfmZaZlSdr1OpU1H8WRedD7QtcSDgR4YE1dS+oyF62jrtE6/+b5E3VJxWindPChO94rkqCpLdKInQTyZNfIk1xZ/bD6gmzO2dbOpPYHtmfzvws8uJ/PP7GG/yQp3B9jlZy50kxtvwVRr3M9QZAgD1/+0izpfFDjCXEQNM3s00sBMASdgZcCUBu67GyD5z1fn70i2SxfR6QB8qPJQwWDy9malvAhVNlEjSaaqMOVrGz7BzUkLcPLXazlb3hd3rzz3h9fK1UP1UvXh+W3AnAvqqHb3Fhl/Ho3AFMm34YWw2R8NfibUfFUy8X+9WT7MgxozTpIYQVnOXn+rYhmbQCEOUdiOJZLXVYPPXugZrLHU3fjBacNt+Wg5l07GpmCqHI4X7HqSEXc30kNRWtpF5km8kd5LbCKRw==
-auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0K+J4ePlrAbgBe15yP26qp4XVo52ciffBseXnWnk9KUPMvXz1BuUlKMJWsyel+MdCV4BxQPZDP6GxPfHpULpHo7iSCI4WNG6VcqRWo6eHtgNcxKdvzARTofVJlYU5ynCzCrN41aICuJndfa/MGmdKSbcFrK/Qe0s7DvWfEK0J2ucThOckDM6E47wLXTx+QGFCQ15Jf88fRe7VNg5zwdZO1hdzLzEoatJXGxahzTZ+9JG31rTv0WY3Zf5KzpPc9xghNlgw4dWD0ZUTpnTD5d29gt4urO93hBsG8Bgiy74ULZXy+/C/pVdCU6oJPihzAyunKNw9AfnIrIxI2lwI+s+Td6glHOmgp22dxE7Cu2vWcrMilk3Q/LiSC/YAOWcGcgXaeFtsx4GWB7lQH+Tb1xUavUIeNRQyZph1tVxsNPaqq768WblS7S8Cq00SfDUQ/S6OFl9WJHu1nl3WvSa7R58plVGdKkqgqSbi5B3Oaql3meEe8MGFA3V+pLuNHVgtke8=
+auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYEtwqvi8kU0RI127aD2mLVZlVB6CzcSHjyB5LHn9LRV4VOST/WimFm/5xU11xe3aiOGbkM3fgw8KQIvJBKRS221Got3mgH2QIoGVot3pEbB8OgNl+gZCjlZgh2Infz6VwVSiUVwfw1Qk+rSb5XxgEevPWQRUVALDfafq1HBooSh9HqV7XG9dLzoclZ4MhqnbopDVDEXdK7pXPebflOKCfB9xYY2Bb2hzxEvqu+T3yLl4s74BnnvZkQ/oB6bjZjvZmcOow2GKD/tG+emfmZaZlSdr1OpU1H8WRedD7QtcSDgR4YE1dS+oyF62jrtE6/+b5E3VJxWindPChO94rkqCpLdKInQTyZNfIk1xZ/bD6gmzO2dbOpPYHtmfzvws8uJ/PP7GG/yQp3B9jlZy50kxtvwVRr3M9QZAgD1/+0izpfFDjCXEQNM3s00sBMASdgZcCUBu67GyD5z1fn70i2SxfR6QB8qPJQwWDy9malvAhVNlEjSaaqMOVrGz7BzUkLcPLXazlb3hd3rzz3h9fK1UP1UvXh+W3AnAvqqHb3Fhl/Ho3AFMm34YWw2R8NfibUfFUy8X+9WT7MgxozTpIYQVnOXn+rYhmbQCEOUdiOJZLXVYPPXugZrLHU3fjBacNt+Wg5l07GpmCqHI4X7HqSEXc30kNRWtpF5km8kd5LbCKRw== Yubikey
+auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0K+J4ePlrAbgBe15yP26qp4XVo52ciffBseXnWnk9KUPMvXz1BuUlKMJWsyel+MdCV4BxQPZDP6GxPfHpULpHo7iSCI4WNG6VcqRWo6eHtgNcxKdvzARTofVJlYU5ynCzCrN41aICuJndfa/MGmdKSbcFrK/Qe0s7DvWfEK0J2ucThOckDM6E47wLXTx+QGFCQ15Jf88fRe7VNg5zwdZO1hdzLzEoatJXGxahzTZ+9JG31rTv0WY3Zf5KzpPc9xghNlgw4dWD0ZUTpnTD5d29gt4urO93hBsG8Bgiy74ULZXy+/C/pVdCU6oJPihzAyunKNw9AfnIrIxI2lwI+s+Td6glHOmgp22dxE7Cu2vWcrMilk3Q/LiSC/YAOWcGcgXaeFtsx4GWB7lQH+Tb1xUavUIeNRQyZph1tVxsNPaqq768WblS7S8Cq00SfDUQ/S6OFl9WJHu1nl3WvSa7R58plVGdKkqgqSbi5B3Oaql3meEe8MGFA3V+pLuNHVgtke8= Ubuntu
+auth:               ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAuQLJSPj8Tl2ZEKGJlYjEfVo599SUqCI6ReBBRkQx/+yHR87BP2cQhVQqXWQN47SeA7dHnT2Div/Q0/xofgyia7BDEqGFW9IclGXrJTFE/2s00xOVTGBPNYKdz5gv35c11eIf9DyoYCTE4SJjADpk9RPRpnFG3PTAPb8vmKZnEAuXXuYhRy/HfTmnXfvb7eCny9KarqWWgB2Oer+lxXBrJgCAeY+bZeiutlz9nbXOevBMkZqyiuewYd57cTm5a5nazbbS51KYjgfqv2Sy67+kcI0wSJuRCR3zZDo1TR2xLHTJOLVWbwwdKgrE3OZ4pkdxb9wCIn/F8AWoEmeiFWBfUw== Windows
+auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCZRWdw1LAtUPiK/GkHhhp3aH066DyEmH+U0iKtVt/Y8c4UsmDhWdsmkbAC5ZQzZ503Iiilz6ffLb0gEe0ZlJFxPLQhlLqHLUfrEq/Ha8HDnfGoOLQWYqVTN7xUpJRbBaidZ6jxBvhtn0r+hnyVjGlMUKAN3clHzghV7rjwnKGGYz8Oe319BH0025gE+IGedY3sNunYCUMbZhx0G6T+k2+bFh4AP9l/cExU5es7UkKdrx8x/vSQaNMJP6e81jnZlc1IEX3oUat1cmC+R4Wgc0pFCIDEz8EB9PygTM5qnlmQyQ3nhRxA6I72wqEftstnLLnrjZt2OMZFCce0OpG2+4VCX5jfcOEy8QoFDmO1eYfUHuN/6OsRjB+x0viuxdfI/hjCLAiUeowQXNNbFVeRG42kDU6Kd9YOYRLENVvo+Ha7Nces6IP1jEBaOBcCXFM7JVlKAo7B3jnuOXkPWLoCyNXepm453I+IVBtZcOpRKmq1EZ2AJtboB5bYt6/cRqKDFr8= DN42-US1
 remarks:            Potat0
diff --git a/data/route/172.23.246.0_26 b/data/route/172.23.246.0_26
index ea62abbd8..e16693a1c 100644
--- a/data/route/172.23.246.0_26
+++ b/data/route/172.23.246.0_26
@@ -1,5 +1,5 @@
 route:              172.23.246.0/26
-descr:              Peer with me at dn42@potat0.cc
+descr:              Peer info: https://dn42.potat0.cc/
 origin:             AS4242421816
 mnt-by:             POTAT0-MNT
 source:             DN42
diff --git a/data/route6/fd2c:1323:4042::_48 b/data/route6/fd2c:1323:4042::_48
index e59cb027c..2aba23d55 100644
--- a/data/route6/fd2c:1323:4042::_48
+++ b/data/route6/fd2c:1323:4042::_48
@@ -1,5 +1,5 @@
 route6:             fd2c:1323:4042::/48
-descr:              Peer with me at dn42@potat0.cc
+descr:              Peer info: https://dn42.potat0.cc/
 origin:             AS4242421816
 mnt-by:             POTAT0-MNT
 source:             DN42