diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 166d712f..62e2dd18 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -123,23 +123,23 @@ jobs:
           DOCKER_CLI_EXPERIMENTAL: enabled
         run: |
           IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,}
-          TAG=${{ github.ref_name }}${{ github.event.inputs.tag }}
+          TAG=${{ github.ref_name }}
           SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}
           VERSION=${{ env.VERSION }}
           [[ -f linux-amd64.Dockerfile ]]  && AMD64=${SOURCE}-linux-amd64
           [[ -f linux-arm64.Dockerfile ]]  && ARM64=${SOURCE}-linux-arm64
           [[ -f linux-arm-v7.Dockerfile ]] && ARMV7=${SOURCE}-linux-arm-v7
-          docker manifest create ${IMAGE}:${TAG} ${AMD64} ${ARM64} ${ARMV7}
-          docker manifest push ${IMAGE}:${TAG}
-          docker manifest create ${IMAGE}:${TAG}-${GITHUB_SHA:0:7} ${AMD64} ${ARM64} ${ARMV7}
-          docker manifest push ${IMAGE}:${TAG}-${GITHUB_SHA:0:7}
+          docker manifest create ${IMAGE}:${TAG}${{ github.event.inputs.tag }} ${AMD64} ${ARM64} ${ARMV7}
+          docker manifest push ${IMAGE}:${TAG}${{ github.event.inputs.tag }}
+          docker manifest create ${IMAGE}:${TAG}-${GITHUB_SHA:0:7}${{ github.event.inputs.tag }} ${AMD64} ${ARM64} ${ARMV7}
+          docker manifest push ${IMAGE}:${TAG}-${GITHUB_SHA:0:7}${{ github.event.inputs.tag }}
       - name: Latest manifest
         if: ${{ github.event.release.target_commitish == 'master' }}
         env:
           DOCKER_CLI_EXPERIMENTAL: enabled
         run: |
           IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,}
-          TAG=${{ github.ref_name }}${{ github.event.inputs.tag }}
+          TAG=${{ github.ref_name }}
           SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}
           [[ -f linux-amd64.Dockerfile ]] && AMD64=${SOURCE}-linux-amd64
           [[ -f linux-arm64.Dockerfile ]] && ARM64=${SOURCE}-linux-arm64