diff --git a/mix.exs b/mix.exs
index d871ddf82..63c444eec 100644
--- a/mix.exs
+++ b/mix.exs
@@ -388,9 +388,9 @@ defmodule EMQXUmbrella.MixProject do
 
     if edition_type == :enterprise do
       render_template(
-        "apps/emqx_conf/etc/emqx_enterprise.conf.all",
+        "apps/emqx_conf/etc/emqx-enterprise.conf.all",
         assigns,
-        Path.join(etc, "emqx_enterprise.conf")
+        Path.join(etc, "emqx-enterprise.conf")
       )
     end
 
diff --git a/rebar.config.erl b/rebar.config.erl
index 946a31b2c..83b4a51aa 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -479,7 +479,7 @@ emqx_etc_overlay_per_edition(ce) ->
     ];
 emqx_etc_overlay_per_edition(ee) ->
     [
-        {"{{base_dir}}/lib/emqx_conf/etc/emqx_enterprise.conf.all", "etc/emqx_enterprise.conf"},
+        {"{{base_dir}}/lib/emqx_conf/etc/emqx-enterprise.conf.all", "etc/emqx-enterprise.conf"},
         {"{{base_dir}}/lib/emqx_conf/etc/emqx.conf.all", "etc/emqx.conf"}
     ].
 
diff --git a/scripts/merge-config.escript b/scripts/merge-config.escript
index 67551bfbe..f78083ee1 100755
--- a/scripts/merge-config.escript
+++ b/scripts/merge-config.escript
@@ -13,21 +13,32 @@
 
 main(_) ->
     {ok, BaseConf} = file:read_file("apps/emqx_conf/etc/emqx_conf.conf"),
-
     Cfgs = get_all_cfgs("apps/"),
+    IsEnterprise = is_enterprise(),
+    Enterprise =
+        case IsEnterprise of
+            false -> [];
+            true -> [io_lib:nl(), "include emqx-enterprise.conf", io_lib:nl()]
+        end,
     Conf = [
         merge(BaseConf, Cfgs),
         io_lib:nl(),
-        io_lib:nl(),
-        "include emqx_enterprise.conf",
-        io_lib:nl()
+        Enterprise
     ],
     ok = file:write_file("apps/emqx_conf/etc/emqx.conf.all", Conf),
 
-    EnterpriseCfgs = get_all_cfgs("lib-ee/"),
-    EnterpriseConf = merge("", EnterpriseCfgs),
+    case IsEnterprise of
+        true ->
+            EnterpriseCfgs = get_all_cfgs("lib-ee/"),
+            EnterpriseConf = merge("", EnterpriseCfgs),
+            ok = file:write_file("apps/emqx_conf/etc/emqx-enterprise.conf.all", EnterpriseConf);
+        false ->
+            ok
+    end.
 
-    ok = file:write_file("apps/emqx_conf/etc/emqx_enterprise.conf.all", EnterpriseConf).
+is_enterprise() ->
+    Profile = os:getenv("PROFILE", "emqx"),
+    nomatch =/= string:find(Profile, "enterprise").
 
 merge(BaseConf, Cfgs) ->
     lists:foldl(