diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
index c92ef9ae9..56fcf91fb 100644
--- a/.github/workflows/build-image.yaml
+++ b/.github/workflows/build-image.yaml
@@ -58,7 +58,7 @@ jobs:
          echo $BRANCH
          echo $TAG
          TMP=$TAG
-         if [[ $TAG == v* ]]
+         if [[ $TMP == v* ]]
          then
            # Its a version tag
            TMP=${TAG:1:${#TAG}}
@@ -67,8 +67,8 @@ jobs:
            docker push $IMAGE:latest
          fi
          # Has tag
-         docker tag $IMAGE_NAME:$BRANCH_NAME $IMAGE_NAME:$TAG
-         docker push $IMAGE_NAME:$TAG
+         docker tag $IMAGE_NAME:$BRANCH_NAME $IMAGE_NAME:$TMP
+         docker push $IMAGE_NAME:$TMP
        if: startsWith(github.ref, 'refs/tags')
        env:
          IMAGE: ${{ steps.get_repo.outputs.IMAGE }}