diff --git a/data/inetnum/172.20.199.0_25 b/data/inetnum/172.20.199.0_25
deleted file mode 100644
index 565d7f826..000000000
--- a/data/inetnum/172.20.199.0_25
+++ /dev/null
@@ -1,9 +0,0 @@
-inetnum:            172.20.199.0 - 172.20.199.127
-netname:            ANDI-DN42-VM-SRV1
-descr:              VM Servers
-country:            DE
-admin-c:            ANDI-DN42
-tech-c:             ANDI-DN42
-mnt-by:             ANDI--MNT
-status:             ALLOCATED
-cidr:               172.20.199.0/25
diff --git a/data/inetnum/172.20.199.128_25 b/data/inetnum/172.20.199.128_25
deleted file mode 100644
index 4a0615381..000000000
--- a/data/inetnum/172.20.199.128_25
+++ /dev/null
@@ -1,9 +0,0 @@
-inetnum:            172.20.199.128 - 172.20.199.255
-netname:            ANDI-DN42-VM-SRV2
-descr:              VM Servers
-country:            DE
-admin-c:            ANDI-DN42
-tech-c:             ANDI-DN42
-mnt-by:             ANDI--MNT
-status:             ALLOCATED
-cidr:               172.20.199.128/25
diff --git a/data/mntner/ANDI--MNT b/data/mntner/ANDI--MNT
index 021611a52..24e1d778c 100644
--- a/data/mntner/ANDI--MNT
+++ b/data/mntner/ANDI--MNT
@@ -1,5 +1,6 @@
 mntner:             ANDI--MNT
 sha512-pw:          NDU2YmQ3MGFiZWJjZThkMDY1OTI3YzI1ZjQ5MWQ4ZWViN2I1ZWNjM2M4OTE1NTdkNzI4OGU3YzZjYjczZDI2NjgwMjRmNTQ4OWI1MTlmMzkzNzIyMzIxMDYwMGU2ODAxZDc4YmE0Zjk2ZGEwOTU0YzllNTExOTI4MGJiNjIwZmEwOTU4NjlhOTBiNTVmZWE0OWM3Yjg2OTk4MGQzMWMxMjRlYWU4Njk2NWFjOTQ3NmE2ZTJhYWM2MGI0ODhhNGY0YmQwNmJlN2JkNjY2MGM3ZmJkZmI0NDA1YTBkOWZkMDFlNWRlMmUyMTY2YTM1YjMyYjQzNzUxYmMwMzZkMGE2ZDhjYTJmMWQxYzcxY2YxNGRkNjFjMDBiZGU3OTY0NmY1OTZkM2JlZThhYTBmNDIwNjZhZDUyNGZmYzI2NzM0NWE4MTgyYTNlNjYxMGJiMmFjNDM1NjU5N2JiZjRlMWU4NDgwOGNlZTAwYjcwNmMyZGNlN2VhNDI3NjY2ODdmYjhkMzk2ZGMxOGQ4NzhmN2Q2YzgzOThhYzkxZmEzZTJlOGY4YmU5YjRjZjcxNjdhNGY5NjdiOGU0MDBkOGU0YTdiNWE4MThjMWFjNzk5ZTlmMTMyYzJkOGNhNTRmZDNlNWZiMDFlNzliYTNkMTA1ZTk5ZWJiOTFiZTQ1MTY3YzQwNTQ=
+auth:               pgp-fingerprint D081B7F526AF6686F02FE957E432E410B5E48C86
 admin-c:            ANDI-DN42
 tech-c:             ANDI-DN42
 mnt-by:             ANDI--MNT
diff --git a/data/route/172.20.24.0_23 b/data/route/172.20.24.0_23
new file mode 100644
index 000000000..65c7eddfb
--- /dev/null
+++ b/data/route/172.20.24.0_23
@@ -0,0 +1,4 @@
+route:              172.20.24.0/23
+descr:              HOME-NET-AND-LAB
+origin:             AS4242423991
+mnt-by:             ANDI--MNT
diff --git a/data/route/172.20.24.0_26 b/data/route/172.20.24.0_26
deleted file mode 100644
index b6605ffff..000000000
--- a/data/route/172.20.24.0_26
+++ /dev/null
@@ -1,4 +0,0 @@
-route:              172.20.24.0/26
-descr:              mobile clients
-origin:             AS4242423991
-mnt-by:             ANDI--MNT
diff --git a/data/route/172.20.24.64_26 b/data/route/172.20.24.64_26
deleted file mode 100644
index b848696c7..000000000
--- a/data/route/172.20.24.64_26
+++ /dev/null
@@ -1,4 +0,0 @@
-route:              172.20.24.64/26
-descr:              vultr
-origin:             AS4242423991
-mnt-by:             ANDI--MNT
diff --git a/data/route/172.20.199.0_25 b/data/route6/fd42:4242:4200::_40
similarity index 61%
rename from data/route/172.20.199.0_25
rename to data/route6/fd42:4242:4200::_40
index 68b3e1151..0b7010235 100644
--- a/data/route/172.20.199.0_25
+++ b/data/route6/fd42:4242:4200::_40
@@ -1,3 +1,3 @@
-route:              172.20.199.0/25
+route6:             fd42:4242:4200::/40
 origin:             AS4242423991
 mnt-by:             ANDI--MNT