diff --git a/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini
index a72b8c61e..dfbd91876 100644
--- a/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini
+++ b/variants/nrf52840/diy/nrf52_promicro_diy_tcxo/platformio.ini
@@ -20,6 +20,18 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/diy/nrf52_promicro_diy_tcxo>
 debug_tool = jlink
 
+; TEMPORARY: drop BSEC2 + its BME68x driver. This image is ~2.3 KB OVER the 0xEA000
+; warm-store cap and has been failing the nrf52_warm_region guard on develop since
+; 2026-08-05. Unlike the RAK boards there is no Ethernet stack to reclaim here -- nrf52_base
+; already filters mesh/eth, mesh/api and mesh/wifi, and HAS_ETHERNET defaults to 0 -- so the
+; sensor library is what has to go. BME680Sensor is gated on __has_include(<bsec2.h>), so
+; ignoring the libraries compiles it out. Revert once the environmental sensor roster is
+; opt-in per board rather than linked into every target.
+lib_ignore =
+  ${nrf52_base.lib_ignore}
+  bsec2
+  BME68x Sensor library
+
 ; NRF52 ProMicro w/ E-Ink display
 [env:nrf52_promicro_diy-inkhud]
 board_level = extra
diff --git a/variants/nrf52840/rak4631/platformio.ini b/variants/nrf52840/rak4631/platformio.ini
index 69eed83ea..70095f334 100644
--- a/variants/nrf52840/rak4631/platformio.ini
+++ b/variants/nrf52840/rak4631/platformio.ini
@@ -23,19 +23,14 @@ build_flags = ${nrf52840_base.build_flags}
   -DRADIOLIB_EXCLUDE_LR2021=1
 build_src_filter = ${nrf52_base.build_src_filter} \
   +<../variants/nrf52840/rak4631> \
-  +<mesh/eth/> \
-  +<mesh/api/> \
   +<mqtt/> \
   -<graphics/EInkDisplay2.cpp> \
   -<graphics/EInkDynamicDisplay.cpp> \
   -<graphics/fonts/EinkDisplayFonts.cpp>
-lib_deps = 
+lib_deps =
   ${nrf52840_base.lib_deps}
-  ${networking_base.lib_deps}
   # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028
   melopero/Melopero RV3028@1.2.0
-  # renovate: datasource=github-tags depName=RAK13800-W5100S packageName=RAKWireless/RAK13800-W5100S
-  https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.3.zip
   # renovate: datasource=custom.pio depName=RAK NCP5623 RGB LED packageName=rakwireless/library/RAKwireless NCP5623 RGB LED library
   rakwireless/RAKwireless NCP5623 RGB LED library@1.0.3
   # renovate: datasource=custom.pio depName=RAK12035_SoilMoisture packageName=beegee-tokyo/library/RAK12035_SoilMoisture
@@ -68,9 +63,9 @@ build_flags =
   -DLOW_VDD_SYSTEMOFF_DELAY_MS=5000
   -DSAFE_VDD_VOLTAGE_THRESHOLD_MV=2900
   -DSAFE_VDD_VOLTAGE_THRESHOLD_HYST_MV=100
-build_src_filter = ${env:rak4631.build_src_filter}
-  -<mesh/eth/>
-  -<mesh/api/>
+; env:rak4631 no longer pulls in mesh/eth or mesh/api, so the negations that used to live
+; here are redundant -- this env now inherits an Ethernet-free src filter with MQTT retained,
+; unchanged.
 
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds
diff --git a/variants/nrf52840/rak4631/variant.h b/variants/nrf52840/rak4631/variant.h
index 9c3e10d6e..105b3af5c 100644
--- a/variants/nrf52840/rak4631/variant.h
+++ b/variants/nrf52840/rak4631/variant.h
@@ -290,11 +290,8 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 // VDD=3.3V AIN3=6/8*VDD=2.47V VBAT=1.66*AIN3=4.1V
 #define BATTERY_LPCOMP_THRESHOLD NRF_LPCOMP_REF_SUPPLY_11_16
 
-#if defined(WISMESH_POCKET)
+// General-purpose RAK4631 builds disable Ethernet; use env:rak4631_eth_gw for RAK13800 W5100S.
 #define HAS_ETHERNET 0
-#else
-#define HAS_ETHERNET 1
-#endif
 
 #define RAK_4631 1
 
diff --git a/variants/nrf52840/rak4631_eth_gw/platformio.ini b/variants/nrf52840/rak4631_eth_gw/platformio.ini
index 7bad13a88..8c4ece2c4 100644
--- a/variants/nrf52840/rak4631_eth_gw/platformio.ini
+++ b/variants/nrf52840/rak4631_eth_gw/platformio.ini
@@ -1,5 +1,14 @@
 ; The very slick RAK wireless RAK 4631 / 4630 board - Unified firmware for 5005/19003, with or without OLED RAK 1921
 [env:rak4631_eth_gw]
+custom_meshtastic_hw_model = 9
+custom_meshtastic_hw_model_slug = RAK4631
+custom_meshtastic_architecture = nrf52840
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 1
+custom_meshtastic_display_name = RAK WisBlock 4631
+custom_meshtastic_images = rak4631.svg, rak4631_case.svg
+custom_meshtastic_tags = RAK
+
 extends = nrf52840_base
 board_level = release
 board = wiscore_rak4631
@@ -40,8 +49,10 @@ lib_deps =
 ; Allows programming and debug via the RAK NanoDAP as the default debugger tool for the RAK4631 (it is only $10!)
 ; programming time is about the same as the bootloader version.
 ; For information on this see the meshtastic developers documentation for "Development on the NRF52"
+; Extends env:rak4631_eth_gw, not env:rak4631: it already takes that env's build_flags and
+; lib_deps, and only the gateway env still compiles mesh/eth + mesh/api.
 [env:rak4631_eth_gw_dbg]
-extends = env:rak4631
+extends = env:rak4631_eth_gw
 board_level = extra
 
 ; if the builtin version of openocd has a buggy version of semihosting, so use the external version