diff --git a/Makefile b/Makefile
index ae92feced..30a23793b 100644
--- a/Makefile
+++ b/Makefile
@@ -238,7 +238,7 @@ $(foreach zt,$(ALL_ZIPS),$(eval $(call download-relup-packages,$(zt))))
 ## relup target is to create relup instructions
 .PHONY: $(REL_PROFILES:%=%-relup)
 define gen-relup-target
-$1-relup: $1-relup-downloads $(COMMON_DEPS)
+$1-relup: $(COMMON_DEPS)
 	@$(BUILD) $1 relup
 endef
 ALL_TGZS = $(REL_PROFILES)
@@ -247,7 +247,7 @@ $(foreach zt,$(ALL_TGZS),$(eval $(call gen-relup-target,$(zt))))
 ## tgz target is to create a release package .tar.gz with relup
 .PHONY: $(REL_PROFILES:%=%-tgz)
 define gen-tgz-target
-$1-tgz: $1-relup
+$1-tgz: $(COMMON_DEPS)
 	@$(BUILD) $1 tgz
 endef
 ALL_TGZS = $(REL_PROFILES)
diff --git a/apps/emqx/src/emqx_post_upgrade.erl b/apps/emqx/src/emqx_post_upgrade.erl
index 5cbe3877c..6b09f2a30 100644
--- a/apps/emqx/src/emqx_post_upgrade.erl
+++ b/apps/emqx/src/emqx_post_upgrade.erl
@@ -17,21 +17,21 @@
 -module(emqx_post_upgrade).
 
 %% PR#12765
--export([
-    pr12765_update_stats_timer/1,
-    pr12765_revert_stats_timer/1
-]).
+% -export([
+%     pr12765_update_stats_timer/1,
+%     pr12765_revert_stats_timer/1
+% ]).
 
 -include("logger.hrl").
 
 %%------------------------------------------------------------------------------
 %% Hot Upgrade Callback Functions.
 %%------------------------------------------------------------------------------
-pr12765_update_stats_timer(_FromVsn) ->
-    emqx_stats:update_interval(broker_stats, fun emqx_broker_helper:stats_fun/0).
+% pr12765_update_stats_timer(_FromVsn) ->
+%     emqx_stats:update_interval(broker_stats, fun emqx_broker_helper:stats_fun/0).
 
-pr12765_revert_stats_timer(_ToVsn) ->
-    emqx_stats:update_interval(broker_stats, fun emqx_broker:stats_fun/0).
+% pr12765_revert_stats_timer(_ToVsn) ->
+%     emqx_stats:update_interval(broker_stats, fun emqx_broker:stats_fun/0).
 
 %%------------------------------------------------------------------------------
 %% Helper functions
diff --git a/apps/emqx_management/src/emqx_mgmt_api_relup.erl b/apps/emqx_management/src/emqx_mgmt_api_relup.erl
index a31551b6d..b347cd483 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_relup.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_relup.erl
@@ -40,6 +40,8 @@
     '/relup/upgrade/:node'/2
 ]).
 
+-ignore_xref(emqx_relup_main).
+
 -define(TAGS, [<<"Relup">>]).
 -define(NAME_RE, "^[A-Za-z]+[A-Za-z0-9-_.]*$").
 -define(CONTENT_PACKAGE, plugin).
diff --git a/bin/emqx b/bin/emqx
index d455b97c9..c32c00474 100755
--- a/bin/emqx
+++ b/bin/emqx
@@ -69,7 +69,7 @@ if [ -f "$RUNNER_ROOT_DIR/relup/version" ]; then
     TARGET_VSN=$(cat "$RUNNER_ROOT_DIR/relup/version")
     export BASE_RUNNER_ROOT_DIR
     logwarn "Loading emqx from hot upgrade dir: $RUNNER_ROOT_DIR/relup"
-    exec $RUNNER_ROOT_DIR/relup/$TARGET_VSN/bin/emqx "$@"
+    exec "$RUNNER_ROOT_DIR"/relup/"$TARGET_VSN"/bin/emqx "$@"
 else
     logdebug "Loading emqx from $RUNNER_ROOT_DIR"
 fi
diff --git a/build b/build
index 8a8fd7776..b20b1f70f 100755
--- a/build
+++ b/build
@@ -212,7 +212,8 @@ make_elixir_rel() {
 }
 
 make_relup() {
-    export RELUP_TARGET_VSN="$(./pkg-vsn.sh "$PROFILE" --long)"
+    RELUP_TARGET_VSN="$(./pkg-vsn.sh "$PROFILE" --long)"
+    export RELUP_TARGET_VSN
     ./rebar3 emqx relup_gen --relup-dir=./relup
     make rel -C _build/default/plugins/emqx_relup
 }
diff --git a/rebar.config.erl b/rebar.config.erl
index 6b857a610..fcfd2595f 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -184,7 +184,7 @@ project_app_excluded("apps/" ++ AppStr, ExcludedApps) ->
 
 plugins() ->
     [
-        {emqx_relup, {git, "https://github.com/emqx/emqx-relup.git", {branch, "0.1.0"}}},
+        {emqx_relup, {git, "https://github.com/emqx/emqx-relup.git", {tag, "0.1.0"}}},
         %% emqx main project does not require port-compiler
         %% pin at root level for deterministic
         {pc, "v1.14.0"}
diff --git a/relup/examples/upgrade_path.list b/relup/examples/upgrade_path.list
index 945dcfcbe..82b3d91d2 100644
--- a/relup/examples/upgrade_path.list
+++ b/relup/examples/upgrade_path.list
@@ -1,3 +1,3 @@
 [ "5.6.1+patch.A <- 5.6.1 <- 5.6.0"
 , "5.7.0 <- 5.6.1 <- 5.6.0"
-].
\ No newline at end of file
+].