diff --git a/Makefile b/Makefile
index 775bbcaeef..0c59b95e4c 100644
--- a/Makefile
+++ b/Makefile
@@ -232,7 +232,7 @@ docker-centos-build-stop:
 .PHONY: docker-centos-build
 .PHONY: docker-centos-build-stop
 
-DOCKER_ALPINE_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3
+DOCKER_ALPINE_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5
 
 define dockerAlpineBuildCmd
 set -o xtrace
@@ -313,7 +313,7 @@ REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
 VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
                 git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
 
-image:
+image: clean
 	DEBUG=$(DEBUG) ARCH=$(ARCH) TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: image
diff --git a/build/docker/multi-arch/Dockerfile.esxi-agent b/build/docker/multi-arch/Dockerfile.esxi-agent
index 6f3ebe91ca..d4b4bb422b 100644
--- a/build/docker/multi-arch/Dockerfile.esxi-agent
+++ b/build/docker/multi-arch/Dockerfile.esxi-agent
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-4-arm64 as build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud
diff --git a/build/docker/multi-arch/Dockerfile.host b/build/docker/multi-arch/Dockerfile.host
index ce5e26a8a0..6bda435f5a 100644
--- a/build/docker/multi-arch/Dockerfile.host
+++ b/build/docker/multi-arch/Dockerfile.host
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-4-arm64 as build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud
diff --git a/build/docker/multi-arch/Dockerfile.torrent b/build/docker/multi-arch/Dockerfile.torrent
index aac1eed477..2e944799c3 100644
--- a/build/docker/multi-arch/Dockerfile.torrent
+++ b/build/docker/multi-arch/Dockerfile.torrent
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-4-arm64 as build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud
diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh
index 83dfe10c3f..c718c92635 100755
--- a/scripts/docker_push.sh
+++ b/scripts/docker_push.sh
@@ -39,10 +39,10 @@ TAG=${TAG:-latest}
 
 build_bin() {
     local BUILD_ARCH=$2
-    local BUILD_CC=$3
-    local BUILD_CGO=$4
+    local BUILD_CGO=$3
     case "$1" in
         baremetal-agent)
+        echo GOOS=linux make cmd/$1
             GOOS=linux make cmd/$1
             ;;
         climc)
@@ -50,16 +50,16 @@ build_bin() {
                 -v $SRC_DIR:/root/go/src/yunion.io/x/onecloud \
                 -v $SRC_DIR/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \
                 -v $SRC_DIR/_output/alpine-build/_cache:/root/.cache \
-                registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 \
-                /bin/sh -c "set -ex; cd /root/go/src/yunion.io/x/onecloud; $BUILD_ARCH $BUILD_CC $BUILD_CGO GOOS=linux make cmd/$1 cmd/*cli; chown -R $(id -u):$(id -g) _output"
+                registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 \
+                /bin/sh -c "set -ex; cd /root/go/src/yunion.io/x/onecloud; $BUILD_ARCH $BUILD_CGO GOOS=linux make cmd/$1 cmd/*cli; chown -R $(id -u):$(id -g) _output"
             ;;
         *)
             docker run --rm \
                 -v $SRC_DIR:/root/go/src/yunion.io/x/onecloud \
                 -v $SRC_DIR/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \
                 -v $SRC_DIR/_output/alpine-build/_cache:/root/.cache \
-                registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 \
-                /bin/sh -c "set -ex; cd /root/go/src/yunion.io/x/onecloud; $BUILD_ARCH $BUILD_CC $BUILD_CGO GOOS=linux make cmd/$1; chown -R $(id -u):$(id -g) _output"
+                registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 \
+                /bin/sh -c "set -ex; cd /root/go/src/yunion.io/x/onecloud; $BUILD_ARCH $BUILD_CGO GOOS=linux make cmd/$1; chown -R $(id -u):$(id -g) _output"
             ;;
     esac
 }
@@ -112,7 +112,7 @@ build_process_with_buildx() {
     img_name="$REGISTRY/$component:$TAG"
     if [[ "$arch" == arm64 ]]; then
         img_name="$img_name-$arch"
-        build_env="$build_env CC=aarch64-linux-musl-gcc"
+        build_env="$build_env"
         if [[ $component == host ]]; then
             build_env="$build_env CGO_ENABLED=1"
         fi
@@ -161,7 +161,7 @@ for component in $COMPONENTS; do
                 build_process_with_buildx $component $arch
             done
             ;;
-        arm64|amd64)
+        arm64 )
             build_process_with_buildx $component $ARCH
             ;;
         *)