diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 02a8052b..478348dd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,19 +14,19 @@ jobs:
                     - "ttgo-lora32-v21"
                     - "heltec-lora32-v2"
                     - "heltec_wifi_lora_32_V3"
+                    - "heltec_wireless_stick"
+                    - "heltec_ht-ct62"
                     - "ESP32_DIY_LoRa"
                     - "ESP32_DIY_1W_LoRa"
                     - "ttgo-t-beam-v1_2"
                     - "ttgo-t-beam-v1"
                     - "ttgo-t-beam-v1_SX1268"
                     - "ttgo-t-beam-v1_2_SX1262"
-                    - "heltec_wireless_tracker"
-                    - "heltec_wireless_stick"
-                    - "heltec_ht-ct62"
                     - "ESP32_DIY_LoRa_A7670"
-                    - "ttgo-lora32-v21-915"
+                    - "heltec_wireless_tracker"
                     - "OE5HWN_MeshCom"
                     - "WEMOS-LOLIN32-OLED-DIY"
+                    - "ttgo-lora32-v21-915"
                 board_type:
                     - "esp32"
                     - "esp32s3"
diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
index d933ab3f..7b5e1453 100644
--- a/.github/workflows/commit.yml
+++ b/.github/workflows/commit.yml
@@ -15,19 +15,19 @@ jobs:
                     - "ttgo-lora32-v21"
                     - "heltec-lora32-v2"
                     - "heltec_wifi_lora_32_V3"
+                    - "heltec_wireless_stick"
+                    - "heltec_ht-ct62"
                     - "ESP32_DIY_LoRa"
                     - "ESP32_DIY_1W_LoRa"
                     - "ttgo-t-beam-v1_2"
                     - "ttgo-t-beam-v1"
                     - "ttgo-t-beam-v1_SX1268"
                     - "ttgo-t-beam-v1_2_SX1262"
-                    - "heltec_wireless_tracker"
-                    - "heltec_wireless_stick"
-                    - "heltec_ht-ct62"
                     - "ESP32_DIY_LoRa_A7670"
-                    - "ttgo-lora32-v21-915"
+                    - "heltec_wireless_tracker"
                     - "OE5HWN_MeshCom"
                     - "WEMOS-LOLIN32-OLED-DIY"
+                    - "ttgo-lora32-v21-915"
                 board_type:
                     - "esp32"
                     - "esp32s3"
diff --git a/platformio.ini b/platformio.ini
index bf8942e0..7f847cf0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -81,6 +81,34 @@ lib_deps =
 	adafruit/Adafruit SSD1306 @ 2.5.7
 
 
+[env:heltec_wireless_stick]
+board = heltec_wifi_lora_32_V3
+board_build.mcu = esp32s3
+build_flags =
+	-Werror -Wall
+	-DHELTEC_WS
+	-DHAS_SX1262
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps =
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.5
+	adafruit/Adafruit SSD1306 @ 2.5.7
+
+
+[env:heltec_ht-ct62]
+board = heltec_wireless_stick_lite
+board_build.mcu = esp32c3
+build_flags =
+	-Werror -Wall
+	-DHELTEC_HTCT62
+	-DHAS_SX1262
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps =
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.5
+	adafruit/Adafruit SSD1306 @ 2.5.7
+
+
 [env:ESP32_DIY_LoRa]
 board = esp32dev
 build_flags =
@@ -167,60 +195,6 @@ lib_deps =
 	lewisxhe/XPowersLib@^0.1.8
 
 
-[env:OE5HWN_MeshCom]
-board = esp32dev
-build_flags =
-	-Werror -Wall
-	-DOE5HWN_MeshCom
-	-DHAS_SX1268
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps =
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.5
-	adafruit/Adafruit SSD1306 @ 2.5.7
-
-
-[env:heltec_wireless_stick]
-board = heltec_wifi_lora_32_V3
-board_build.mcu = esp32s3
-build_flags =
-	-Werror -Wall
-	-DHELTEC_WS
-	-DHAS_SX1262
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps =
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.5
-	adafruit/Adafruit SSD1306 @ 2.5.7
-
-
-[env:heltec_ht-ct62]
-board = heltec_wireless_stick_lite
-board_build.mcu = esp32c3
-build_flags =
-	-Werror -Wall
-	-DHELTEC_HTCT62
-	-DHAS_SX1262
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps =
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.5
-	adafruit/Adafruit SSD1306 @ 2.5.7
-
-
-[env:WEMOS-LOLIN32-OLED-DIY]
-board = lolin32
-build_flags =
-	-Werror -Wall
-	-DWEMOS_LOLIN32_OLED_DIY_LoRa
-	-DHAS_SX1278
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps =
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.5
-	adafruit/Adafruit SSD1306 @ 2.5.7
-
-
 [env:ESP32_DIY_LoRa_A7670]
 board = esp32dev
 build_flags = 
@@ -236,19 +210,6 @@ lib_deps =
 	vshymanskyy/StreamDebugger@^1.0.1
 
 
-[env:ttgo-lora32-v21-915]
-board = ttgo-lora32-v21
-build_flags =
-	-Werror -Wall
-	-DTTGO_T_LORA32_V2_1_915
-	-DHAS_SX1276
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps =
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.5
-	adafruit/Adafruit SSD1306 @ 2.5.7
-
-
 [env:heltec_wireless_tracker]
 board = esp32-s3-devkitc-1
 board_build.mcu = esp32s3
@@ -284,4 +245,43 @@ build_flags =
 	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
 lib_deps =
 	${common.lib_deps}
-	bodmer/TFT_eSPI@^2.5.43
\ No newline at end of file
+	bodmer/TFT_eSPI@^2.5.43
+
+
+[env:OE5HWN_MeshCom]
+board = esp32dev
+build_flags =
+	-Werror -Wall
+	-DOE5HWN_MeshCom
+	-DHAS_SX1268
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps =
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.5
+	adafruit/Adafruit SSD1306 @ 2.5.7
+
+
+[env:WEMOS-LOLIN32-OLED-DIY]
+board = lolin32
+build_flags =
+	-Werror -Wall
+	-DWEMOS_LOLIN32_OLED_DIY_LoRa
+	-DHAS_SX1278
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps =
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.5
+	adafruit/Adafruit SSD1306 @ 2.5.7
+
+
+[env:ttgo-lora32-v21-915]
+board = ttgo-lora32-v21
+build_flags =
+	-Werror -Wall
+	-DTTGO_T_LORA32_V2_1_915
+	-DHAS_SX1276
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps =
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.5
+	adafruit/Adafruit SSD1306 @ 2.5.7
\ No newline at end of file