diff --git a/.github/workflows/release-ghcr-main.yml b/.github/workflows/release-ghcr-main.yml
deleted file mode 100644
index 1952e8d8d..000000000
--- a/.github/workflows/release-ghcr-main.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright The ORAS Authors.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: release-ghcr-main
-
-on:
-  push:
-    branches: [main]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: prepare
-        id: prepare
-        run: |
-          BRANCH_NAME=${GITHUB_REF#refs/heads/}
-          echo "ref=ghcr.io/${{ github.repository }}:${BRANCH_NAME}" >> $GITHUB_OUTPUT
-      - name: docker login
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: docker build
-        run: |          
-          docker buildx create --use
-          docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/s390x,linux/ppc64le -t ${{ steps.prepare.outputs.ref }} --push .
-      - name: clear
-        if: always()
-        run: |
-          rm -f ${HOME}/.docker/config.json
diff --git a/.github/workflows/release-ghcr.yml b/.github/workflows/release-ghcr.yml
index b6904c68a..edda1217d 100644
--- a/.github/workflows/release-ghcr.yml
+++ b/.github/workflows/release-ghcr.yml
@@ -15,8 +15,8 @@ name: release-ghcr
 
 on:
   push:
-    tags:
-      - v*
+    tags: [v*]
+    branches: [main]
 
 jobs:
   build:
@@ -26,18 +26,14 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: prepare
         id: prepare
         run: |
-          VERSION=${GITHUB_REF#refs/*/}
-          BRANCH_NAME=${GITHUB_REF#refs/heads/}
-          if [[ "${VERSION}" == "${BRANCH_NAME}" ]]; then
-            VERSION=$(git rev-parse --short HEAD)
-          fi
-          echo "ref=ghcr.io/${{ github.repository }}:${VERSION}" >> $GITHUB_OUTPUT
+          TAG=${GITHUB_REF#refs/*/} # get branch or tag as image tag
+          echo "ref=ghcr.io/${{ github.repository }}:${TAG}" >> $GITHUB_OUTPUT
       - name: docker login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}