diff --git a/all/ipv4.txt b/all/ipv4.txt
index 8e66d187..f520623c 100644
--- a/all/ipv4.txt
+++ b/all/ipv4.txt
@@ -5324,6 +5324,20 @@
 16.171.80.0/22
 16.176.0.0/14
 16.182.0.0/16
+16.20.200.0/22
+16.20.204.0/22
+16.20.208.0/22
+16.20.212.0/22
+16.20.216.0/22
+16.20.220.0/22
+16.20.224.0/22
+16.20.228.0/22
+16.20.232.0/22
+16.20.236.0/22
+16.20.240.0/22
+16.20.244.0/22
+16.20.248.0/22
+16.20.252.0/22
 16.24.0.0/16
 16.25.0.0/16
 16.26.0.0/15
@@ -38488,6 +38502,7 @@
 142.4.161.192/29
 142.4.161.200/29
 142.4.161.208/29
+142.4.161.216/29
 142.4.161.24/29
 142.4.161.32/29
 142.4.161.40/29
diff --git a/all/ipv4_merged.txt b/all/ipv4_merged.txt
index 604a8631..267a5a78 100644
--- a/all/ipv4_merged.txt
+++ b/all/ipv4_merged.txt
@@ -535,6 +535,9 @@
 16.168.0.0/14
 16.176.0.0/14
 16.182.0.0/16
+16.20.200.0/21
+16.20.208.0/20
+16.20.224.0/19
 16.24.0.0/14
 16.50.0.0/15
 16.52.0.0/14
@@ -3066,8 +3069,7 @@
 142.4.160.0/24
 142.4.161.0/25
 142.4.161.128/26
-142.4.161.192/28
-142.4.161.208/29
+142.4.161.192/27
 142.4.177.0/24
 142.4.178.0/23
 142.4.180.0/24
diff --git a/all/ipv6.txt b/all/ipv6.txt
index 8a1ae175..2925200f 100644
--- a/all/ipv6.txt
+++ b/all/ipv6.txt
@@ -2800,7 +2800,7 @@
 2600:1f00:5000::/40
 2600:1f00:6000::/40
 2600:1f00:8000::/40
-2600:1f00:a400::/64
+2600:1f00:a400::/40
 2600:1f00:c000::/40
 2600:1f00:e000::/40
 2600:1f01:4800::/47
diff --git a/all/ipv6_merged.txt b/all/ipv6_merged.txt
index dd8f2c50..b99cc973 100644
--- a/all/ipv6_merged.txt
+++ b/all/ipv6_merged.txt
@@ -640,7 +640,7 @@
 2600:1f00:5000::/40
 2600:1f00:6000::/40
 2600:1f00:8000::/40
-2600:1f00:a400::/64
+2600:1f00:a400::/40
 2600:1f00:c000::/40
 2600:1f00:e000::/40
 2600:1f01:4800::/45
diff --git a/amazon/ipv4.txt b/amazon/ipv4.txt
index c10c5f42..c854085b 100644
--- a/amazon/ipv4.txt
+++ b/amazon/ipv4.txt
@@ -2475,6 +2475,20 @@
 16.171.80.0/22
 16.176.0.0/14
 16.182.0.0/16
+16.20.200.0/22
+16.20.204.0/22
+16.20.208.0/22
+16.20.212.0/22
+16.20.216.0/22
+16.20.220.0/22
+16.20.224.0/22
+16.20.228.0/22
+16.20.232.0/22
+16.20.236.0/22
+16.20.240.0/22
+16.20.244.0/22
+16.20.248.0/22
+16.20.252.0/22
 16.24.0.0/16
 16.25.0.0/16
 16.26.0.0/15
@@ -5252,6 +5266,7 @@
 142.4.161.192/29
 142.4.161.200/29
 142.4.161.208/29
+142.4.161.216/29
 142.4.161.24/29
 142.4.161.32/29
 142.4.161.40/29
diff --git a/amazon/ipv4_merged.txt b/amazon/ipv4_merged.txt
index c6fc1102..d9549001 100644
--- a/amazon/ipv4_merged.txt
+++ b/amazon/ipv4_merged.txt
@@ -374,6 +374,9 @@
 16.168.0.0/14
 16.176.0.0/14
 16.182.0.0/16
+16.20.200.0/21
+16.20.208.0/20
+16.20.224.0/19
 16.24.0.0/14
 16.50.0.0/15
 16.52.0.0/14
@@ -1136,8 +1139,7 @@
 142.4.160.0/24
 142.4.161.0/25
 142.4.161.128/26
-142.4.161.192/28
-142.4.161.208/29
+142.4.161.192/27
 142.4.177.0/24
 142.4.178.0/23
 142.4.180.0/24
diff --git a/amazon/ipv6.txt b/amazon/ipv6.txt
index 3743c6c9..8c331d69 100644
--- a/amazon/ipv6.txt
+++ b/amazon/ipv6.txt
@@ -578,7 +578,7 @@
 2600:1f00:5000::/40
 2600:1f00:6000::/40
 2600:1f00:8000::/40
-2600:1f00:a400::/64
+2600:1f00:a400::/40
 2600:1f00:c000::/40
 2600:1f00:e000::/40
 2600:1f01:4800::/47
diff --git a/amazon/ipv6_merged.txt b/amazon/ipv6_merged.txt
index 2bbcbf9b..482ce66c 100644
--- a/amazon/ipv6_merged.txt
+++ b/amazon/ipv6_merged.txt
@@ -470,7 +470,7 @@
 2600:1f00:5000::/40
 2600:1f00:6000::/40
 2600:1f00:8000::/40
-2600:1f00:a400::/64
+2600:1f00:a400::/40
 2600:1f00:c000::/40
 2600:1f00:e000::/40
 2600:1f01:4800::/45