diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl
index 1b4f8a6b6..b23e59f29 100644
--- a/apps/emqx/include/emqx_release.hrl
+++ b/apps/emqx/include/emqx_release.hrl
@@ -35,7 +35,7 @@
 -define(EMQX_RELEASE_CE, "5.0.25").
 
 %% Enterprise edition
--define(EMQX_RELEASE_EE, "5.0.4-alpha.1").
+-define(EMQX_RELEASE_EE, "5.0.4-alpha.2").
 
 %% the HTTP API version
 -define(EMQX_API_VERSION, "5.0").
diff --git a/apps/emqx_eviction_agent/etc/emqx_eviction_agent.conf b/apps/emqx_eviction_agent/etc/emqx_eviction_agent.conf
index 011b7fb0f..e69de29bb 100644
--- a/apps/emqx_eviction_agent/etc/emqx_eviction_agent.conf
+++ b/apps/emqx_eviction_agent/etc/emqx_eviction_agent.conf
@@ -1,3 +0,0 @@
-##--------------------------------------------------------------------
-## EMQX Eviction Agent Plugin
-##--------------------------------------------------------------------
diff --git a/apps/emqx_node_rebalance/etc/emqx_node_rebalance.conf b/apps/emqx_node_rebalance/etc/emqx_node_rebalance.conf
index 8ace22435..e69de29bb 100644
--- a/apps/emqx_node_rebalance/etc/emqx_node_rebalance.conf
+++ b/apps/emqx_node_rebalance/etc/emqx_node_rebalance.conf
@@ -1,3 +0,0 @@
-##--------------------------------------------------------------------
-## EMQX Node Rebalance Plugin
-##--------------------------------------------------------------------
diff --git a/dev b/dev
index 425da993a..8cf07cfaf 100755
--- a/dev
+++ b/dev
@@ -323,10 +323,12 @@ boot() {
     ## Make erl command aware where to load all the beams
     ## this should be done before every erl command
     prepare_erl_libs "$PROFILE"
+    ## make sure copy acl.conf and certs to etc before render_hocon_conf
+    ## hocon will check rules inside acl.conf.
+    copy_other_conf_files
     render_hocon_conf
     generate_app_conf
     append_args_file
-    copy_other_conf_files
     APPS="$(apps_to_load)"
 
     BOOT_SEQUENCE="