diff --git a/platformio.ini b/platformio.ini
index b8da2904..4309fc98 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -203,11 +203,11 @@ lib_deps =
   adafruit/Adafruit BME680 Library @ ^2.0.4
   adafruit/Adafruit BMP085 Library @ ^1.2.4
 
-; Lean nRF52 LoRa OTA roles use this complete external-sensor trim. Board-native
-; radio, display, buttons, battery monitoring, and other board telemetry remain.
-[nrf52_no_external_sensors]
+; Lean nRF52 LoRa OTA roles with onboard GPS use this external-sensor trim.
+; Board-native GPS, radio, display, buttons, battery monitoring, and other board
+; telemetry remain.
+[nrf52_no_external_sensors_keep_gps]
 build_flags =
-  -UENV_INCLUDE_GPS
   -UENV_INCLUDE_AHTX0
   -UENV_INCLUDE_BME280
   -UENV_INCLUDE_BMP280
@@ -224,6 +224,14 @@ build_flags =
   -UENV_INCLUDE_BMP085
   -UENV_INCLUDE_RAK12035
   -UENV_INCLUDE_BME680_BSEC
+lib_deps =
+  stevemarple/MicroNMEA @ ^2.0.6
+
+; Lean nRF52 LoRa OTA roles without onboard GPS also remove the GPS provider.
+[nrf52_no_external_sensors]
+build_flags =
+  ${nrf52_no_external_sensors_keep_gps.build_flags}
+  -UENV_INCLUDE_GPS
 
 ; ----------------- TESTING ---------------------
 
diff --git a/variants/gat562_30s_mesh_kit/platformio.ini b/variants/gat562_30s_mesh_kit/platformio.ini
index d537d30c..fb8a0674 100644
--- a/variants/gat562_30s_mesh_kit/platformio.ini
+++ b/variants/gat562_30s_mesh_kit/platformio.ini
@@ -55,7 +55,7 @@ build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter}
 extends = GAT562_30S_Mesh_Kit
 build_flags =
   ${GAT562_30S_Mesh_Kit.build_flags}
-  ${nrf52_no_external_sensors.build_flags}
+  ${nrf52_no_external_sensors_keep_gps.build_flags}
   -D ENV_INCLUDE_GPS=1              ; onboard GPS remains available in the lean LoRa-OTA build
   -D DISPLAY_CLASS=SSD1306Display
   -D ADVERT_NAME='"GAT562 Repeater"'
@@ -68,7 +68,9 @@ build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter}
   +<../examples/simple_repeater>
 lib_deps =
   ${nrf52_lora_ota.lib_deps}
+  ${nrf52_no_external_sensors_keep_gps.lib_deps}
   adafruit/Adafruit SSD1306 @ ^2.5.13
+  sparkfun/SparkFun u-blox GNSS Arduino Library@^2.2.27
 
 
 [env:GAT562_30S_Mesh_Kit_room_server]
diff --git a/variants/gat562_mesh_tracker_pro/platformio.ini b/variants/gat562_mesh_tracker_pro/platformio.ini
index 18eeb9b3..5cd83271 100644
--- a/variants/gat562_mesh_tracker_pro/platformio.ini
+++ b/variants/gat562_mesh_tracker_pro/platformio.ini
@@ -51,7 +51,7 @@ build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter}
 extends = GAT562_Mesh_Tracker_Pro
 build_flags =
   ${GAT562_Mesh_Tracker_Pro.build_flags}
-  ${nrf52_no_external_sensors.build_flags}
+  ${nrf52_no_external_sensors_keep_gps.build_flags}
   -D ENV_INCLUDE_GPS=1              ; onboard GPS remains available in the lean LoRa-OTA build
   -D DISPLAY_CLASS=SSD1306Display
   -D ADVERT_NAME='"GAT562 Repeater"'
@@ -64,6 +64,7 @@ build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter}
   +<../examples/simple_repeater>
 lib_deps =
   ${nrf52_lora_ota.lib_deps}
+  ${nrf52_no_external_sensors_keep_gps.lib_deps}
   adafruit/Adafruit SSD1306 @ ^2.5.13
 
 
diff --git a/variants/heltec_t096/platformio.ini b/variants/heltec_t096/platformio.ini
index 33a27c11..822b5b71 100644
--- a/variants/heltec_t096/platformio.ini
+++ b/variants/heltec_t096/platformio.ini
@@ -84,7 +84,7 @@ build_src_filter = ${Heltec_t096.build_src_filter}
   +<../examples/simple_repeater>
 build_flags =
   ${Heltec_t096.build_flags}
-  ${nrf52_no_external_sensors.build_flags}
+  ${nrf52_no_external_sensors_keep_gps.build_flags}
   -D ENV_INCLUDE_GPS=1              ; onboard GPS remains available in the lean LoRa-OTA build
   -D ADVERT_NAME='"Heltec_t096 Repeater"'
   -D ADVERT_LAT=0.0
