diff --git a/Makefile b/Makefile
index 5dc0d60f7..0bd5dc450 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ REBAR_VERSION = 3.14.3-emqx-4
 DASHBOARD_VERSION = v4.3.0
 REBAR = $(CURDIR)/rebar3
 BUILD = $(CURDIR)/build
+SCRIPTS = $(CURDIR)/scripts
 export EMQX_ENTERPRISE=false
 export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
 
@@ -20,13 +21,13 @@ all: $(REBAR) $(PROFILES)
 
 .PHONY: ensure-rebar3
 ensure-rebar3:
-	$(CURDIR)/ensure-rebar3.sh $(REBAR_VERSION)
+	$(SCRIPTS)/ensure-rebar3.sh $(REBAR_VERSION)
 
 $(REBAR): ensure-rebar3
 
 .PHONY: get-dashboard
 get-dashboard:
-	$(CURDIR)/scripts/get-dashboard.sh $(DASHBOARD_VERSION)
+	$(SCRIPTS)/get-dashboard.sh $(DASHBOARD_VERSION)
 
 .PHONY: eunit
 eunit: $(REBAR)
diff --git a/ensure-rebar3.sh b/scripts/ensure-rebar3.sh
similarity index 86%
rename from ensure-rebar3.sh
rename to scripts/ensure-rebar3.sh
index 941df5b85..5612beab4 100755
--- a/ensure-rebar3.sh
+++ b/scripts/ensure-rebar3.sh
@@ -1,12 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
-#set -euo pipefail
-set -eu
+set -euo pipefail
 
 VERSION="$1"
 
 # ensure dir
-cd -P -- "$(dirname -- "$0")"
+cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
 
 DOWNLOAD_URL='https://github.com/emqx/rebar3/releases/download'
 
diff --git a/scripts/get-dashboard.sh b/scripts/get-dashboard.sh
index 48a846112..bc28164a5 100755
--- a/scripts/get-dashboard.sh
+++ b/scripts/get-dashboard.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
-## NOTE: execute this script in the project root
-
 set -euo pipefail
 
+# ensure dir
+cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
+
 if [[ "$1" == https://* ]]; then
     VERSION='*' # alwyas download
     DOWNLOAD_URL="$1"