diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
index 382975e9f..1f17bc691 100644
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -43,6 +43,7 @@ lib_deps =
   ${arduino_base.lib_deps}
   ${networking_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
   h2zero/NimBLE-Arduino@^1.4.2
   https://github.com/dbSuS/libpax.git#7bcd3fcab75037505be9b122ab2b24cc5176b587
diff --git a/arch/esp32/esp32c6.ini b/arch/esp32/esp32c6.ini
index 53d7f92ec..3f8b1bdbe 100644
--- a/arch/esp32/esp32c6.ini
+++ b/arch/esp32/esp32c6.ini
@@ -23,6 +23,7 @@ lib_deps =
   ${arduino_base.lib_deps}
   ${networking_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   lewisxhe/XPowersLib@^0.2.6
   https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
   rweather/Crypto@^0.4.0
diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
index 99b38900b..ff0cfcbf5 100644
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -21,6 +21,7 @@ build_src_filter =
 
 lib_deps=
   ${arduino_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto@^0.4.0
 
 lib_ignore =
diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 39d1c0b8c..04fd6db09 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -23,6 +23,7 @@ build_src_filter =
 lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto@^0.4.0
   https://github.com/lovyan03/LovyanGFX.git#1401c28a47646fe00538d487adcb2eb3c72de805
 
diff --git a/arch/rp2xx0/rp2040.ini b/arch/rp2xx0/rp2040.ini
index c004a3bec..17b5df618 100644
--- a/arch/rp2xx0/rp2040.ini
+++ b/arch/rp2xx0/rp2040.ini
@@ -22,4 +22,5 @@ lib_ignore =
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto
\ No newline at end of file
diff --git a/arch/rp2xx0/rp2350.ini b/arch/rp2xx0/rp2350.ini
index 7ef6332e3..33bb36ad1 100644
--- a/arch/rp2xx0/rp2350.ini
+++ b/arch/rp2xx0/rp2350.ini
@@ -21,4 +21,5 @@ lib_ignore =
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
+  ${radiolib_base.lib_deps}
   rweather/Crypto
diff --git a/arch/stm32/stm32.ini b/arch/stm32/stm32.ini
index 715e8aa73..7e211496d 100644
--- a/arch/stm32/stm32.ini
+++ b/arch/stm32/stm32.ini
@@ -30,8 +30,9 @@ upload_protocol = stlink
 lib_deps =
   ${env.lib_deps}
   charlesbaynham/OSFS@^1.2.3
+  jgromes/RadioLib@7.0.2
   https://github.com/caveman99/Crypto.git#f61ae26a53f7a2d0ba5511625b8bf8eff3a35d5e
 
 lib_ignore =
-  mathertel/OneButton@~2.6.1
+  mathertel/OneButton@2.6.1
   Wire
\ No newline at end of file
diff --git a/platformio.ini b/platformio.ini
index 6df9f4724..f7c73c190 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -88,7 +88,6 @@ build_flags = -Wno-missing-field-initializers
 monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
-	jgromes/RadioLib@7.0.2
 	https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95
 	mathertel/OneButton@2.6.1
 	https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
@@ -96,6 +95,7 @@ lib_deps =
 	https://github.com/meshtastic/ArduinoThread.git#1ae8778c85d0a2a729f989e0b1e7d7c4dc84eef0
 	nanopb/Nanopb@0.4.9
 	erriez/ErriezCRC32@1.0.1
+
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
 check_skip_packages = yes
@@ -121,6 +121,10 @@ lib_deps =
 	arduino-libraries/NTPClient@3.1.0
 	arcao/Syslog@2.0.0
 
+[radiolib_base]
+lib_deps =
+	jgromes/RadioLib@7.1.0
+
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
 [environmental_base]
diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index ba3050e9a..1a274aa28 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -170,8 +170,6 @@
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_VISION_MASTER_E213
 #elif defined(HELTEC_VISION_MASTER_E290)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_VISION_MASTER_E290
-#elif defined(HELTEC_MESH_NODE_T114)
-#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114
 #elif defined(SENSECAP_INDICATOR)
 #define HW_VENDOR meshtastic_HardwareModel_SENSECAP_INDICATOR
 #elif defined(SEEED_XIAO_S3)