diff --git a/.github/workflows/build-tagging.yml b/.github/workflows/build-tagging.yml
index d0791a7a..681eebd5 100644
--- a/.github/workflows/build-tagging.yml
+++ b/.github/workflows/build-tagging.yml
@@ -22,8 +22,9 @@ jobs:
         run: |
           # `github.head_ref` only exists for pull_request events
           REF="${{ github.head_ref || github.ref }}"
-          VERSION="${REF#release/}"
-          VERSION="${VERSION#refs/tags/}"
+          VERSION="${REF#refs/tags/}"
+          VERSION="${VERSION#refs/heads/}"
+          VERSION="${VERSION#release/}"
 
           echo "Version: $VERSION"
           echo "VERSION=$VERSION" >> $GITHUB_ENV
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3a366e6d..9e4c0257 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,11 +54,7 @@ jobs:
         # since docker push actions will override the previous images,
         # so need to build `linux/amd64` and push first,
         # then build `linux/amd64` twice with other archs (build very slow so keep it last).
-        target:
-          - linux/amd64
-          - linux/amd64
-          - linux/arm64
-          - linux/arm/v7
+        target: ["linux/amd64", "linux/amd64,linux/arm64,linux/arm/v7"]
     with:
       version: ${{ needs.tagging.outputs.version }}
       dry_run: ${{ inputs.dry_run || false }}