diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index c2c83077..ef1d192d 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -123,7 +123,7 @@ jobs:
           DOCKER_CLI_EXPERIMENTAL: enabled
         run: |
           IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,}
-          TAG=${{ github.ref_name }}
+          TAG=${{ github.ref_name }}${{ github.event.inputs.tag }}
           SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}
           VERSION=${{ env.VERSION }}
           [[ -f linux-amd64.Dockerfile ]]  && AMD64=${SOURCE}-linux-amd64
@@ -139,7 +139,7 @@ jobs:
           DOCKER_CLI_EXPERIMENTAL: enabled
         run: |
           IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,}
-          TAG=${{ github.ref_name }}
+          TAG=${{ github.ref_name }}${{ github.event.inputs.tag }}
           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