diff --git a/data/category-companies b/data/category-companies
index 847d13f6..54d6efd2 100644
--- a/data/category-companies
+++ b/data/category-companies
@@ -79,7 +79,6 @@ include:spaceship
 include:st
 include:synology
 include:symantec
-include:tailscale
 include:theboringcompany
 include:tonec
 include:uber
diff --git a/data/category-proxy-tunnels b/data/category-proxy-tunnels
new file mode 100644
index 00000000..64b30681
--- /dev/null
+++ b/data/category-proxy-tunnels
@@ -0,0 +1,3 @@
+include:ngrok
+include:pinggy
+include:tailscale
diff --git a/data/geolocation-!cn b/data/geolocation-!cn
index f3394552..6fdf0846 100644
--- a/data/geolocation-!cn
+++ b/data/geolocation-!cn
@@ -12,6 +12,7 @@ include:taboola
 
 # Anti-censorship & Anti-GFW & Privacy protection & VPN tools
 include:category-anticensorship
+include:category-proxy-tunnels
 
 # Art & Design & Photography
 include:artstation
diff --git a/data/ngrok b/data/ngrok
new file mode 100644
index 00000000..5909a98c
--- /dev/null
+++ b/data/ngrok
@@ -0,0 +1,9 @@
+ngrok-free.app
+ngrok-free.dev
+ngrok-free.pizza
+ngrok.app
+ngrok.com
+ngrok.dev
+ngrok.io
+ngrok.pizza
+ngrok.pro
diff --git a/data/pinggy b/data/pinggy
new file mode 100644
index 00000000..e0a0e49e
--- /dev/null
+++ b/data/pinggy
@@ -0,0 +1,2 @@
+pinggy.io
+pinggy.link