diff --git a/build.sh b/build.sh
index 5d4083457..80ff4cdf2 100755
--- a/build.sh
+++ b/build.sh
@@ -34,6 +34,9 @@ $ sh build.sh build-repeater-firmwares
 Build all chat room server firmwares
 $ sh build.sh build-room-server-firmwares
 
+Build all kiss radio firmwares
+$ sh build.sh build-kiss-radio-firmwares
+
 Environment Variables:
   DISABLE_DEBUG=1: Disables all debug logging flags (MESH_DEBUG, MESH_PACKET_LOGGING, etc.)
                    If not set, debug flags from variant platformio.ini files are used.
@@ -242,6 +245,17 @@ build_room_server_firmwares() {
 
 }
 
+build_kiss_modem_firmwares() {
+
+#  # build specific kiss radio firmwares
+#  build_firmware "Heltec_v3_kiss_modem"
+#  build_firmware "RAK_4631_kiss_modem"
+
+  # build all room server firmwares
+  build_all_firmwares_by_suffix "_kiss_modem"
+
+}
+
 build_firmwares() {
   build_companion_firmwares
   build_repeater_firmwares
@@ -278,6 +292,8 @@ elif [[ $1 == "build-repeater-firmwares" ]]; then
   build_repeater_firmwares
 elif [[ $1 == "build-room-server-firmwares" ]]; then
   build_room_server_firmwares
+elif [[ $1 == "build-kiss-radio-firmwares" ]]; then
+  build_kiss_modem_firmwares
 elif [[ $1 == "get-companion-firmwares-to-build" ]]; then
   get_pio_envs_ending_with_string "_companion_radio_usb"
   get_pio_envs_ending_with_string "_companion_radio_ble"
diff --git a/variants/lilygo_techo_card/platformio.ini b/variants/lilygo_techo_card/platformio.ini
index 4ebf43da9..17ba8d1b2 100644
--- a/variants/lilygo_techo_card/platformio.ini
+++ b/variants/lilygo_techo_card/platformio.ini
@@ -119,3 +119,8 @@ lib_deps =
   ${LilyGo_T-Echo_Card.lib_deps}
   end2endzone/NonBlockingRTTTL@^1.3.0
   densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_T-Echo_Card_kiss_modem]
+extends = LilyGo_T-Echo_Card
+build_src_filter = ${LilyGo_T-Echo_Card.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_teth_elite/platformio.ini b/variants/lilygo_teth_elite/platformio.ini
index ee1b98795..2debb0396 100644
--- a/variants/lilygo_teth_elite/platformio.ini
+++ b/variants/lilygo_teth_elite/platformio.ini
@@ -98,3 +98,8 @@ build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter}
 lib_deps =
   ${LilyGo_TETH_Elite_sx1262.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_TETH_Elite_sx1262_kiss_modem]
+extends = LilyGo_TETH_Elite_sx1262
+build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/meshtracker_x1/platformio.ini b/variants/meshtracker_x1/platformio.ini
index 1ce8bf17a..2194d48d9 100644
--- a/variants/meshtracker_x1/platformio.ini
+++ b/variants/meshtracker_x1/platformio.ini
@@ -130,3 +130,8 @@ lib_deps = ${MeshTracker_X1.lib_deps}
   stevemarple/MicroNMEA @ ^2.0.6
   end2endzone/NonBlockingRTTTL@^1.3.0
   adafruit/Adafruit DRV2605 Library @ ^1.2.4
+
+[env:MeshTracker_X1_kiss_modem]
+extends = MeshTracker_X1
+build_src_filter = ${MeshTracker_X1.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/sensecap_indicator-espnow/platformio.ini b/variants/sensecap_indicator-espnow/platformio.ini
index e643d0339..a5952d6e3 100644
--- a/variants/sensecap_indicator-espnow/platformio.ini
+++ b/variants/sensecap_indicator-espnow/platformio.ini
@@ -33,7 +33,7 @@ lib_deps=${esp32_base.lib_deps}
   lovyan03/LovyanGFX @ ^1.2.7
 
 [env:SenseCapIndicator-ESPNow_comp_radio_usb]
-extends =SenseCapIndicator-ESPNow
+extends = SenseCapIndicator-ESPNow
 build_flags =
   ${SenseCapIndicator-ESPNow.build_flags}
   -I examples/companion_radio/ui-new
@@ -47,4 +47,4 @@ build_src_filter = ${SenseCapIndicator-ESPNow.build_src_filter}
   +<../examples/companion_radio/*.cpp>
 lib_deps =
   ${SenseCapIndicator-ESPNow.lib_deps}
-  densaugeo/base64 @ ~1.4.0
\ No newline at end of file
+  densaugeo/base64 @ ~1.4.0
diff --git a/variants/sensecap_solar/platformio.ini b/variants/sensecap_solar/platformio.ini
index 6e0eadbcb..70405218f 100644
--- a/variants/sensecap_solar/platformio.ini
+++ b/variants/sensecap_solar/platformio.ini
@@ -101,3 +101,8 @@ build_src_filter = ${SenseCap_Solar.build_src_filter}
 lib_deps =
   ${SenseCap_Solar.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:SenseCap_Solar_kiss_modem]
+extends = SenseCap_Solar
+build_src_filter = ${SenseCap_Solar.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini
index 753aee7ab..bdb7ee0c3 100644
--- a/variants/station_g2/platformio.ini
+++ b/variants/station_g2/platformio.ini
@@ -229,7 +229,7 @@ build_flags =
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-  -D OFFLINE_QUEUE_SIZE=256  
+  -D OFFLINE_QUEUE_SIZE=256
 ; -D MESH_PACKET_LOGGING=1
 ; -D MESH_DEBUG=1
 build_src_filter = ${Station_G2.build_src_filter}
@@ -242,10 +242,8 @@ lib_deps =
 
 [env:Station_G2_kiss_modem]
 extends = Station_G2
-build_unflags =
-  -DARDUINO_USB_MODE=0
 build_flags =
   ${Station_G2.build_flags}
-  -DARDUINO_USB_MODE=1
+  -D ARDUINO_USB_MODE=1
 build_src_filter = ${Station_G2.build_src_filter}
   +<../examples/kiss_modem/>