diff --git a/data/connectivity-check b/data/connectivity-check
new file mode 100644
index 00000000..11a9c973
--- /dev/null
+++ b/data/connectivity-check
@@ -0,0 +1,27 @@
+# ArchLinux
+ping.archlinux.org
+
+# Apple
+captive.apple.com
+
+# Android
+connectivitycheck.gstatic.com
+
+# Cloudflare
+cp.cloudflare.com
+
+# Debian
+network-test.debian.org
+
+# Firefox
+detectportal.firefox.com
+
+# KDE
+networkcheck.kde.org
+
+# MIUI
+full:connect.rom.miui.com
+
+# Windows
+msftconnecttest.com
+msftncsi.com
diff --git a/data/mozilla b/data/mozilla
index 8d9eb67e..3b7acdc0 100644
--- a/data/mozilla
+++ b/data/mozilla
@@ -22,3 +22,9 @@ seamonkey-project.org
 
 # Thunderbird
 thunderbird.net
+
+# Mozilla Location Service
+location.services.mozilla.com
+
+# Mozilla Push Service
+push.services.mozilla.com
diff --git a/data/private b/data/private
index 8df9ba0e..323af796 100644
--- a/data/private
+++ b/data/private
@@ -122,47 +122,20 @@ d.f.ip6.arpa
 # Dotless domains
 regexp:^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$
 
-# ArchLinux
-ping.archlinux.org
-
 # Aruba router
 full:instant.arubanetworks.com
 full:setmeup.arubanetworks.com
 
-# Apple
-captive.apple.com
-
-# Android
-connectivitycheck.gstatic.com
-
 # ASUS router
 # Reference: https://www.asus.com/support/FAQ/1005263/
 full:asusrouter.com
 full:router.asus.com
 full:www.asusrouter.com
 
-# Cloudflare
-cp.cloudflare.com
-
-# Firefox
-detectportal.firefox.com
-
 # H3C
 # https://wwwsg.h3c.com/cn/d_202007/1316557_30005_0.htm#_Toc46214911
 full:oasisauth.h3c.com
 
-# KDE
-networkcheck.kde.org
-
-# MIUI
-full:connect.rom.miui.com
-
-# Mozilla Location Service
-location.services.mozilla.com
-
-# Mozilla Push Service
-push.services.mozilla.com
-
 # Netgear router
 # Reference: https://kb.netgear.com/27199/I-can-t-access-my-router-what-do-I-do
 # https://www.netgear.com/business/services/aplogincom/
@@ -196,10 +169,6 @@ tendawifi.com
 tplinkwifi.net
 full:tplogin.cn
 
-# Windows
-msftconnecttest.com
-msftncsi.com
-
 # Xiaomi router
 # Reference: https://www1.miwifi.com/miwifi_faq.html
 full:miwifi.com