diff --git a/README.md b/README.md
index 70c9761..de54d0a 100644
--- a/README.md
+++ b/README.md
@@ -187,7 +187,6 @@
 | AS4201270004 | frank-hsinchu                                 | subnet   | 10.127.56.0/24          |                   |
 | AS4201270004 | frank-hsinchu-1                               | loopback | 10.127.255.56/32        |                   |
 | AS4201270005 | Icecat Residential network occupation address | subnet   | 10.127.233.0/24         |                   |
-| AS4201270005 | MagicNeko VPN                                 | subnet   | 10.127.236.0/24         |                   |
 | AS4201270005 | icecat                                        | subnet   | fd10:127:233:1c3c::/64  | fd10:127:233::/48 |
 | AS4201270005 | MagicNeko VPN                                 | subnet   | fd10:127:233:1c3a::/64  | fd10:127:233::/48 |
 | AS4201270006 | JerryXiao-Infrastructure                      | subnet   | 10.127.8.192/26         |                   |
@@ -222,6 +221,7 @@
 | AS4201270016 | Moecast Network                               | subnet   | 10.127.64.0/27          |                   |
 | AS4201270017 | CainSakura-home-devices                       | subnet   | 10.127.234.0/24         |                   |
 | AS4201270017 | Icecat Global Tunnel Address (OpenVPN)        | subnet   | 10.127.235.0/24         |                   |
+| AS4201270017 | MagicNeko VPN                                 | subnet   | 10.127.236.0/24         |                   |
 | AS4201270017 | CainSakura-home-devices                       | subnet   | fd10:127:234::/48       |                   |
 | AS4201270018 | caxap-minecraft-net                           | subnet   | 10.127.100.0/24         |                   |
 | AS4201270018 | caxap6                                        | subnet   | fd10:127:6324::/48      |                   |
diff --git a/neonetwork.json b/neonetwork.json
index 9377017..e8148a6 100644
--- a/neonetwork.json
+++ b/neonetwork.json
@@ -1,7 +1,7 @@
 {
   "metadata": {
-    "generated": 1598249657,
-    "valid": 1599459257
+    "generated": 1598258704,
+    "valid": 1599468304
   },
   "people": {
     "septs": {
@@ -107,11 +107,6 @@
                 "prefix": "10.127.233.0/24",
                 "maxLength": 29,
                 "netname": "Icecat Residential network occupation address"
-              },
-              {
-                "prefix": "10.127.236.0/24",
-                "maxLength": 29,
-                "netname": "MagicNeko VPN"
               }
             ],
             "ipv6": [
@@ -457,6 +452,11 @@
                 "prefix": "10.127.235.0/24",
                 "maxLength": 29,
                 "netname": "Icecat Global Tunnel Address (OpenVPN)"
+              },
+              {
+                "prefix": "10.127.236.0/24",
+                "maxLength": 29,
+                "netname": "MagicNeko VPN"
               }
             ],
             "ipv6": [
diff --git a/rfc8416.json b/rfc8416.json
index 3dd65bc..f39d1a2 100644
--- a/rfc8416.json
+++ b/rfc8416.json
@@ -109,12 +109,6 @@
         "maxPrefixLength": 29,
         "comment": "Icecat Residential network occupation address"
       },
-      {
-        "asn": 4201270005,
-        "prefix": "10.127.236.0/24",
-        "maxPrefixLength": 29,
-        "comment": "MagicNeko VPN"
-      },
       {
         "asn": 4201270006,
         "prefix": "10.127.8.192/26",
@@ -223,6 +217,12 @@
         "maxPrefixLength": 29,
         "comment": "Icecat Global Tunnel Address (OpenVPN)"
       },
+      {
+        "asn": 4201270017,
+        "prefix": "10.127.236.0/24",
+        "maxPrefixLength": 29,
+        "comment": "MagicNeko VPN"
+      },
       {
         "asn": 4201270018,
         "prefix": "10.127.100.0/24",
diff --git a/roa46.json b/roa46.json
index b3f6765..1298295 100644
--- a/roa46.json
+++ b/roa46.json
@@ -1,8 +1,8 @@
 {
   "metadata": {
     "counts": 67,
-    "generated": 1598249657,
-    "valid": 1599459257
+    "generated": 1598258703,
+    "valid": 1599468303
   },
   "roas": [
     {
@@ -90,11 +90,6 @@
       "prefix": "10.127.233.0/24",
       "maxLength": 29
     },
-    {
-      "asn": "AS4201270005",
-      "prefix": "10.127.236.0/24",
-      "maxLength": 29
-    },
     {
       "asn": "AS4201270006",
       "prefix": "10.127.8.192/26",
@@ -185,6 +180,11 @@
       "prefix": "10.127.235.0/24",
       "maxLength": 29
     },
+    {
+      "asn": "AS4201270017",
+      "prefix": "10.127.236.0/24",
+      "maxLength": 29
+    },
     {
       "asn": "AS4201270018",
       "prefix": "10.127.100.0/24",
diff --git a/roa46_bird2.conf b/roa46_bird2.conf
index 73e732d..668441d 100644
--- a/roa46_bird2.conf
+++ b/roa46_bird2.conf
@@ -17,7 +17,6 @@ route 4201270003 max 10.127.89.0/24 as 29;
 route 4201270004 max 10.127.56.0/24 as 29;
 route 4201270004 max 10.127.255.56/32 as 32;
 route 4201270005 max 10.127.233.0/24 as 29;
-route 4201270005 max 10.127.236.0/24 as 29;
 route 4201270006 max 10.127.8.192/26 as 29;
 route 4201270006 max 10.127.9.0/24 as 29;
 route 4201270006 max 10.127.255.53/32 as 32;
@@ -36,6 +35,7 @@ route 4201270014 max 10.127.23.0/29 as 29;
 route 4201270016 max 10.127.64.0/27 as 29;
 route 4201270017 max 10.127.234.0/24 as 29;
 route 4201270017 max 10.127.235.0/24 as 29;
+route 4201270017 max 10.127.236.0/24 as 29;
 route 4201270018 max 10.127.100.0/24 as 29;
 route 4242420140 max 10.127.12.0/24 as 29;
 route 4242421037 max 10.127.8.0/26 as 29;
diff --git a/roa4_bird2.conf b/roa4_bird2.conf
index 3302f87..e137b71 100644
--- a/roa4_bird2.conf
+++ b/roa4_bird2.conf
@@ -17,7 +17,6 @@ route 4201270003 max 10.127.89.0/24 as 29;
 route 4201270004 max 10.127.56.0/24 as 29;
 route 4201270004 max 10.127.255.56/32 as 32;
 route 4201270005 max 10.127.233.0/24 as 29;
-route 4201270005 max 10.127.236.0/24 as 29;
 route 4201270006 max 10.127.8.192/26 as 29;
 route 4201270006 max 10.127.9.0/24 as 29;
 route 4201270006 max 10.127.255.53/32 as 32;
@@ -36,6 +35,7 @@ route 4201270014 max 10.127.23.0/29 as 29;
 route 4201270016 max 10.127.64.0/27 as 29;
 route 4201270017 max 10.127.234.0/24 as 29;
 route 4201270017 max 10.127.235.0/24 as 29;
+route 4201270017 max 10.127.236.0/24 as 29;
 route 4201270018 max 10.127.100.0/24 as 29;
 route 4242420140 max 10.127.12.0/24 as 29;
 route 4242421037 max 10.127.8.0/26 as 29;