diff --git a/data/aws b/data/aws
index 83fcdf0e..62853170 100644
--- a/data/aws
+++ b/data/aws
@@ -39,7 +39,4 @@ elasticbeanstalk.com
 thinkboxsoftware.com
 
 # AWS DNS
-regexp:.+\.awsdns-[0-9][0-9]\.co\.uk$
-regexp:.+\.awsdns-[0-9][0-9]\.com$
-regexp:.+\.awsdns-[0-9][0-9]\.net$
-regexp:.+\.awsdns-[0-9][0-9]\.org$
+regexp:.+\.awsdns-[0-9][0-9]\.(co\.uk|com|net|org)$
diff --git a/data/aws-cn b/data/aws-cn
index a1a54946..c44ea397 100644
--- a/data/aws-cn
+++ b/data/aws-cn
@@ -21,8 +21,5 @@ route53.cn @cn
 sagemaker.com.cn @cn
 
 # AWS CN DNS
-regexp:.+\.awsdns-cn-[0-9][0-9]\.biz$
+regexp:.+\.awsdns-cn-[0-9][0-9]\.(biz|com|net|top)$
 regexp:.+\.awsdns-cn-[0-9][a-e0-9]\.cn$
-regexp:.+\.awsdns-cn-[0-9][0-9]\.com$
-regexp:.+\.awsdns-cn-[0-9][0-9]\.net$
-regexp:.+\.awsdns-cn-[0-9][0-9]\.top$