diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
index 2bb63aa9..28311042 100644
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -142,7 +142,8 @@ lib_deps =
           ${esp32_ota.lib_deps}
           ; PsychicMqttClient - unified MQTT client with WebSocket support
           elims/PsychicMqttClient@^0.2.4
-          bblanchon/ArduinoJson @ 6.17.3
+          ; Using latest ArduinoJson (7.x) - compatible with CayenneLPP without patching
+          bblanchon/ArduinoJson
           arduino-libraries/NTPClient
           JChristensen/Timezone
 
diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini
index 20a60248..55a235f9 100644
--- a/variants/station_g2/platformio.ini
+++ b/variants/station_g2/platformio.ini
@@ -1,7 +1,6 @@
 [Station_G2]
 extends = esp32_base
 board = station-g2
-board_build.partitions = huge_app.csv
 build_flags =
   ${esp32_base.build_flags}
   ${sensor_base.build_flags}
@@ -43,6 +42,7 @@ lib_deps =
 
 [env:Station_G2_repeater]
 extends = Station_G2
+board_build.partitions = default_16MB.csv ; standard 16MB partition table (compatible with MQTT bridge)
 build_flags =
   ${Station_G2.build_flags}
   -D ADVERT_NAME='"Station G2 Repeater"'
@@ -245,6 +245,7 @@ lib_deps =
 
 [env:Station_G2_repeater_bridge_mqtt]
 extends = Station_G2
+board_build.partitions = default_16MB.csv ; standard 16MB partition table
 build_flags =
   ${Station_G2.build_flags}
   -D ADVERT_NAME='"MQTT Bridge"'
@@ -276,6 +277,7 @@ lib_deps =
   ${esp32_ota.lib_deps}
   ; PsychicMqttClient - unified MQTT client with WebSocket support
   elims/PsychicMqttClient@^0.2.4
-  bblanchon/ArduinoJson @ 6.17.3
+  ; Using latest ArduinoJson (7.x) - compatible with CayenneLPP without patching
+  bblanchon/ArduinoJson
   arduino-libraries/NTPClient
   JChristensen/Timezone