diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3144e5c..fadd402 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,7 +7,8 @@ on:
 
 env:
   MRS_TOOLCHAIN: MRS_Toolchain_Linux_x64_V1.91
-  BUILD_DIR: build
+  USBC_BUILD_DIR: usb-c
+  MICROB_BUILD_DIR: micro-b
   BIN_TYPES: '{.bin,.elf}'
 
 jobs:
@@ -32,13 +33,15 @@ jobs:
       - name: Build firmware
         run: |
           export PREFIX=${{ env.MRS_TOOLCHAIN }}/RISC-V_Embedded_GCC/bin/riscv-none-embed-
-          export BUILD_DIR=${{ env.BUILD_DIR }}
-          make -j$(nproc)
+          BUILD_DIR=${{ env.USBC_BUILD_DIR }} USBC_VERSION=1 make -j$(nproc)
+          BUILD_DIR=${{ env.MICROB_BUILD_DIR }} make -j$(nproc)
 
       - uses: actions/upload-artifact@v4
         with:
           name: badgemagic-firmware
-          path: ${{ env.BUILD_DIR }}/badgemagic-*
+          path: |
+            ${{ env.USBC_BUILD_DIR }}/badgemagic-*
+            ${{ env.MICROB_BUILD_DIR }}/badgemagic-*
 
       # Skip upload APK for pull requests & only allow binaries build from master
       - if: ${{ github.event_name != 'pull_request' && github.ref_name == 'master' }}
@@ -47,10 +50,9 @@ jobs:
           git config --global user.name "${{ github.workflow }}"
           git config --global user.email "gh-actions@${{ github.repository_owner }}"
 
-          mv ${{ env.BUILD_DIR }}/badgemagic-*${{ env.BIN_TYPES }} ./
-          
           git checkout --orphan bin
           git reset
-          git add badgemagic-*${{ env.BIN_TYPES }}
+          git add ${{ env.USBC_BUILD_DIR }}/badgemagic-*${{ env.BIN_TYPES }}
+          git add ${{ env.MICROB_BUILD_DIR }}/badgemagic-*${{ env.BIN_TYPES }}
           git commit -am "[Auto] Update firmware binaries from ${{ github.ref_name }} ($(date +%Y-%m-%d.%H:%M:%S))"
           git push --force origin bin
diff --git a/Makefile b/Makefile
index 749073b..80b3acc 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@ TARGET = badgemagic-ch582
 ######################################
 # Uncomment below line to enable debugging
 # DEBUG = 1
+# Uncomment below to build for USB-C version
+# USBC_VERSION = 1
 # optimization for size
 OPT = -Os
 
@@ -120,6 +122,10 @@ ifeq ($(DEBUG), 1)
 CFLAGS += -g -gdwarf-2 -DDEBUG=$(DEBUG)
 endif
 
+ifeq ($(USBC_VERSION), 1)
+CFLAGS += -DUSBC_VERSION=$(USBC_VERSION)
+endif
+
 
 # Generate dependency information
 CFLAGS += -MMD -MP
diff --git a/src/leddrv.c b/src/leddrv.c
index ebf0edd..4a428ba 100644
--- a/src/leddrv.c
+++ b/src/leddrv.c
@@ -88,7 +88,11 @@ static const pinctrl_t led_pins[LED_PINCOUNT] = {
 	PINCTRL(B, 4),  // Q
 	PINCTRL(B, 2),  // R
 	PINCTRL(B, 1),  // S
+#ifdef USBC_VERSION
+	PINCTRL(B, 6), // T
+#else
 	PINCTRL(B, 23), // T
+#endif
 	PINCTRL(B, 21), // U
 	PINCTRL(B, 20), // V
 	PINCTRL(B, 19), // W