diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 77c97180..4d785abf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,27 +38,14 @@ 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 }} --environment $BOARD_ENV
+                  pio run -e ${{ matrix.board }}
 
             - name: Build FS
               run: |
-                  pio run --target buildfs -e ${{ matrix.board }} --environment $BOARD_ENV
+                  pio run --target buildfs -e ${{ matrix.board }}
 
             - name: Move Files
               run: |
@@ -73,7 +60,7 @@ jobs:
             - name: Merge for web flashing
               run: |
                   python3 -m pip install esptool
-                  python3 -m esptool --chip $BOARD_ENV merge_bin -o installer/web_factory.bin --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 installer/firmware/bootloader.bin 0x9000 installer/firmware/partitions.bin 0xe000 installer/firmware/boot_app0.bin 0x10000 installer/firmware/firmware.bin 0x3D0000 installer/firmware/spiffs.bin
+                  python3 -m esptool merge_bin -o installer/web_factory.bin --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 installer/firmware/bootloader.bin 0x9000 installer/firmware/partitions.bin 0xe000 installer/firmware/boot_app0.bin 0x10000 installer/firmware/firmware.bin 0x3D0000 installer/firmware/spiffs.bin
 
             - name: Install Zip
               run: sudo apt-get install zip
diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
index 4b7433f7..21778d53 100644
--- a/.github/workflows/commit.yml
+++ b/.github/workflows/commit.yml
@@ -40,21 +40,8 @@ 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 }} --environment $BOARD_ENV
+              run: pio run -e ${{ matrix.board }}
 
             - name: Build FS
-              run: pio run --target buildfs -e ${{ matrix.board }} --environment $BOARD_ENV
\ No newline at end of file
+              run: pio run --target buildfs -e ${{ matrix.board }}
\ No newline at end of file