diff --git a/data/buypass b/data/buypass
new file mode 100644
index 00000000..40b0cbb7
--- /dev/null
+++ b/data/buypass
@@ -0,0 +1,5 @@
+buypass-ssl.com
+buypass.com
+buypass.no
+buypass.se
+minid.no
diff --git a/data/cloudflare b/data/cloudflare
new file mode 100644
index 00000000..3f135f60
--- /dev/null
+++ b/data/cloudflare
@@ -0,0 +1,10 @@
+cloudflare.com
+cloudflare-dns.com
+cloudflare-ipfs.com
+cloudflareapps.com
+cloudflareinsights.com
+cloudflaressl.com
+cloudflarestatus.com
+cloudflarestream.com
+one.one.one.one
+workers.dev
diff --git a/data/comodo b/data/comodo
new file mode 100644
index 00000000..97c126ac
--- /dev/null
+++ b/data/comodo
@@ -0,0 +1,5 @@
+comodo.com
+comodoca.com
+comodoca2.com
+comodoca3.com
+comodoca4.com
diff --git a/data/digicert b/data/digicert
new file mode 100644
index 00000000..29e073a7
--- /dev/null
+++ b/data/digicert
@@ -0,0 +1 @@
+digicert.com
diff --git a/data/entrust b/data/entrust
new file mode 100644
index 00000000..cdd1b05c
--- /dev/null
+++ b/data/entrust
@@ -0,0 +1,2 @@
+entrust.net
+entrustdatacard.com
diff --git a/data/geolocation-!cn b/data/geolocation-!cn
index 9348e971..1e30bb48 100644
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@@ -51,7 +51,9 @@ include:zeronet
 include:adobe
 include:amazon
 include:apple
+include:cloudflare
 include:facebook
+include:godaddy
 include:google
 include:hp
 include:ibm
@@ -65,6 +67,20 @@ include:uber
 include:yahoo
 include:yandex
 
+# Certificate authorities
+# Reference: https://en.wikipedia.org/wiki/Certificate_authority
+include:buypass
+include:comodo
+include:digicert
+include:entrust
+include:globalsign
+include:identrust
+include:letsencrypt
+include:secom
+include:sectigo
+include:telekom
+include:trustwave
+
 # Software development related
 include:bootstrap
 include:fontawesome
diff --git a/data/globalsign b/data/globalsign
new file mode 100644
index 00000000..e08f17c5
--- /dev/null
+++ b/data/globalsign
@@ -0,0 +1,13 @@
+globalsign-media.com
+globalsign.be
+globalsign.ch
+globalsign.co.uk
+globalsign.com
+globalsign.com.au
+globalsign.com.hk
+globalsign.com.sg
+globalsign.es
+globalsign.eu
+globalsign.fr
+globalsign.net
+globalsign.nl
diff --git a/data/godaddy b/data/godaddy
new file mode 100644
index 00000000..cc48117c
--- /dev/null
+++ b/data/godaddy
@@ -0,0 +1 @@
+godaddy.com
diff --git a/data/identrust b/data/identrust
new file mode 100644
index 00000000..6c6f7dc1
--- /dev/null
+++ b/data/identrust
@@ -0,0 +1,3 @@
+identrust.com
+identrust.co.uk
+identrust.net
diff --git a/data/letsencrypt b/data/letsencrypt
new file mode 100644
index 00000000..45c29024
--- /dev/null
+++ b/data/letsencrypt
@@ -0,0 +1 @@
+letsencrypt.org
diff --git a/data/secom b/data/secom
new file mode 100644
index 00000000..b2dea9b1
--- /dev/null
+++ b/data/secom
@@ -0,0 +1,2 @@
+secom.co.jp
+secomtrust.net
diff --git a/data/sectigo b/data/sectigo
new file mode 100644
index 00000000..e6ef499d
--- /dev/null
+++ b/data/sectigo
@@ -0,0 +1,6 @@
+sectigo.com
+enterprisessl.com
+hackerguardian.com
+instantssl.com
+optimumssl.com
+positivessl.com
diff --git a/data/telekom b/data/telekom
new file mode 100644
index 00000000..d3de78cd
--- /dev/null
+++ b/data/telekom
@@ -0,0 +1,2 @@
+telekom.com
+telekom.de
diff --git a/data/trustwave b/data/trustwave
new file mode 100644
index 00000000..ebc24f1b
--- /dev/null
+++ b/data/trustwave
@@ -0,0 +1 @@
+trustwave.com