diff --git a/Dockerfile b/Dockerfile
index f05e0642..48190375 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:experimental
+
 # build frontend
 FROM node:19-alpine as frontend
 ARG API_HOST
diff --git a/Makefile b/Makefile
index 2d7f244c..03a1376d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ RELEASE_DARWIN_AMD64 = $(RELEASE_ROOT)/darwin-amd64/$(TARGET)
 RELEASE_DARWIN_ARM64 = $(RELEASE_ROOT)/darwin-arm64/$(TARGET)
 RELEASE_WINDOWS_AMD64 = $(RELEASE_ROOT)/windows-amd64/$(TARGET)
 
-BUILD_VERSION := $(shell git describe --tags | cut -f 1 -d "-")
+BUILD_VERSION := $(shell git describe --tags --always | cut -f1 -f2 -d "-")
 BUILD_DATE := $(shell date +'%Y-%m-%d %H:%M:%S')
 SHA_SHORT := $(shell git rev-parse --short HEAD)
 
diff --git a/build-image.sh b/build-image.sh
new file mode 100755
index 00000000..dba722d3
--- /dev/null
+++ b/build-image.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+# eg.1 : sh build-image.sh
+# eg.2, set image: sh build-image.sh bitbus/paopao-ce
+
+VERSION=`git describe --tags --always | cut -f1 -f2 -d "-"` # eg.: 0.2.5
+IMAGE="bitbus/paopao-ce"
+
+if [ -n "$1" ]; then
+  IMAGE="$1"
+fi
+if [ -n "$2" ]; then
+  VERSION="$2"
+fi
+
+# build image
+docker buildx build \
+  --build-arg USE_DIST="yes" \
+  --tag "$IMAGE:${VERSION}" \
+  --tag "$IMAGE:latest" \
+  . -f Dockerfile
+
+# push to image rep
+# if [ -n "$1" ]; then
+#   docker push "$IMAGE:${VERSION}"
+#   docker push "$IMAGE:latest"
+# fi