diff --git a/data/apple b/data/apple
index 9ece2377..80534564 100644
--- a/data/apple
+++ b/data/apple
@@ -751,61 +751,27 @@ courier-push-apple.com.akadns.net
 
 # Domains and services below are available in China mainland
 # Use in config file like this: "geosite:apple@cn"
-full:amp-api-edge-lb-cn.itunes-apple.com.akadns.net @cn
-full:amp-api-edge-lb.itunes-apple.com.akadns.net @cn
 full:amp-api-edge.apps.apple.com @cn
 full:amp-api-edge.music.apple.com @cn
 full:amp-api-search-edge.apps.apple.com @cn
 full:amp-api.apps.apple.com @cn
 full:amp-api.music.apple.com @cn
-full:aod-ssl.itunes.apple.com @cn
-full:aod.itunes.apple.com @cn
 full:api-edge.apps.apple.com @cn
-full:apptrailers.itunes.apple.com @cn
 full:auth.music.apple.com @cn
-full:bag.itunes.apple.com @cn
-full:bookkeeper.itunes.apple.com @cn
-full:client-api.itunes.apple.com @cn
-full:cma.itunes.apple.com @cn
 full:communities.apple.com @cn
 full:discussionschinese.apple.com @cn
-full:downloaddispatch.itunes.apple.com @cn
 full:fides-pol.apple.com @cn
 full:gspe11-2-cn-ssl.ls.apple.com @cn
 full:gspe12-cn-ssl.ls.apple.com @cn
 full:gspe85-cn-ssl.ls.apple.com @cn
-full:inappcheck-cn.itunes-apple.com.akadns.net @cn
-full:inappcheck-lb.itunes-apple.com.akadns.net @cn
-full:inappcheck.itunes.apple.com @cn
 full:init.gc-lb.apple.com.akadns.net @cn
 full:init.gc.apple.com @cn
-full:init.itunes.apple.com @cn
-full:iosapps.itunes.apple.com @cn
 full:js-cdn.music.apple.com @cn
 full:km.support.apple.com @cn
 full:maps.apple.com @cn
-full:misc-assets.itunes.apple.com @cn
 full:musicstatus.music.apple.com @cn
-full:mvod.itunes.apple.com @cn
-full:myapp.itunes.apple.com @cn
-full:np-edge.itunes.apple.com @cn
-full:osxapps.itunes.apple.com @cn
-full:pd-nk.itunes.apple.com @cn
-full:pd.itunes.apple.com @cn
-full:play.itunes.apple.com @cn
 full:play.music.apple.com @cn
-full:se-edge.itunes.apple.com @cn
-full:se2.itunes.apple.com @cn
-full:search.itunes.apple.com @cn
-full:sf-api-token-service.itunes.apple.com @cn
-full:sp.itunes.apple.com @cn
 full:speedysub.music.apple.com @cn
-full:streamingaudio.itunes.apple.com @cn
-full:su.itunes.apple.com @cn
-full:sync.itunes.apple.com @cn
-full:tf-feedback.itunes.apple.com @cn
-full:universal-activity-service.itunes.apple.com @cn
-full:upp.itunes.apple.com @cn
 full:www.support.apple.com @cn
 
 # regexp:^a[1-5]\.mzstatic\.com$ @cn
@@ -875,7 +841,6 @@ full:appldnld.apple.com @cn
 full:appldnld.g.aaplimg.com @cn
 full:appleid.cdn-apple.com @cn
 full:apps.mzstatic.com @cn
-full:bag-cdn.itunes-apple.com.akadns.net @cn
 full:cds-cdn.v.aaplimg.com @cn
 full:cds.apple.com @cn
 full:cds.apple.com.akadns.net @cn
@@ -926,14 +891,9 @@ full:init-p01st.push.apple.com @cn
 full:init-s01st-lb.push-apple.com.akadns.net @cn
 full:init-s01st.push.apple.com @cn
 full:init.ess.apple.com @cn
-full:iosapps.itunes.g.aaplimg.com @cn
 full:ipcdn.apple.com @cn
 full:iphone-ld.apple.com @cn
 full:iphone-ld.origin-apple.com.akadns.net @cn
-full:is-ssl.mzstatic.com-cn-lb.itunes-apple.com.akadns.net @cn
-full:itunes-apple.com.akadns.net @cn
-full:itunes.apple.com @cn
-full:itunesconnect.apple.com @cn
 full:mensura.cdn-apple.com @cn
 full:mesu-cdn.apple.com.akadns.net @cn
 full:mesu-china.apple.com.akadns.net @cn
