diff --git a/.github/actions/setup-build-environment/action.yml b/.github/actions/setup-build-environment/action.yml
index 7703c1ef..bc690e58 100644
--- a/.github/actions/setup-build-environment/action.yml
+++ b/.github/actions/setup-build-environment/action.yml
@@ -23,9 +23,12 @@ runs:
 
     # a git tag of "room-server-v1.2.3" should set "v1.2.3" as GIT_TAG_VERSION
     # a git tag of "wio-tracker-v1.15-plus.1.3" should set "v1.15-plus.1.3" as GIT_TAG_VERSION
-    # Strip the shortest prefix ending with "-v" so hyphens in the version are preserved.
+    # a git tag of "v1.11" should set "v1.11" as GIT_TAG_VERSION
     - name: Extract Version from Git Tag
       shell: bash
       run: |
         GIT_TAG_NAME="${GITHUB_REF#refs/tags/}"
-        echo "GIT_TAG_VERSION=v${GIT_TAG_NAME#*-v}" >> $GITHUB_ENV
+        case "$GIT_TAG_NAME" in
+          v*) echo "GIT_TAG_VERSION=${GIT_TAG_NAME}" >> $GITHUB_ENV ;;
+          *)  echo "GIT_TAG_VERSION=v${GIT_TAG_NAME#*-v}" >> $GITHUB_ENV ;;
+        esac
diff --git a/.github/workflows/build-wio-tracker-l1-firmwares.yml b/.github/workflows/build-wio-tracker-l1-firmwares.yml
index 06fe7b07..169a2211 100644
--- a/.github/workflows/build-wio-tracker-l1-firmwares.yml
+++ b/.github/workflows/build-wio-tracker-l1-firmwares.yml
@@ -21,9 +21,6 @@ jobs:
       - name: Clone Repo
         uses: actions/checkout@v4
 
-      - name: Extract Version from Git Tag
-        run: echo "GIT_TAG_VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
-
       - name: Setup Build Environment
         uses: ./.github/actions/setup-build-environment
 
@@ -45,9 +42,6 @@ jobs:
       - name: Clone Repo
         uses: actions/checkout@v4
 
-      - name: Extract Version from Git Tag
-        run: echo "GIT_TAG_VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
-
       - name: Setup Build Environment
         uses: ./.github/actions/setup-build-environment