diff --git a/all/ipv4.txt b/all/ipv4.txt
index a8864731..421d1b79 100644
--- a/all/ipv4.txt
+++ b/all/ipv4.txt
@@ -6849,6 +6849,10 @@
 16.12.82.0/23
 16.12.84.0/23
 16.12.86.0/24
+16.12.88.0/21
+16.12.96.0/21
+16.12.104.0/21
+16.12.112.0/21
 16.15.0.0/21
 16.15.8.0/22
 16.15.12.0/22
@@ -21218,7 +21222,6 @@
 31.171.153.98
 31.220.220.0/22
 31.220.235.0/24
-31.220.236.0/24
 32.192.0.0/12
 32.236.0.0/15
 32.240.0.0/15
diff --git a/all/ipv4_merged.txt b/all/ipv4_merged.txt
index 4b71ecda..735bd69b 100644
--- a/all/ipv4_merged.txt
+++ b/all/ipv4_merged.txt
@@ -439,6 +439,9 @@
 16.12.80.0/22
 16.12.84.0/23
 16.12.86.0/24
+16.12.88.0/21
+16.12.96.0/20
+16.12.112.0/21
 16.15.0.0/20
 16.15.16.0/21
 16.15.176.0/20
@@ -575,7 +578,6 @@
 31.171.153.98/32
 31.220.220.0/22
 31.220.235.0/24
-31.220.236.0/24
 32.192.0.0/12
 32.236.0.0/15
 32.240.0.0/15
diff --git a/all/ipv6.txt b/all/ipv6.txt
index 7660f7b3..677c5fad 100644
--- a/all/ipv6.txt
+++ b/all/ipv6.txt
@@ -236754,6 +236754,7 @@
 2600:1f11:4000::/36
 2600:1f11:8000::/36
 2600:1f11:ae3:700::/56
+2600:1f11:c000::/36
 2600:1f11::/36
 2600:1f12:4000::/36
 2600:1f12:8000::/36
@@ -236796,6 +236797,7 @@
 2600:1f21:8::/48
 2600:1f21:4000::/36
 2600:1f21:8000::/36
+2600:1f21:c000::/36
 2600:1f21::/36
 2600:1f22:28::/48
 2600:1f22:8000::/36
diff --git a/all/ipv6_merged.txt b/all/ipv6_merged.txt
index cb6f3f6f..275f079e 100644
--- a/all/ipv6_merged.txt
+++ b/all/ipv6_merged.txt
@@ -11049,6 +11049,7 @@
 2600:1f10:c000::/36
 2600:1f11:4000::/36
 2600:1f11:8000::/36
+2600:1f11:c000::/36
 2600:1f11::/36
 2600:1f12:4000::/36
 2600:1f12:8000::/36
@@ -11077,6 +11078,7 @@
 2600:1f20:c000::/36
 2600:1f21:4000::/36
 2600:1f21:8000::/36
+2600:1f21:c000::/36
 2600:1f21::/36
 2600:1f22:8000::/36
 2600:1f22:c000::/36
diff --git a/amazon/ipv4.txt b/amazon/ipv4.txt
index d24c4adb..32ebb036 100644
--- a/amazon/ipv4.txt
+++ b/amazon/ipv4.txt
@@ -2289,6 +2289,10 @@
 16.12.82.0/23
 16.12.84.0/23
 16.12.86.0/24
+16.12.88.0/21
+16.12.96.0/21
+16.12.104.0/21
+16.12.112.0/21
 16.15.0.0/21
 16.15.8.0/22
 16.15.12.0/22
@@ -2907,7 +2911,6 @@
 27.0.0.0/22
 31.220.220.0/22
 31.220.235.0/24
-31.220.236.0/24
 32.192.0.0/12
 32.236.0.0/15
 32.240.0.0/15
diff --git a/amazon/ipv4_merged.txt b/amazon/ipv4_merged.txt
index f7911df6..da9fdfa3 100644
--- a/amazon/ipv4_merged.txt
+++ b/amazon/ipv4_merged.txt
@@ -389,6 +389,9 @@
 16.12.80.0/22
 16.12.84.0/23
 16.12.86.0/24
+16.12.88.0/21
+16.12.96.0/20
+16.12.112.0/21
 16.15.0.0/20
 16.15.16.0/21
 16.15.176.0/20
@@ -486,7 +489,6 @@
 27.0.0.0/22
 31.220.220.0/22
 31.220.235.0/24
-31.220.236.0/24
 32.192.0.0/12
 32.236.0.0/15
 32.240.0.0/15
diff --git a/amazon/ipv6.txt b/amazon/ipv6.txt
index 85c91835..2397c0d7 100644
--- a/amazon/ipv6.txt
+++ b/amazon/ipv6.txt
@@ -1051,6 +1051,7 @@
 2600:1f11:4000::/36
 2600:1f11:8000::/36
 2600:1f11:ae3:700::/56
+2600:1f11:c000::/36
 2600:1f11::/36
 2600:1f12:4000::/36
 2600:1f12:8000::/36
@@ -1093,6 +1094,7 @@
 2600:1f21:8::/48
 2600:1f21:4000::/36
 2600:1f21:8000::/36
+2600:1f21:c000::/36
 2600:1f21::/36
 2600:1f22:28::/48
 2600:1f22:8000::/36
diff --git a/amazon/ipv6_merged.txt b/amazon/ipv6_merged.txt
index bddf622b..88abb2ff 100644
--- a/amazon/ipv6_merged.txt
+++ b/amazon/ipv6_merged.txt
@@ -877,6 +877,7 @@
 2600:1f10:c000::/36
 2600:1f11:4000::/36
 2600:1f11:8000::/36
+2600:1f11:c000::/36
 2600:1f11::/36
 2600:1f12:4000::/36
 2600:1f12:8000::/36
@@ -905,6 +906,7 @@
 2600:1f20:c000::/36
 2600:1f21:4000::/36
 2600:1f21:8000::/36
+2600:1f21:c000::/36
 2600:1f21::/36
 2600:1f22:8000::/36
 2600:1f22:c000::/36