diff --git a/data/apple b/data/apple
index e136810d..c478ec73 100644
--- a/data/apple
+++ b/data/apple
@@ -1009,7 +1009,6 @@ full:tj-pod1-smp-device.apple.com @cn
 full:updates-http.cdn-apple.com @cn
 full:updates-http.cdn-apple.com.akadns.net @cn
 full:updates.cdn-apple.com @cn
-full:valid.apple.com @cn
 full:valid.origin-apple.com.akadns.net @cn
 full:weather-data.apple.com @cn
 full:weather-data.apple.com.akadns.net @cn
diff --git a/data/apple-pki b/data/apple-pki
index 4097146f..c2d2344a 100644
--- a/data/apple-pki
+++ b/data/apple-pki
@@ -6,3 +6,4 @@ full:ocsp-lb.apple.com.akadns.net @cn
 full:ocsp.apple.com @cn
 full:ocsp2-lb.apple.com.akadns.net @cn
 full:ocsp2.apple.com @cn
+full:valid.apple.com @cn
diff --git a/data/category-cas b/data/category-cas
index 9ef77cfc..3810a210 100644
--- a/data/category-cas
+++ b/data/category-cas
@@ -7,8 +7,6 @@ include:apple-pki
 include:buypass
 include:certinomis
 include:certum
-include:comodo
-include:cybertrust
 include:digicert
 include:entrust
 include:gandi
@@ -25,11 +23,9 @@ include:sectigo
 include:sslcom
 include:starfieldtech
 include:swisssign
-include:symantec
 include:telekom
 include:trustwave
 include:twca
-include:verisign
 include:verizon
 include:vodafone
 include:wisekey
@@ -45,6 +41,7 @@ fnmt.es
 harica.gr
 infocert.digital
 infocert.it
+managedpki.com
 netlock.hu
 trustcor.ca
 trustcor.com
diff --git a/data/category-companies b/data/category-companies
index a97ece3b..d8d99c05 100644
--- a/data/category-companies
+++ b/data/category-companies
@@ -19,6 +19,7 @@ include:chegg
 include:cisco
 include:cloudcone
 include:collabora
+include:comodo
 include:corel
 include:dell
 include:digitalocean
@@ -76,11 +77,13 @@ include:spacex
 include:spaceship
 include:st
 include:synology
+include:symantec
 include:tailscale
 include:theboringcompany
 include:tonec
 include:uber
 include:ubiquiti
+include:verisign
 include:verizon
 include:vultr
 include:westerndigital
diff --git a/data/comodo b/data/comodo
index 0536946b..382e8e90 100644
--- a/data/comodo
+++ b/data/comodo
@@ -1,6 +1,2 @@
 comodo.com
 comodo.net
-comodoca.com
-comodoca2.com
-comodoca3.com
-comodoca4.com
diff --git a/data/digicert b/data/digicert
index 4171b64b..23fa1cf7 100644
--- a/data/digicert
+++ b/data/digicert
@@ -2,7 +2,9 @@ dcocsp.cn @cn
 digicert-cn.com # Not in Chinese Mainland
 digicert-validation.com
 digicert.cn @cn
+digicert.co.jp
 digicert.com
+digicert.eu
 digitalcertvalidation.com
 freessl.com
 geotrust.com
@@ -11,8 +13,15 @@ thawte.com
 thawte.de
 thawte.fr
 
+include:cybertrust
+include:verisign-pki
+include:symantec-pki
+
 # Quovadis
 quovadisglobal.com
 
 # Public Trust
 public-trust.com
+
+# Verizon CA
+omniroot.com
diff --git a/data/entrust b/data/entrust
index cfc02d67..d1cad8f6 100644
--- a/data/entrust
+++ b/data/entrust
@@ -1,5 +1,8 @@
+entrust.cn
+entrust.com
 entrust.net
 entrustdatacard.com
+full:www.entrust.cn @cn
 
 # Sub brand
 affirmtrust.com
diff --git a/data/globalsign b/data/globalsign
index 3212937e..eb9f25a9 100644
--- a/data/globalsign
+++ b/data/globalsign
@@ -19,3 +19,4 @@ globalsign.nl
 globalsigncdn.com @cn
 
 full:cdn.globalsigncdn.com.cdn.cloudflare.net @cn
