diff --git a/rule/WiFiCalling/DE/DE.list b/rule/WiFiCalling/DE/DE.list
index be92890..6ba0876 100644
--- a/rule/WiFiCalling/DE/DE.list
+++ b/rule/WiFiCalling/DE/DE.list
@@ -1,3 +1,7 @@
 # 德国 VoWiFi / ePDG
 AND,((GEOIP,DE),(PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500))))
-DOMAIN-KEYWORD, mcc262
\ No newline at end of file
+DOMAIN-SUFFIX, mcc262.pub.3gppnetwork.org
+
+# 沃达丰
+DOMAIN-SUFFIX, vodafone.de
+IP-CIDR, 139.7.117.168/29,no-resolve
\ No newline at end of file
diff --git a/rule/WiFiCalling/DE/DE.yaml b/rule/WiFiCalling/DE/DE.yaml
index 026ac1d..f4ed060 100644
--- a/rule/WiFiCalling/DE/DE.yaml
+++ b/rule/WiFiCalling/DE/DE.yaml
@@ -1,4 +1,8 @@
 payload:
   # 德国 VoWiFi / ePDG
   - AND,((GEOIP,DE),(NETWORK,UDP),(OR,((DST-PORT,500),(DST-PORT,4500))))
-  - DOMAIN-KEYWORD, mcc262
\ No newline at end of file
+  - DOMAIN-SUFFIX, mcc262.pub.3gppnetwork.org
+
+  # 沃达丰
+  - DOMAIN-SUFFIX, vodafone.de
+  - IP-CIDR, 139.7.117.168/29,no-resolve
\ No newline at end of file
diff --git a/rule/WiFiCalling/NL/NL.list b/rule/WiFiCalling/NL/NL.list
index 6829019..3aaa3a3 100644
--- a/rule/WiFiCalling/NL/NL.list
+++ b/rule/WiFiCalling/NL/NL.list
@@ -1,3 +1,7 @@
 # 荷兰 VoWiFi / ePDG
 AND,((GEOIP,NL),(PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500))))
-DOMAIN-KEYWORD,mcc204
\ No newline at end of file
+DOMAIN-SUFFIX, mcc204.pub.3gppnetwork.org
+
+# Simyo
+DOMAIN-SUFFIX, simyo.nl
+IP-CIDR, 62.133.76.248/29,no-resolve
\ No newline at end of file
diff --git a/rule/WiFiCalling/NL/NL.yaml b/rule/WiFiCalling/NL/NL.yaml
index 5168dd7..cf14e7b 100644
--- a/rule/WiFiCalling/NL/NL.yaml
+++ b/rule/WiFiCalling/NL/NL.yaml
@@ -1,4 +1,8 @@
 payload:
   # 荷兰 VoWiFi / ePDG
   - AND,((GEOIP,NL),(NETWORK,UDP),(OR,((DST-PORT,500),(DST-PORT,4500))))
-  - DOMAIN-KEYWORD, mcc204
\ No newline at end of file
+  - DOMAIN-SUFFIX, mcc204.pub.3gppnetwork.org
+
+  # Simyo
+  - DOMAIN-SUFFIX, simyo.nl
+  - IP-CIDR, 62.133.76.248/29,no-resolve
\ No newline at end of file
diff --git a/rule/WiFiCalling/UK/UK.list b/rule/WiFiCalling/UK/UK.list
index a1b49c8..3e3ab76 100644
--- a/rule/WiFiCalling/UK/UK.list
+++ b/rule/WiFiCalling/UK/UK.list
@@ -3,24 +3,22 @@
 
 # 英国 VoWiFi / ePDG
 AND,((OR,((GEOIP,GB),(GEOIP,IE))),(PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500))))
-DOMAIN-KEYWORD, mcc234
-DOMAIN-KEYWORD, mcc235
-DOMAIN-KEYWORD, mcc272
+DOMAIN-SUFFIX, mcc234.pub.3gppnetwork.org
+DOMAIN-SUFFIX, mcc235.pub.3gppnetwork.org
+DOMAIN-SUFFIX, mcc272.pub.3gppnetwork.org
 
 # 沃达丰 / VOXI
 DOMAIN-SUFFIX, entsrv-uk.vodafone.com
 DOMAIN-SUFFIX, vuk-gto.prod.ondemandconnectivity.com
+DOMAIN, vfgb.idemia.io
 IP-CIDR, 88.82.0.0/19,no-resolve
 IP-CIDR, 148.252.160.0/19,no-resolve
-DOMAIN, vfgb.idemia.io
 
 # Giffgaff
 DOMAIN-SUFFIX, giffgaff.com
 IP-CIDR, 87.194.0.0/16,no-resolve
 
-
 # Three UK / smarty
-DOMAIN-SUFFIX, epdg.epc.mnc020.mcc234.pub.3gppnetwork.org
 DOMAIN-SUFFIX, three.co.uk
 DOMAIN-SUFFIX, smarty.co.uk
 IP-CIDR, 185.153.237.96/29,no-resolve
\ No newline at end of file
diff --git a/rule/WiFiCalling/UK/UK.yaml b/rule/WiFiCalling/UK/UK.yaml
index 8bab385..7736178 100644
--- a/rule/WiFiCalling/UK/UK.yaml
+++ b/rule/WiFiCalling/UK/UK.yaml
@@ -3,15 +3,12 @@ payload:
   # - DOMAIN-SUFFIX,gspe1-ssl.ls.apple.com
 
   # 英国 VoWiFi / ePDG
-  - AND,((OR,((GEOIP,GB),(GEOIP,IE))),(PROTOCOL,UDP),(OR,((DEST-PORT,500),(DEST-PORT,4500))))
+  - AND,((OR,((GEOIP,GB),(GEOIP,IE))),(NETWORK,UDP),(OR,((DST-PORT,500),(DST-PORT,4500))))
   - DOMAIN-SUFFIX, mcc234.pub.3gppnetwork.org
   - DOMAIN-SUFFIX, mcc235.pub.3gppnetwork.org
   - DOMAIN-SUFFIX, mcc272.pub.3gppnetwork.org
 
   # 沃达丰 / VOXI
-  # - DOMAIN-SUFFIX, epdg.epc.mnc015.mcc234.pub.3gppnetwork.org
-  # - DOMAIN-SUFFIX, ss.epdg.epc.mnc015.mcc234.pub.3gppnetwork.org
-  # - DOMAIN-SUFFIX, ss.epdg.epc.geo.mnc015.mcc234.pub.3gppnetwork.org
   - DOMAIN-SUFFIX, entsrv-uk.vodafone.com
   - DOMAIN-SUFFIX, vuk-gto.prod.ondemandconnectivity.com
   - DOMAIN, vfgb.idemia.io
@@ -23,7 +20,6 @@ payload:
   - IP-CIDR, 87.194.0.0/16,no-resolve
 
   # Three UK / smarty
-  # - DOMAIN-SUFFIX, epdg.epc.mnc020.mcc234.pub.3gppnetwork.org
   - DOMAIN-SUFFIX, three.co.uk
   - DOMAIN-SUFFIX, smarty.co.uk
   - IP-CIDR, 185.153.237.96/29,no-resolve
\ No newline at end of file