diff --git a/data/aws b/data/aws
index eab369c6..7be6d5f0 100644
--- a/data/aws
+++ b/data/aws
@@ -1,29 +1,20 @@
+include:aws-cn
+
 # All .aws domains
 aws
 
 # AWS
-a2z.org.cn @cn
 acmvalidations.com
 acmvalidationsaws.com
 aesworkshops.com
 amazonaws-china.com
-amazonaws.cn @cn
 amazonaws.co.uk
 amazonaws.com
-amazonaws.com.cn @cn
 amazonaws.tv
-amazonwebservices.com.cn @cn
-amazonworkdocs.cn @cn
 amazonworkdocs.com
-amazonworkdocs.com.cn @cn
 amplifyapp.com
 amplifyframework.com
-asfiovnxocqpcry.com.cn @cn
-aws-border.cn @cn
-aws-icp-domain-manager.cn @cn
 aws-iot-hackathon.com
-awsapps.cn @cn
-awsapps.com.cn @cn
 awsautopilot.com
 awsautoscaling.com
 awsbraket.com
@@ -36,22 +27,12 @@ awsglobalaccelerator.com
 awsloft-johannesburg.com
 awsloft-stockholm.com
 awssecworkshops.com
-awsstatic.cn @cn
 awsstatic.com
 awsthinkbox.com
 cdkworkshop.com
-cloudfront-cn.net @cn
-cloudfront-test.cn @cn
-cloudfront.cn @cn
 cloudfront.net
 containersonaws.com
 elasticbeanstalk.com
-nwcdcloud.cn @cn
-nwcdcloud.com.cn @cn
-nwcddns.cn @cn
-nwcdinfosec.cn @cn
-route53.cn @cn
-sagemaker.com.cn @cn
 thinkboxsoftware.com
 
 # AWS DNS
@@ -59,8 +40,3 @@ 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-cn-[0-9][0-9]\.biz$
-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$
diff --git a/data/aws-cn b/data/aws-cn
new file mode 100644
index 00000000..a1a54946
--- /dev/null
+++ b/data/aws-cn
@@ -0,0 +1,28 @@
+a2z.org.cn @cn
+amazonaws.cn @cn
+amazonaws.com.cn @cn
+amazonwebservices.com.cn @cn
+amazonworkdocs.cn @cn
+amazonworkdocs.com.cn @cn
+asfiovnxocqpcry.com.cn @cn
+aws-border.cn @cn
+aws-icp-domain-manager.cn @cn
+awsapps.cn @cn
+awsapps.com.cn @cn
+awsstatic.cn @cn
+cloudfront-cn.net @cn
+cloudfront-test.cn @cn
+cloudfront.cn @cn
+nwcdcloud.cn @cn
+nwcdcloud.com.cn @cn
+nwcddns.cn @cn
+nwcdinfosec.cn @cn
+route53.cn @cn
+sagemaker.com.cn @cn
+
+# AWS CN DNS
+regexp:.+\.awsdns-cn-[0-9][0-9]\.biz$
+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$
diff --git a/data/geolocation-cn b/data/geolocation-cn
index 35ecbb22..88250b6a 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -13,6 +13,7 @@ include:jiguang
 include:umeng
 
 # CDN companies & Services
+include:aws-cn
 include:baijiayun
 include:bootcdn
 include:bootcss