@@ -93,6 +93,7 @@ build_flags =
   -D MAX_NEIGHBOURS=50
 lib_deps =
   ${nrf52_lora_ota.lib_deps}
+  ${nrf52_no_external_sensors_keep_gps.lib_deps}
   bodmer/TFT_eSPI @ ^2.4.31
 
 [env:Heltec_t096_repeater_bridge_rs232]
@@ -121,7 +122,7 @@ build_src_filter = ${Heltec_t096.build_src_filter}
 extends = Heltec_t096
 build_flags =
   ${Heltec_t096.build_flags}
-  ${nrf52_no_external_sensors.build_flags}
+  ${nrf52_no_external_sensors_keep_gps.build_flags}
   -D ENV_INCLUDE_GPS=1              ; onboard GPS remains available in the lean LoRa-OTA build
   -D ADVERT_NAME='"RS232 Bridge"'
   -D ADVERT_LAT=0.0
@@ -136,6 +137,7 @@ build_src_filter = ${Heltec_t096.build_src_filter}
   +<../examples/simple_repeater>
 lib_deps =
   ${nrf52_lora_ota.lib_deps}
+  ${nrf52_no_external_sensors_keep_gps.lib_deps}
   bodmer/TFT_eSPI @ ^2.4.31
 
 [env:Heltec_t096_room_server]
diff --git a/variants/heltec_t1/platformio.ini b/variants/heltec_t1/platformio.ini
index 238b7027..cae8639e 100644
--- a/variants/heltec_t1/platformio.ini
+++ b/variants/heltec_t1/platformio.ini
@@ -55,7 +55,7 @@ build_src_filter = ${Heltec_t1.build_src_filter}
   +<../examples/simple_repeater>
 build_flags =
   ${Heltec_t1.build_flags}
-  ${nrf52_no_external_sensors.build_flags}
+  ${nrf52_no_external_sensors_keep_gps.build_flags}
   -D ENV_INCLUDE_GPS=1              ; onboard GPS remains available in the lean LoRa-OTA build
   -D ADVERT_NAME='"Heltec_t1 Repeater"'
   -D ADVERT_LAT=0.0
@@ -67,6 +67,7 @@ build_flags =
   -D OTA_FOLDER_SERIAL
 lib_deps =
   ${nrf52_lora_ota.lib_deps}
+  ${nrf52_no_external_sensors_keep_gps.lib_deps}
   bodmer/TFT_eSPI @ ^2.4.31
 
 [env:Heltec_t1_room_server]
diff --git a/variants/heltec_t114/platformio.ini b/variants/heltec_t114/platformio.ini
index f6c2aca3..108aec6b 100644
--- a/variants/heltec_t114/platformio.ini
+++ b/variants/heltec_t114/platformio.ini
@@ -181,7 +181,7 @@ build_src_filter = ${Heltec_t114_with_display.build_src_filter}
   +<../examples/simple_repeater>
 build_flags =
   ${Heltec_t114_with_display.build_flags}
-  ${nrf52_no_external_sensors.build_flags}
+  ${nrf52_no_external_sensors_keep_gps.build_flags}
   -D ENV_INCLUDE_GPS=1              ; onboard GPS remains available in the lean LoRa-OTA build
   -D ADVERT_NAME='"Heltec_T114 Repeater"'
   -D ADVERT_LAT=0.0
@@ -190,6 +190,7 @@ build_flags =
   -D MAX_NEIGHBOURS=50
 lib_deps =
   ${nrf52_lora_ota.lib_deps}
+  ${nrf52_no_external_sensors_keep_gps.lib_deps}
   adafruit/Adafruit SSD1306 @ ^2.5.13
 
 [env:Heltec_t114_repeater_bridge_rs232]
diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini
index 262ce600..48652578 100644
--- a/variants/wio-tracker-l1/platformio.ini
+++ b/variants/wio-tracker-l1/platformio.ini
@@ -52,7 +52,7 @@ build_src_filter = ${WioTrackerL1.build_src_filter}
   +<../examples/simple_repeater>
 build_flags =
   ${WioTrackerL1.build_flags}
-  ${nrf52_no_external_sensors.build_flags}
+  ${nrf52_no_external_sensors_keep_gps.build_flags}
   -D ENV_INCLUDE_GPS=1              ; onboard GPS remains available in the lean LoRa-OTA build
   -D ADVERT_NAME='"WioTrackerL1 Repeater"'
   -D ADMIN_PASSWORD='"password"'
@@ -62,6 +62,7 @@ build_flags =
   -D ENV_PIN_SCL=PIN_WIRE1_SCL
 lib_deps =
   ${nrf52_lora_ota.lib_deps}
+  ${nrf52_no_external_sensors_keep_gps.lib_deps}
   adafruit/Adafruit SH110X @ ^2.1.13
   adafruit/Adafruit GFX Library @ ^1.12.1
   adafruit/RTClib @ ^2.1.3