diff --git a/package/gluon-core/check_site.lua b/package/gluon-core/check_site.lua
index 3966592d..4cb44d5b 100644
--- a/package/gluon-core/check_site.lua
+++ b/package/gluon-core/check_site.lua
@@ -26,7 +26,9 @@ need_string(in_site({'timezone'}))
 
 need_string_array({'ntp_servers'}, false)
 
+need_string_match(in_domain({'prefix4'}), '^%d+.%d+.%d+.%d+/%d+$', false)
 need_string_match(in_domain({'prefix6'}), '^[%x:]+/64$')
+need_string_array_match(in_domain({'extra_prefixes6'}), '^[%x:]+/%d+$', false)
 
 local supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000}
 for _, config in ipairs({'wifi24', 'wifi5'}) do
diff --git a/package/gluon-ebtables-source-filter/check_site.lua b/package/gluon-ebtables-source-filter/check_site.lua
deleted file mode 100644
index 56d229c0..00000000
--- a/package/gluon-ebtables-source-filter/check_site.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-need_string_match(in_domain({'prefix4'}), '^%d+.%d+.%d+.%d+/%d+$', false)
-need_string_array_match(in_domain({'extra_prefixes6'}), '^[%x:]+/%d+$', false)
diff --git a/package/gluon-l3roamd/check_site.lua b/package/gluon-l3roamd/check_site.lua
index f1e98a13..4e80ca2e 100644
--- a/package/gluon-l3roamd/check_site.lua
+++ b/package/gluon-l3roamd/check_site.lua
@@ -1,3 +1 @@
-need_string_match(in_domain({'prefix6'}), '^[%x:]+/64$', true)
 need_string_match(in_domain({'node_client_prefix6'}), '^[%x:]+/64$', false)
-need_string_match(in_domain({'prefix4'}), '^%d+.%d+.%d+.%d+/%d+$', false)