diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5f1f222b4f1..a9f55dca5a3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -61,10 +61,10 @@ jobs:
         id: vars
         run: |
           if [[ "${{ inputs.release-tag }}" == "" ]]; then
-            TAG=${{ inputs.release-tag }}
+            TAG=${GITHUB_REF#refs/*/}
             echo "tag=${TAG}" >> $GITHUB_OUTPUT
           else 
-            TAG=${GITHUB_REF#refs/*/}
+            TAG="${{ inputs.release-tag }}"
             echo "tag=${TAG}" >> $GITHUB_OUTPUT
           fi