diff --git a/package/gluon-authorized-keys/check_site.lua b/package/gluon-authorized-keys/check_site.lua
index 7daf2115..864fb059 100644
--- a/package/gluon-authorized-keys/check_site.lua
+++ b/package/gluon-authorized-keys/check_site.lua
@@ -1 +1 @@
-need_string_array(in_site({'authorized_keys'}))
+need_string_array(in_site_or_custom({'authorized_keys'}))
diff --git a/package/gluon-core/check_site.lua b/package/gluon-core/check_site.lua
index 9eef4916..a5069d8a 100644
--- a/package/gluon-core/check_site.lua
+++ b/package/gluon-core/check_site.lua
@@ -3,7 +3,7 @@ need_string(in_site({'site_name'}))
 
 -- this_domain() returns nil when multidomain support is disabled
 if this_domain() then
-	need_domain_name(in_site({'default_domain'}))
+	need_domain_name(in_site_or_custom({'default_domain'}))
 
 	need_table(in_domain({'domain_names'}), function(domain)
 		need_alphanumeric_key(domain)
@@ -60,7 +60,7 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do
 	end
 end
 
-need_boolean(in_site({'poe_passthrough'}), false)
+need_boolean(in_site_or_custom({'poe_passthrough'}), false)
 
 if need_table(in_site_or_domain({'dns'}), nil, false) then
 	need_string_array_match(in_site_or_domain({'dns', 'servers'}), '^[%x:]+$')
@@ -72,6 +72,6 @@ need_string_match(in_domain({'next_node', 'ip4'}), '^%d+.%d+.%d+.%d+$', false)
 
 need_boolean(in_domain({'mesh', 'vxlan'}), false)
 
-need_boolean(in_site({'mesh_on_wan'}), false)
-need_boolean(in_site({'mesh_on_lan'}), false)
+need_boolean(in_site_or_custom({'mesh_on_wan'}), false)
+need_boolean(in_site_or_custom({'mesh_on_lan'}), false)
 need_boolean(in_site({'single_as_lan'}), false)
diff --git a/package/gluon-node-info/check_site.lua b/package/gluon-node-info/check_site.lua
index d1d6712a..ce6fd1fd 100644
--- a/package/gluon-node-info/check_site.lua
+++ b/package/gluon-node-info/check_site.lua
@@ -1 +1 @@
-need_string(in_site({'roles', 'default'}), false)
+need_string(in_site_or_custom({'roles', 'default'}), false)
diff --git a/package/gluon-setup-mode/check_site.lua b/package/gluon-setup-mode/check_site.lua
index b07b103f..7117c52c 100644
--- a/package/gluon-setup-mode/check_site.lua
+++ b/package/gluon-setup-mode/check_site.lua
@@ -1 +1 @@
-need_boolean(in_site({'setup_mode', 'skip'}), false)
+need_boolean(in_site_or_custom({'setup_mode', 'skip'}), false)
diff --git a/package/gluon-web-node-role/check_site.lua b/package/gluon-web-node-role/check_site.lua
index 9bc5e25d..7cac2779 100644
--- a/package/gluon-web-node-role/check_site.lua
+++ b/package/gluon-web-node-role/check_site.lua
@@ -1,2 +1,2 @@
-need_string(in_site({'roles', 'default'}))
+need_string(in_site_or_custom({'roles', 'default'}))
 need_string_array(in_site({'roles', 'list'}))