diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml
index 0f12c1ac3..640b94b2c 100644
--- a/.github/workflows/build-multiarch.yaml
+++ b/.github/workflows/build-multiarch.yaml
@@ -5,7 +5,6 @@ on:
     branches:
       - 'master'
       - 'release*'
-      - '*'
     tags:
       - 'v*'
   pull_request:
diff --git a/hack/docker_build.sh b/hack/docker_build.sh
index d75aec639..404d5120a 100755
--- a/hack/docker_build.sh
+++ b/hack/docker_build.sh
@@ -40,7 +40,6 @@ if [[ $? != 0 ]]; then
   echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 fi
 
-TAG=$TAG-multiarch
 docker build -f build/ks-apiserver/Dockerfile -t $REPO/ks-apiserver:$TAG .
 docker push $REPO/ks-apiserver:$TAG
 # print the full docker image path for your convience
diff --git a/hack/docker_build_multiarch.sh b/hack/docker_build_multiarch.sh
index d617922b9..febbcf826 100644
--- a/hack/docker_build_multiarch.sh
+++ b/hack/docker_build_multiarch.sh
@@ -40,12 +40,13 @@ if [[ $? != 0 ]]; then
   echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 fi
 
+TAG=$TAG-multiarch
 docker buildx build --platform=${BUILDPLATFORM} \
                     -f build/Dockerfile \
-                    -t $REPO/ks-apiserver-multiarch:$TAG . \
+                    -t $REPO/ks-apiserver:$TAG . \
                     --target=ks-apiserver --push
 
 docker buildx build --platform=${BUILDPLATFORM} \
                     -f build/Dockerfile \
-                    -t $REPO/ks-controller-manager-multiarch:$TAG . \
+                    -t $REPO/ks-controller-manager:$TAG . \
                     --target=ks-controller-manager --push
\ No newline at end of file