+full:crl.globalsign.net @cn
diff --git a/data/hinet-eca b/data/hinet-eca
index 3aa51e19..0b1cc9ae 100644
--- a/data/hinet-eca
+++ b/data/hinet-eca
@@ -1,2 +1,6 @@
+# Chunghwa Telecom PKI
 eca.hinet.net
 gtlsca.nat.gov.tw
+pki.hinet.net
+publicca.hinet.net
+tls.hinet.net
diff --git a/data/sectigo b/data/sectigo
index 385bb326..3ba63872 100644
--- a/data/sectigo
+++ b/data/sectigo
@@ -17,3 +17,9 @@ aoc.cat
 catcert.cat
 incommon-rsa.org
 netsolssl.com
+
+# Comodo CA
+comodoca.com
+comodoca2.com
+comodoca3.com
+comodoca4.com
diff --git a/data/symantec b/data/symantec
index 95047297..50b618ab 100644
--- a/data/symantec
+++ b/data/symantec
@@ -1,4 +1 @@
-managedpki.com
 symantec.com
-symcb.com
-symcd.com
diff --git a/data/symantec-pki b/data/symantec-pki
new file mode 100644
index 00000000..fe343719
--- /dev/null
+++ b/data/symantec-pki
@@ -0,0 +1,6 @@
+# Symantec CA
+pki.symantec.com
+symauth.com
+symcb.com
+symcd.com
+ws.symantec.com
diff --git a/data/verisign-pki b/data/verisign-pki
new file mode 100644
index 00000000..6267ae11
--- /dev/null
+++ b/data/verisign-pki
@@ -0,0 +1,51 @@
+# Verisign CA
+adobe-crl.verisign.com
+certipath-aia.verisign.com
+certipath-crl.verisign.com
+crl.verisign.com
+csc3-2004-aia.verisign.com
+csc3-2004-crl.verisign.com
+csc3-2009-2-aia.verisign.com
+csc3-2009-2-crl.verisign.com
+csc3-2009-aia.verisign.com
+csc3-2009-crl.verisign.com
+csc3-2010-aia.verisign.com
+csc3-2010-crl.verisign.com
+eca-client-crl.verisign.com
+eca-client-ocsp.verisign.com
+evintl-aia.verisign.com
+evintl-crl.verisign.com
+evintl-ocsp.verisign.com
+evintl-t1-crl.verisign.com
+evsecure-aia.verisign.com
+evsecure-crl.verisign.com
+evsecure-ocsp.verisign.com
+evsecure-t1-aia.verisign.com
+evsecure-t1-crl.verisign.com
+ocsp.verisign.com
+onsitecrl.verisign.com
+orgc3-crl.verisign.com
+pki-ocsp.verisign.com
+ssp-aia.verisign.com
+ssp-crl.verisign.com
+ssp-ocsp.verisign.com
+svr-wimax-ocsp.verisign.com
+svrintl-aia.verisign.com
+svrintl-crl.verisign.com
+svrintl-g3-aia.verisign.com
+svrintl-g3-crl.verisign.com
+svrintl-t1-aia.verisign.com
+svrintl-t1-crl.verisign.com
+svrsecure-aia.verisign.com
+svrsecure-crl.verisign.com
+svrsecure-g2-aia.verisign.com
+svrsecure-g2-crl.verisign.com
+svrsecure-g3-aia.verisign.com
+svrsecure-g3-crl.verisign.com
+svrsecure-oracle-aia.verisign.com
+svrsecure-oracle-crl.verisign.com
+svrsecure-oracle-ocsp.verisign.com
+svrsecure-t1-aia.verisign.com
+svrsecure-t1-crl.verisign.com
+svrtrial-g2-aia.verisign.com
+svrtrial-g2-crl.verisign.com
diff --git a/data/verizon b/data/verizon
index 3e7ce2c5..b90fe2d8 100644
--- a/data/verizon
+++ b/data/verizon
@@ -15,6 +15,3 @@ verizonmedia.com
 verizonwireless.com
 vzw.com
 xo.com
-
-# PKI
-omniroot.com
diff --git a/data/visa b/data/visa
index 19b7913f..9dbd0ffb 100644
--- a/data/visa
+++ b/data/visa
@@ -138,6 +138,7 @@ visa-atm.com
 visa-news.jp
 visabank.org
 visabusinessinsights.com
+visaca.com
 visacarddesignlab.com
 visacards.com
 visacheckout.net