diff --git a/.github/workflows/build-wio-tracker-l1-firmwares.yml b/.github/workflows/build-wio-tracker-l1-firmwares.yml
index 5fb9d633..caf5545d 100644
--- a/.github/workflows/build-wio-tracker-l1-firmwares.yml
+++ b/.github/workflows/build-wio-tracker-l1-firmwares.yml
@@ -14,29 +14,54 @@ env:
 
 jobs:
 
-  build:
+  build-oled:
     runs-on: ubuntu-latest
     steps:
 
       - name: Clone Repo
         uses: actions/checkout@v4
+        with:
+          ref: wio-tracker-l1-improvements
 
       - name: Setup Build Environment
         uses: ./.github/actions/setup-build-environment
 
-      - name: Build Firmwares
+      - name: Build Dual OLED Firmware
         env:
           FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
         run: /usr/bin/env bash build.sh build-wio-tracker-l1-firmwares
 
-      - name: Upload Workflow Artifacts
+      - name: Upload OLED Firmware
         uses: actions/upload-artifact@v4
         with:
-          name: wio-tracker-l1-firmwares
+          name: wio-tracker-l1-oled-firmware
+          path: out
+
+  build-eink:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Clone Repo
+        uses: actions/checkout@v4
+        with:
+          ref: eink-ui
+
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build-environment
+
+      - 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
+
+      - name: Upload E-ink Firmware
+        uses: actions/upload-artifact@v4
+        with:
+          name: wio-tracker-l1-eink-firmware
           path: out
 
   release:
-    needs: [build]
+    needs: [build-oled, build-eink]
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     steps:
@@ -44,10 +69,16 @@ jobs:
       - name: Extract Version from Git Tag
         run: echo "GIT_TAG_VERSION=v${GITHUB_REF_NAME#*-v}" >> $GITHUB_ENV
 
-      - name: Download Firmwares
+      - name: Download OLED Firmware
         uses: actions/download-artifact@v4
         with:
-          name: wio-tracker-l1-firmwares
+          name: wio-tracker-l1-oled-firmware
+          path: out
+
+      - name: Download E-ink Firmware
+        uses: actions/download-artifact@v4
+        with:
+          name: wio-tracker-l1-eink-firmware
           path: out
 
       - name: Create Release