diff --git a/Source/domainset/cdn.conf b/Source/domainset/cdn.conf
index 76716a99..238f7bf1 100644
--- a/Source/domainset/cdn.conf
+++ b/Source/domainset/cdn.conf
@@ -234,8 +234,8 @@ raw.github.com
 .ghcr.io
 .githubassets.com
 .pkg.github.com
-# githubusercontent.com # public suffix list
-
+.githubusercontent.com
+.github.io
 # VSCode Web
 .vscode-unpkg.net
 .vsassets.io
@@ -243,9 +243,16 @@ raw.github.com
 
 # >> GitLab
 .gitlab-static.net
+.gitlab.io
 
 # >> BitBucket
 .bytebucket.org
+.bitbucket.io
+
+# >> Vercel
+.vercel.app
+.now.sh
+.vercel.dev
 
 # >> Twitter
 .twimg.com
@@ -290,6 +297,7 @@ fonts.googleapis.com
 fonts.gstatic.com
 ajax.googleapis.com
 .googleusercontent.com
+.usercontent.goog
 .storage.googleapis.com
 .firestore.googleapis.com
 .firebasestorage.googleapis.com
@@ -337,7 +345,7 @@ mir-s3-cdn-cf.behance.net
 # >> Amazon CDN
 .ssl-images-amazon.com
 .media-amazon.com
-# .cloudfront.net public suffix
+.cloudfront.net
 # AWS
 .awsstatic.com
 cdn.assets.as2.amazonaws.com
@@ -422,6 +430,7 @@ uploads.codesandbox.io
 screenshots.codesandbox.io
 prod-packager-packages.codesandbox.io
 pkg.csb.dev
+.csb.app
 # Sandpack
 sandpack-cdn-staging.blazingly.io
 
@@ -467,6 +476,7 @@ web-static.archive.org
 .cdn.mozilla.net
 archive.mozilla.org
 detectportal.firefox.com
+stubdownloader.services.mozilla.com
 
 # >> Hubspot
 .hubspotusercontent30.com
@@ -489,11 +499,12 @@ avatars.hubspot.net
 .yastatic.net
 avatars.mds.yandex.net
 resize.yandex.net
-# storage.yandexcloud.net - public suffix list
+.storage.yandexcloud.net
 ysa-static.passport.yandex.net
 avatars.dzeninfra.ru
 s3.dzeninfra.ru
 static.dzeninfra.ru
+favicon.yandex.net
 
 # >> Repl.it
 .cms.replit.com
@@ -779,7 +790,6 @@ euc-widget.freshworks.com
 widget.freshworks.com
 dam.freshworks.com
 cdn-public.sociabble.com
-netlify-rum.netlify.app
 embed.savvycal.com
 js.pusher.com
 app.backinstock.org
@@ -935,8 +945,9 @@ userimg-bee.customeriomail.com
 .ipfs.eternum.io
 ipfs.d.tube
 .mypinata.cloud
-# .cloudflare-ipfs.com - Public Suffix List
-# .cf-ipfs.com - Public Suffix List
+.cloudflare-ipfs.com
+.cf-ipfs.com
+.dweb.link
 .ipns.co
 .ipfs.mrh.io
 .gateway.originprotocol.com
@@ -1175,6 +1186,11 @@ info.cloudflare.com
 cf-assets.www.cloudflare.com
 .nel.cloudflare.com
 favicons.teams.cloudflare.com
+# Cloudflare Service
+.pages.dev
+.workers.dev
+.r2.dev
+.cloudflarestorage.com
 # ByteDance
 sf-flow-web-cdn.ciciai.com
 # Tumblr
@@ -1190,6 +1206,8 @@ assets.vercel.com
 image.ship.vercel.com
 go.vercel.com
 api-frameworks.vercel.sh
+# Netlify
+.netlify.app
 # Heroku
 .assets.heroku.com
 # Slack
@@ -2535,7 +2553,6 @@ cdn.datdota.com
 cdn.up-timely.com
 img.supjav.com
 .mycdn.me
-favicon.yandex.net
 cdn-rdstaticassets.readdle.com
 content.wepik.com
 assets.stash.com
diff --git a/Source/non_ip/cdn.conf b/Source/non_ip/cdn.conf
index f752315d..f764c576 100644
--- a/Source/non_ip/cdn.conf
+++ b/Source/non_ip/cdn.conf
@@ -1,50 +1,20 @@
 # $ custom_build_script
 
-# >> Mozilla
-DOMAIN,stubdownloader.services.mozilla.com
-DOMAIN,download-installer.cdn.mozilla.net
-# >> Amazon CloudFront
-DOMAIN-SUFFIX,cloudfront.net
-# >> GitHub Pages
-DOMAIN-SUFFIX,github.io
-# >> GitHub
-DOMAIN-SUFFIX,githubusercontent.com
 # >> DigitalOcean OSS
 DOMAIN-SUFFIX,digitaloceanspaces.com
 # >> Vultr OSS
 DOMAIN-SUFFIX,vultrobjects.com
-# >> Yandex
-DOMAIN-SUFFIX,storage.yandexcloud.net
 # >> Linode
 DOMAIN-SUFFIX,linodeobjects.com
-# >> GitLab Pages
-DOMAIN-SUFFIX,gitlab.io
-# >> BitBucket Pages
-DOMAIN-SUFFIX,bitbucket.io
 # >> SourceForge Pages
 DOMAIN-SUFFIX,sourceforge.io
 # >> Static.app
 DOMAIN-SUFFIX,static.domains
 # >> GitBook
 DOMAIN-KEYWORD,-files.gitbook.io
-# >> Cloudflare CDN
-DOMAIN-SUFFIX,pages.dev
-DOMAIN-SUFFIX,workers.dev
-DOMAIN-SUFFIX,r2.dev
-DOMAIN-SUFFIX,cloudflarestorage.com
-# >> IPFS Gateway
-DOMAIN-SUFFIX,cloudflare-ipfs.com
-DOMAIN-SUFFIX,cf-ipfs.com
-DOMAIN-SUFFIX,dweb.link
-# >> Vercel
-DOMAIN-SUFFIX,vercel.app
-DOMAIN-SUFFIX,now.sh
-DOMAIN-SUFFIX,vercel.dev
 # >> Render.com
 DOMAIN-SUFFIX,app.render.com
 DOMAIN-SUFFIX,onrender.com
-# >> Netlify
-DOMAIN-SUFFIX,netlify.app
 # >> Surge.sh
 DOMAIN-SUFFIX,surge.sh
 # >> Codeberg Page
@@ -55,8 +25,6 @@ DOMAIN-SUFFIX,gitapp.si
 # >> Firebase Hosting
 DOMAIN-SUFFIX,web.app
 DOMAIN-SUFFIX,firebaseapp.com
-# >> Codesandbox
-DOMAIN-SUFFIX,csb.app
 # >> Microsoft Azure
 DOMAIN-SUFFIX,azurestaticapps.net
 # >> Kinsta Page
@@ -73,8 +41,6 @@ DOMAIN-KEYWORD,web-assets.zendesk
 DOMAIN-KEYWORD,-res.cloudinary.com
 # >> Algolia
 DOMAIN-KEYWORD,dsn.algolia.net
-# >> Google
-DOMAIN-SUFFIX,usercontent.goog
 # Google EdgeDL (HTTP Only)
 URL-REGEX,^http://(.+)\.gvt1\.com/edgedl
 # Microsoft OCSP (HTTP Only)