diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1eb0d04f..77c97180 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,14 +38,27 @@ jobs:
 
             - name: Install PlatformIO Core
               run: pip install --upgrade platformio
+            
+            - name: Determine board type
+              run: |
+                if [[ "${{ matrix.board }}" == "heltec_wifi_lora_32_V3" || "${{ matrix.board }}" == "heltec_wireless_tracker" || "${{ matrix.board }}" == "heltec_wireless_stick" || "${{ matrix.board }}" == "heltec_wireless_stick_lite_v3" ]]; then
+                  export BOARD_ENV="esp32s3"
+                else
+                  if [[ "${{ matrix.board }}" == "heltec_ht-ct62" ]]; then
+                    export BOARD_ENV="esp32c3"
+                  else
+                    export BOARD_ENV="esp32"
+                  fi
+                fi
+              shell: bash
 
             - name: Build target
               run: |
-                  pio run -e ${{ matrix.board }}
+                  pio run -e ${{ matrix.board }} --environment $BOARD_ENV
 
             - name: Build FS
               run: |
-                  pio run --target buildfs -e ${{ matrix.board }}
+                  pio run --target buildfs -e ${{ matrix.board }} --environment $BOARD_ENV
 
             - name: Move Files
               run: |
@@ -56,7 +69,7 @@ jobs:
                   cp .pio/build/${{ matrix.board }}/partitions.bin installer/firmware/
                   cp .pio/build/${{ matrix.board }}/spiffs.bin installer/firmware/
                   cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin installer/firmware/
-            
+              
             - name: Merge for web flashing
               run: |
                   python3 -m pip install esptool
diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
index 21778d53..4b7433f7 100644
--- a/.github/workflows/commit.yml
+++ b/.github/workflows/commit.yml
@@ -40,8 +40,21 @@ jobs:
             - name: Install PlatformIO Core
               run: pip install --upgrade platformio
 
+            - name: Determine board type
+              run: |
+                if [[ "${{ matrix.board }}" == "heltec_wifi_lora_32_V3" || "${{ matrix.board }}" == "heltec_wireless_tracker" || "${{ matrix.board }}" == "heltec_wireless_stick" || "${{ matrix.board }}" == "heltec_wireless_stick_lite_v3" ]]; then
+                  export BOARD_ENV="esp32s3"
+                else
+                  if [[ "${{ matrix.board }}" == "heltec_ht-ct62" ]]; then
+                    export BOARD_ENV="esp32c3"
+                  else
+                    export BOARD_ENV="esp32"
+                  fi
+                fi
+              shell: bash
+
             - name: Build target
-              run: pio run -e ${{ matrix.board }}
+              run: pio run -e ${{ matrix.board }} --environment $BOARD_ENV
 
             - name: Build FS
-              run: pio run --target buildfs -e ${{ matrix.board }}
\ No newline at end of file
+              run: pio run --target buildfs -e ${{ matrix.board }} --environment $BOARD_ENV
\ No newline at end of file