diff --git a/.github/actions/setup-build-environment/action.yml b/.github/actions/setup-build-environment/action.yml
index 2ba7617e..7703c1ef 100644
--- a/.github/actions/setup-build-environment/action.yml
+++ b/.github/actions/setup-build-environment/action.yml
@@ -22,8 +22,10 @@ runs:
         pip install --upgrade platformio
 
     # 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.
     - name: Extract Version from Git Tag
       shell: bash
       run: |
         GIT_TAG_NAME="${GITHUB_REF#refs/tags/}"
-        echo "GIT_TAG_VERSION=${GIT_TAG_NAME##*-}" >> $GITHUB_ENV
+        echo "GIT_TAG_VERSION=v${GIT_TAG_NAME#*-v}" >> $GITHUB_ENV
diff --git a/build.sh b/build.sh
index 8fc513d2..6e2e8cfb 100755
--- a/build.sh
+++ b/build.sh
@@ -231,11 +231,8 @@ build_companion_firmwares() {
 }
 
 build_wio_tracker_l1_firmwares() {
-  local _saved_version="$FIRMWARE_VERSION"
-  export FIRMWARE_VERSION="${FIRMWARE_VERSION}-Plus"
   build_firmware "WioTrackerL1_companion_radio_usb_settings"
   build_firmware "WioTrackerL1_companion_radio_ble_settings"
-  export FIRMWARE_VERSION="$_saved_version"
 }
 
 build_room_server_firmwares() {