diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml
index 2fd983352..f8161ae76 100644
--- a/.github/workflows/build-multiarch.yaml
+++ b/.github/workflows/build-multiarch.yaml
@@ -39,4 +39,4 @@ jobs:
         if: github.event_name == 'push'
         run: |
           echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-          REPO=kubespheredev TAG="${GITHUB_REF#refs/heads/}-multiarch" make container-cross-push
+          REPO=kubespheredev TAG="${GITHUB_REF#refs/*/}-multiarch" make container-cross-push
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 78d8eaa42..a0cb3e117 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,4 +64,4 @@ jobs:
         if: github.event_name == 'push'
         run: |
           echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-          REPO=kubespheredev TAG=${GITHUB_REF#refs/heads/} make container-push
+          REPO=kubespheredev TAG=${GITHUB_REF#refs/*/} make container-push