diff --git a/.github/workflows/build-wio-tracker-l1-firmwares.yml b/.github/workflows/build-wio-tracker-l1-firmwares.yml
index caf5545d..7c030d84 100644
--- a/.github/workflows/build-wio-tracker-l1-firmwares.yml
+++ b/.github/workflows/build-wio-tracker-l1-firmwares.yml
@@ -20,8 +20,9 @@ jobs:
 
       - name: Clone Repo
         uses: actions/checkout@v4
-        with:
-          ref: wio-tracker-l1-improvements
+
+      - name: Extract Version from Git Tag
+        run: echo "GIT_TAG_VERSION=v${GITHUB_REF_NAME#*-v}" >> $GITHUB_ENV
 
       - name: Setup Build Environment
         uses: ./.github/actions/setup-build-environment
@@ -29,7 +30,7 @@ jobs:
       - name: Build Dual OLED Firmware
         env:
           FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
-        run: /usr/bin/env bash build.sh build-wio-tracker-l1-firmwares
+        run: /usr/bin/env bash build.sh build-firmware WioTrackerL1_companion_dual
 
       - name: Upload OLED Firmware
         uses: actions/upload-artifact@v4
@@ -43,8 +44,9 @@ jobs:
 
       - name: Clone Repo
         uses: actions/checkout@v4
-        with:
-          ref: eink-ui
+
+      - name: Extract Version from Git Tag
+        run: echo "GIT_TAG_VERSION=v${GITHUB_REF_NAME#*-v}" >> $GITHUB_ENV
 
       - name: Setup Build Environment
         uses: ./.github/actions/setup-build-environment
@@ -52,7 +54,7 @@ jobs:
       - name: Build Dual E-ink Firmware
         env:
           FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
-        run: /usr/bin/env bash build.sh build-firmware WioTrackerL1Eink_companion_radio_dual
+        run: /usr/bin/env bash build.sh build-firmware WioTrackerL1Eink_companion_dual
 
       - name: Upload E-ink Firmware
         uses: actions/upload-artifact@v4
diff --git a/build.sh b/build.sh
index d34877cc..04cae57c 100755
--- a/build.sh
+++ b/build.sh
@@ -231,7 +231,7 @@ build_companion_firmwares() {
 }
 
 build_wio_tracker_l1_firmwares() {
-  build_firmware "WioTrackerL1_companion_radio_dual_settings"
+  build_firmware "WioTrackerL1_companion_dual"
 }
 
 build_room_server_firmwares() {
diff --git a/variants/wio-tracker-l1-eink/platformio.ini b/variants/wio-tracker-l1-eink/platformio.ini
index 0bb891db..b75c9a27 100644
--- a/variants/wio-tracker-l1-eink/platformio.ini
+++ b/variants/wio-tracker-l1-eink/platformio.ini
@@ -60,7 +60,7 @@ extends = WioTrackerL1Eink
 extra_scripts = post:create-uf2.py
 
 ; Dual BLE+USB
-[env:WioTrackerL1Eink_companion_radio_dual]
+[env:WioTrackerL1Eink_companion_dual]
 extends = WioTrackerL1Eink
 build_flags = ${WioTrackerL1Eink.build_flags}
   -D DUAL_SERIAL=1
diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini
index 1e2325ed..7a68484e 100644
--- a/variants/wio-tracker-l1/platformio.ini
+++ b/variants/wio-tracker-l1/platformio.ini
@@ -145,7 +145,7 @@ build_flags = ${WioTrackerL1CompanionBLE.build_flags}
 [env:WioTrackerL1_companion_radio_dual]
 extends = WioTrackerL1CompanionDual
 
-[env:WioTrackerL1_companion_radio_dual_settings]
+[env:WioTrackerL1_companion_dual]
 extends = WioTrackerL1CompanionDual
 build_flags = ${WioTrackerL1CompanionDual.build_flags}
   -D UI_HAS_JOYSTICK_UPDOWN=1