diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index d8e14e3..43a027c 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -172,6 +172,7 @@ jobs:
           PLATFORMS="`docker manifest inspect ${{ env.BASE_IMAGE }} | jq -r '.manifests[] | "\(.platform.os)/\(.platform.architecture)"' | sort -u | paste -sd ','`"
           echo "PLATFORMS=${PLATFORMS}" >> $GITHUB_ENV
           GIT_BRANCH="${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
+          GIT_BRANCH="${GIT_BRANCH#refs/tags/}"
           echo "GIT_BRANCH=${GIT_BRANCH}" >> $GITHUB_ENV
           OS_TAG="`echo ${BASE_IMAGE} | sed 's|:|_|g'`"
           echo "OS_TAG=${OS_TAG}" >> $GITHUB_ENV