@@ -942,7 +902,6 @@ full:ml.cdn-apple.com @cn
 full:music.apple.com @cn
 full:oscdn.apple.com @cn
 full:oscdn.origin-apple.com.akadns.net @cn
-full:osxapps.itunes.g.aaplimg.com @cn
 full:pancake.apple.com @cn
 full:pba0.apple.com @cn
 full:probe.siri.apple.com @cn
diff --git a/data/category-entertainment b/data/category-entertainment
index d8512846..3e520e22 100644
--- a/data/category-entertainment
+++ b/data/category-entertainment
@@ -35,6 +35,7 @@ include:hamivideo
 include:hbo
 include:hulu
 include:imdb
+include:itunes
 include:iyf
 include:kingkonglive
 include:kkbox
@@ -107,9 +108,7 @@ weverse.io
 yande.re
 
 # Apple Podcast
-amp-api.podcast.apple.com
-bag.itunes.apple.com
-bookeeper.itunes.apple.com
+podcast.apple.com
 
 # Entertainment oriented media
 # This section references the "Source Considerations" page on the Chinese Wikipedia:
diff --git a/data/itunes b/data/itunes
index c138ce80..1090c34e 100644
--- a/data/itunes
+++ b/data/itunes
@@ -19,7 +19,6 @@ itun.es
 itunbes.com
 ituneas.com
 itunes-apple.cn @cn
-itunes-apple.com.akadns.net
 itunes-radio.net
 itunes.ca
 itunes.co
@@ -50,3 +49,55 @@ itunesu.com
 itunesu.net
 iutunes.com
 wwwitunes.com
+
+itunes-apple.com.akadns.net
+itunes.apple.com
+
+# Domains with access point in China mainland
+# Avoid adding `[domain:]itunes.apple.com @cn` directly, as some subdomains not resolve to a cn IP address
+# See #2228 and #2259
+full:amp-api-edge-lb-cn.itunes-apple.com.akadns.net @cn
+full:amp-api-edge-lb.itunes-apple.com.akadns.net @cn
+full:aod-ssl.itunes.apple.com @cn
+full:aod.itunes.apple.com @cn
+full:apptrailers.itunes.apple.com @cn
+full:bag.itunes.apple.com @cn
+full:bookkeeper.itunes.apple.com @cn
+full:client-api.itunes.apple.com @cn
+full:cma.itunes.apple.com @cn
+full:downloaddispatch.itunes.apple.com @cn
+full:entitlements-edge.itunes.apple.com @cn
+full:fpinit.itunes.apple.com @cn
+full:inappcheck-cn.itunes-apple.com.akadns.net @cn
+full:inappcheck-lb.itunes-apple.com.akadns.net @cn
+full:inappcheck.itunes.apple.com @cn
+full:init.itunes.apple.com @cn
+full:iosapps.itunes.apple.com @cn
+full:misc-assets.itunes.apple.com @cn
+full:mvod.itunes.apple.com @cn
+full:myapp.itunes.apple.com @cn
+full:np-edge.itunes.apple.com @cn
+full:osxapps.itunes.apple.com @cn
+full:pd-nk.itunes.apple.com @cn
+full:pd.itunes.apple.com @cn
+full:play.itunes.apple.com @cn
+full:se-edge.itunes.apple.com @cn
+full:se2.itunes.apple.com @cn
+full:search.itunes.apple.com @cn
+full:sf-api-token-service.itunes.apple.com @cn
+full:sp.itunes.apple.com @cn
+full:streamingaudio.itunes.apple.com @cn
+full:su.itunes.apple.com @cn
+full:sync.itunes.apple.com @cn
+full:tf-feedback.itunes.apple.com @cn
+full:universal-activity-service.itunes.apple.com @cn
+full:upp.itunes.apple.com @cn
+
+# The rules below are from https://github.com/felixonmars/dnsmasq-china-list/blob/master/apple.china.conf
+full:bag-cdn.itunes-apple.com.akadns.net @cn
+full:iosapps.itunes.g.aaplimg.com @cn
+full:is-ssl.mzstatic.com-cn-lb.itunes-apple.com.akadns.net @cn
+full:itunes-apple.com.akadns.net @cn
+full:itunes.apple.com @cn
+full:itunesconnect.apple.com @cn
+full:osxapps.itunes.g.aaplimg.com @cn