diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl
index 1cd35ad58..d76c02d78 100644
--- a/apps/emqx/include/emqx_release.hrl
+++ b/apps/emqx/include/emqx_release.hrl
@@ -32,7 +32,7 @@
 %% `apps/emqx/src/bpapi/README.md'
 
 %% Opensource edition
--define(EMQX_RELEASE_CE, "5.1.5-patch.2").
+-define(EMQX_RELEASE_CE, "5.1.5-build.3").
 
 %% Enterprise edition
 -define(EMQX_RELEASE_EE, "5.1.1").
diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src
index 73e390215..f324d6ae0 100644
--- a/apps/emqx/src/emqx.app.src
+++ b/apps/emqx/src/emqx.app.src
@@ -2,7 +2,7 @@
 {application, emqx, [
     {id, "emqx"},
     {description, "EMQX Core"},
-    {vsn, "5.1.6"},
+    {vsn, "5.1.7"},
     {modules, []},
     {registered, []},
     {applications, [
diff --git a/apps/emqx_conf/src/emqx_conf.app.src b/apps/emqx_conf/src/emqx_conf.app.src
index 86fb169a6..ab65c03c8 100644
--- a/apps/emqx_conf/src/emqx_conf.app.src
+++ b/apps/emqx_conf/src/emqx_conf.app.src
@@ -1,6 +1,6 @@
 {application, emqx_conf, [
     {description, "EMQX configuration management"},
-    {vsn, "0.1.25"},
+    {vsn, "0.1.26"},
     {registered, []},
     {mod, {emqx_conf_app, []}},
     {applications, [kernel, stdlib, emqx_ctl]},
diff --git a/apps/emqx_machine/src/emqx_machine.app.src b/apps/emqx_machine/src/emqx_machine.app.src
index bdd1db76e..e86351556 100644
--- a/apps/emqx_machine/src/emqx_machine.app.src
+++ b/apps/emqx_machine/src/emqx_machine.app.src
@@ -3,7 +3,7 @@
     {id, "emqx_machine"},
     {description, "The EMQX Machine"},
     % strict semver, bump manually!
-    {vsn, "0.2.10"},
+    {vsn, "0.2.11"},
     {modules, []},
     {registered, []},
     {applications, [kernel, stdlib, emqx_ctl]},
diff --git a/build b/build
index 34f7e8edb..03d1ce673 100755
--- a/build
+++ b/build
@@ -382,7 +382,7 @@ make_docker() {
     # shellcheck disable=SC2155
     local VSN_MINOR="$(scripts/semver.sh "$PKG_VSN" --minor)"
     # shellcheck disable=SC2155
-    local VSN_MINOR="$(scripts/semver.sh "$PKG_VSN" --patch)"
+    local VSN_PATCH="$(scripts/semver.sh "$PKG_VSN" --patch)"
     local SUFFIX=''
     if [[ "$PROFILE" = *-elixir ]]; then
         SUFFIX="-elixir"
diff --git a/scripts/parse-git-ref.sh b/scripts/parse-git-ref.sh
index 4cb138212..b0d01d2d3 100755
--- a/scripts/parse-git-ref.sh
+++ b/scripts/parse-git-ref.sh
@@ -20,7 +20,7 @@ if [[ $1 =~ ^refs/tags/v[5-9]+\.[0-9]+\.[0-9]+$ ]]; then
     PROFILE=emqx
     RELEASE=true
     LATEST=$(is_latest "$1")
-elif [[ $1 =~ ^refs/tags/v[5-9]+\.[0-9]+\.[0-9]+-patch\.[0-9]+$ ]]; then
+elif [[ $1 =~ ^refs/tags/v[5-9]+\.[0-9]+\.[0-9]+-build\.[0-9]+$ ]]; then
     PROFILE=emqx
     RELEASE=true
     LATEST=$(is_latest "$1")
@@ -28,7 +28,7 @@ elif [[ $1 =~ ^refs/tags/e[5-9]+\.[0-9]+\.[0-9]+$ ]]; then
     PROFILE=emqx-enterprise
     RELEASE=true
     LATEST=$(is_latest "$1")
-elif [[ $1 =~ ^refs/tags/e[5-9]+\.[0-9]+\.[0-9]+-patch\.[0-9]+$ ]]; then
+elif [[ $1 =~ ^refs/tags/e[5-9]+\.[0-9]+\.[0-9]+-build\.[0-9]+$ ]]; then
     PROFILE=emqx-enterprise
     RELEASE=true
     LATEST=$(is_latest "$1")
diff --git a/scripts/semver.sh b/scripts/semver.sh
index 065241355..5abf77fd6 100755
--- a/scripts/semver.sh
+++ b/scripts/semver.sh
@@ -6,21 +6,21 @@ function parseSemver() {
     local RE='^([0-9]+)\.([0-9]+)\.([0-9]+)(-([a-z]+\.[0-9]+))?$'
     echo "$1" | grep -qE "$RE" || exit 1
     #shellcheck disable=SC2155
-    local MAJOR=$(  echo "$1" | sed -r "s#$RE#\1#")
+    local MAJOR=$(echo "$1" | sed -r "s#$RE#\1#")
     #shellcheck disable=SC2155
-    local MINOR=$(  echo "$1" | sed -r "s#$RE#\2#")
+    local MINOR=$(echo "$1" | sed -r "s#$RE#\2#")
     #shellcheck disable=SC2155
-    local PATCH=$(  echo "$1" | sed -r "s#$RE#\3#")
+    local PATCH=$(echo "$1" | sed -r "s#$RE#\3#")
     #shellcheck disable=SC2155
-    local SPECIAL=$(echo "$1" | sed -r "s#$RE#\5#")
+    local BUILD=$(echo "$1" | sed -r "s#$RE#\5#")
     case "${2}" in
-        --major)   echo "${MAJOR}"   ;;
-        --minor)   echo "${MINOR}"   ;;
-        --patch)   echo "${PATCH}"   ;;
-        --special) echo "${SPECIAL}" ;;
+        --major) echo "${MAJOR}" ;;
+        --minor) echo "${MINOR}" ;;
+        --patch) echo "${PATCH}" ;;
+        --build) echo "${BUILD}" ;;
         *)
             cat <<EOF
-{"major": ${MAJOR}, "minor": ${MINOR}, "patch": ${PATCH}, "special": "${SPECIAL}"}
+{"major": ${MAJOR}, "minor": ${MINOR}, "patch": ${PATCH}, "build": "${BUILD}"}
 EOF
             ;;
     esac
diff --git a/scripts/shelltest/parse-git-ref.test b/scripts/shelltest/parse-git-ref.test
index 543ae4e8f..37bc9a560 100644
--- a/scripts/shelltest/parse-git-ref.test
+++ b/scripts/shelltest/parse-git-ref.test
@@ -23,7 +23,7 @@ Unrecognized git ref: e5.2.0-1
 {"profile": "emqx", "release": true, "latest": false}
 >>>= 0
 
-./parse-git-ref.sh refs/tags/v5.1.5-patch.1
+./parse-git-ref.sh refs/tags/v5.1.5-build.1
 >>>
 {"profile": "emqx", "release": true, "latest": false}
 >>>= 0
@@ -53,7 +53,7 @@ Unrecognized tag: refs/tags/v5.2.0-alpha-1
 {"profile": "emqx-enterprise", "release": true, "latest": false}
 >>>= 0
 
-./parse-git-ref.sh refs/tags/e5.1.5-patch.1
+./parse-git-ref.sh refs/tags/e5.1.5-build.1
 >>>
 {"profile": "emqx-enterprise", "release": true, "latest": false}
 >>>= 0
diff --git a/scripts/shelltest/semver.test b/scripts/shelltest/semver.test
index 60a85dce1..b04543cad 100644
--- a/scripts/shelltest/semver.test
+++ b/scripts/shelltest/semver.test
@@ -3,30 +3,30 @@
 
 ./semver.sh 5.1.0
 >>>
-{"major": 5, "minor": 1, "patch": 0, "special": ""}
+{"major": 5, "minor": 1, "patch": 0, "build": ""}
 >>>= 0
 
-./semver.sh 5.1.0-patch.3
+./semver.sh 5.1.0-build.3
 >>>
-{"major": 5, "minor": 1, "patch": 0, "special": "patch.3"}
+{"major": 5, "minor": 1, "patch": 0, "build": "build.3"}
 >>>= 0
 
-./semver.sh 5.1.0-patch.3 --major
+./semver.sh 5.1.0-build.3 --major
 >>>
 5
 >>>= 0
 
-./semver.sh 5.1.0-patch.3 --minor
+./semver.sh 5.1.0-build.3 --minor
 >>>
 1
 >>>= 0
 
-./semver.sh 5.1.0-patch.3 --patch
+./semver.sh 5.1.0-build.3 --patch
 >>>
 0
 >>>= 0
 
-./semver.sh 5.1.0-patch.3 --special
+./semver.sh 5.1.0-build.3 --build
 >>>
-patch.3
+build.3
 >>>= 0