diff --git a/apps/emqx_auth/src/emqx_authz/sources/emqx_authz_file_schema.erl b/apps/emqx_auth/src/emqx_authz/sources/emqx_authz_file_schema.erl
index cea697d66..ae06147ff 100644
--- a/apps/emqx_auth/src/emqx_authz/sources/emqx_authz_file_schema.erl
+++ b/apps/emqx_auth/src/emqx_authz/sources/emqx_authz_file_schema.erl
@@ -22,6 +22,7 @@
 -behaviour(emqx_authz_schema).
 
 -export([
+    namespace/0,
     type/0,
     fields/1,
     desc/1,
@@ -30,6 +31,8 @@
     select_union_member/1
 ]).
 
+namespace() -> "authz".
+
 type() -> ?AUTHZ_TYPE.
 
 fields(file) ->
diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index 3a2b5d972..a872a6a56 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -79,8 +79,7 @@
 upgrade_raw_conf(RawConf) ->
     emqx_connector_schema:transform_bridges_v1_to_connectors_and_bridges_v2(RawConf).
 
-%% root config should not have a namespace
-namespace() -> undefined.
+namespace() -> emqx.
 
 tags() ->
     [<<"EMQX">>].
diff --git a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml.erl b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml.erl
index 907d2dcde..42a0e8f74 100644
--- a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml.erl
+++ b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml.erl
@@ -12,6 +12,7 @@
 -behaviour(emqx_dashboard_sso).
 
 -export([
+    namespace/0,
     hocon_ref/0,
     login_ref/0,
     fields/1,
@@ -43,6 +44,8 @@
 %% Hocon Schema
 %%------------------------------------------------------------------------------
 
+namespace() -> "dashboard".
+
 hocon_ref() ->
     hoconsc:ref(?MODULE, saml).
 
diff --git a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_schema.erl b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_schema.erl
index aa032a3cc..a73f13ca8 100644
--- a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_schema.erl
+++ b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_schema.erl
@@ -21,7 +21,7 @@
 %%------------------------------------------------------------------------------
 %% Hocon Schema
 %%------------------------------------------------------------------------------
-namespace() -> "sso".
+namespace() -> dashboard.
 
 fields(sso) ->
     lists:map(
diff --git a/apps/emqx_gateway_coap/src/emqx_coap_schema.erl b/apps/emqx_gateway_coap/src/emqx_coap_schema.erl
index b7ce88451..c4879f553 100644
--- a/apps/emqx_gateway_coap/src/emqx_coap_schema.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_schema.erl
@@ -26,7 +26,9 @@
 -reflect_type([duration/0]).
 
 %% config schema provides
--export([fields/1, desc/1]).
+-export([namespace/0, fields/1, desc/1]).
+
+namespace() -> "gateway".
 
 fields(coap) ->
     [
diff --git a/apps/emqx_gateway_exproto/src/emqx_exproto_schema.erl b/apps/emqx_gateway_exproto/src/emqx_exproto_schema.erl
index 10583e41a..7eeceb3cb 100644
--- a/apps/emqx_gateway_exproto/src/emqx_exproto_schema.erl
+++ b/apps/emqx_gateway_exproto/src/emqx_exproto_schema.erl
@@ -28,7 +28,9 @@
 ]).
 
 %% config schema provides
--export([fields/1, desc/1]).
+-export([namespace/0, fields/1, desc/1]).
+
+namespace() -> "gateway".
 
 fields(exproto) ->
     [
diff --git a/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.app.src b/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.app.src
index 09622763b..ffd8fd3d1 100644
--- a/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.app.src
+++ b/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.app.src
@@ -1,6 +1,6 @@
 {application, emqx_gateway_exproto, [
     {description, "ExProto Gateway"},
-    {vsn, "0.1.4"},
+    {vsn, "0.1.5"},
     {registered, []},
     {applications, [kernel, stdlib, grpc, emqx, emqx_gateway]},
     {env, []},
diff --git a/apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.app.src b/apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.app.src
index e5afd7871..371f74625 100644
--- a/apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.app.src
+++ b/apps/emqx_gateway_lwm2m/src/emqx_gateway_lwm2m.app.src
@@ -1,6 +1,6 @@
 {application, emqx_gateway_lwm2m, [
     {description, "LwM2M Gateway"},
-    {vsn, "0.1.3"},
+    {vsn, "0.1.4"},
     {registered, []},
     {applications, [kernel, stdlib, emqx, emqx_gateway, emqx_gateway_coap]},
     {env, []},
diff --git a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_schema.erl b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_schema.erl
index b674c3260..41df3b970 100644
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_schema.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_schema.erl
@@ -28,7 +28,9 @@
 -reflect_type([duration/0, duration_s/0]).
 
 %% config schema provides
--export([fields/1, desc/1]).
+-export([namespace/0, fields/1, desc/1]).
+
+namespace() -> gateway.
 
 fields(lwm2m) ->
     [
diff --git a/apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.app.src b/apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.app.src
index c2f6d642b..a7de83b74 100644
--- a/apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.app.src
+++ b/apps/emqx_gateway_mqttsn/src/emqx_gateway_mqttsn.app.src
@@ -1,6 +1,6 @@
 {application, emqx_gateway_mqttsn, [
     {description, "MQTT-SN Gateway"},
-    {vsn, "0.1.5"},
+    {vsn, "0.1.6"},
     {registered, []},
     {applications, [kernel, stdlib, emqx, emqx_gateway]},
     {env, []},
diff --git a/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_schema.erl b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_schema.erl
index 08fb854b4..e028a698b 100644
--- a/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_schema.erl
+++ b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_schema.erl
@@ -21,7 +21,9 @@
 -include_lib("typerefl/include/types.hrl").
 
 %% config schema provides
--export([fields/1, desc/1]).
+-export([namespace/0, fields/1, desc/1]).
+
+namespace() -> "gateway".
 
 fields(mqttsn) ->
     [
diff --git a/apps/emqx_gateway_stomp/src/emqx_stomp_schema.erl b/apps/emqx_gateway_stomp/src/emqx_stomp_schema.erl
index b1c6a92e2..d4dcd2897 100644
--- a/apps/emqx_gateway_stomp/src/emqx_stomp_schema.erl
+++ b/apps/emqx_gateway_stomp/src/emqx_stomp_schema.erl
@@ -20,7 +20,9 @@
 -include_lib("typerefl/include/types.hrl").
 
 %% config schema provides
--export([fields/1, desc/1]).
+-export([namespace/0, fields/1, desc/1]).
+
+namespace() -> "gateway".
 
 fields(stomp) ->
     [
diff --git a/apps/emqx_retainer/src/emqx_retainer_schema.erl b/apps/emqx_retainer/src/emqx_retainer_schema.erl
index 983b27601..1c5d8e55f 100644
--- a/apps/emqx_retainer/src/emqx_retainer_schema.erl
+++ b/apps/emqx_retainer/src/emqx_retainer_schema.erl
@@ -30,7 +30,7 @@
 
 -define(INVALID_SPEC(_REASON_), throw({_REASON_, #{default => ?DEFAULT_INDICES}})).
 
-namespace() -> "retainer".
+namespace() -> retainer.
 
 roots() ->
     [
diff --git a/apps/emqx_schema_registry/src/emqx_schema_registry.app.src b/apps/emqx_schema_registry/src/emqx_schema_registry.app.src
index e64d104f7..f4089fdc1 100644
--- a/apps/emqx_schema_registry/src/emqx_schema_registry.app.src
+++ b/apps/emqx_schema_registry/src/emqx_schema_registry.app.src
@@ -1,6 +1,6 @@
 {application, emqx_schema_registry, [
     {description, "EMQX Schema Registry"},
-    {vsn, "0.1.7"},
+    {vsn, "0.1.8"},
     {registered, [emqx_schema_registry_sup]},
     {mod, {emqx_schema_registry_app, []}},
     {included_applications, [
diff --git a/apps/emqx_schema_registry/src/emqx_schema_registry_schema.erl b/apps/emqx_schema_registry/src/emqx_schema_registry_schema.erl
index d131aa48f..564496629 100644
--- a/apps/emqx_schema_registry/src/emqx_schema_registry_schema.erl
+++ b/apps/emqx_schema_registry/src/emqx_schema_registry_schema.erl
@@ -10,6 +10,7 @@
 
 %% `hocon_schema' API
 -export([
+    namespace/0,
     roots/0,
     fields/1,
     desc/1,
@@ -26,6 +27,8 @@
 %% `hocon_schema' APIs
 %%------------------------------------------------------------------------------
 
+namespace() -> ?CONF_KEY_ROOT.
+
 roots() ->
     [{?CONF_KEY_ROOT, mk(ref(?CONF_KEY_ROOT), #{required => false})}].