diff --git a/variants/nrf52840/nrf52.ini b/variants/nrf52840/nrf52.ini
index 9a261daa31..435a3b85a1 100644
--- a/variants/nrf52840/nrf52.ini
+++ b/variants/nrf52840/nrf52.ini
@@ -9,7 +9,7 @@ platform_packages =
   # renovate: datasource=git-refs depName=meshtastic/Adafruit_nRF52_Arduino packageName=https://github.com/meshtastic/Adafruit_nRF52_Arduino gitBranch=master
   platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#0fd295f13203e93df19d578073646ec32f2bf45a
   ; Don't renovate toolchain-gccarmnoneeabi
-  platformio/toolchain-gccarmnoneeabi@1.90301.200702
+  platformio/toolchain-gccarmnoneeabi@1.120301.0
 
 extra_scripts =
   ${env.extra_scripts}
diff --git a/variants/nrf52840/rak3401_1watt/platformio.ini b/variants/nrf52840/rak3401_1watt/platformio.ini
index c61aa9dace..7d1b821435 100644
--- a/variants/nrf52840/rak3401_1watt/platformio.ini
+++ b/variants/nrf52840/rak3401_1watt/platformio.ini
@@ -31,10 +31,10 @@ lib_deps =
   melopero/Melopero RV3028@1.2.0
   # 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
-  beegee-tokyo/RAK12035_SoilMoisture@1.0.4
   # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main
   https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip
+  ; TODO: Replace with RAKWireless-official when https://github.com/RAKWireless/RAK12035_SoilMoisture/pull/3 is merged
+  https://github.com/vidplace7/RAK12035_SoilMoisture/archive/56594a0c918460b48ba6ff0b16c06a75f75e7a40.zip
 
 ; RAK10729 WisMesh Repeater Mini V2 HP (RAK3401 + RAK19007 + RAK13302 + solar battery)
 [env:rak_wismesh_repeater_mini_hp]
diff --git a/variants/nrf52840/rak3401_lr2021/platformio.ini b/variants/nrf52840/rak3401_lr2021/platformio.ini
index be70ebb9af..ccc841e319 100644
--- a/variants/nrf52840/rak3401_lr2021/platformio.ini
+++ b/variants/nrf52840/rak3401_lr2021/platformio.ini
@@ -31,7 +31,7 @@ lib_deps =
   melopero/Melopero RV3028@1.2.0
   # 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
-  beegee-tokyo/RAK12035_SoilMoisture@1.0.4
   # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main
   https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip
+  ; TODO: Replace with RAKWireless-official when https://github.com/RAKWireless/RAK12035_SoilMoisture/pull/3 is merged
+  https://github.com/vidplace7/RAK12035_SoilMoisture/archive/56594a0c918460b48ba6ff0b16c06a75f75e7a40.zip
diff --git a/variants/nrf52840/rak4631/platformio.ini b/variants/nrf52840/rak4631/platformio.ini
index 70095f334a..860d4c5201 100644
--- a/variants/nrf52840/rak4631/platformio.ini
+++ b/variants/nrf52840/rak4631/platformio.ini
@@ -33,10 +33,10 @@ lib_deps =
   melopero/Melopero RV3028@1.2.0
   # 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
-  beegee-tokyo/RAK12035_SoilMoisture@1.0.4
   # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main
   https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip
+  ; TODO: Replace with RAKWireless-official when https://github.com/RAKWireless/RAK12035_SoilMoisture/pull/3 is merged
+  https://github.com/vidplace7/RAK12035_SoilMoisture/archive/56594a0c918460b48ba6ff0b16c06a75f75e7a40.zip
 
 ; RAK10728 WisMesh Repeater Mini V2 (RAK4631 + RAK19003 + solar battery + GPS module)
 [env:rak_wismesh_repeater_mini]
diff --git a/variants/nrf52840/rak4631_epaper/platformio.ini b/variants/nrf52840/rak4631_epaper/platformio.ini
index 5548596fdc..894c16989e 100644
--- a/variants/nrf52840/rak4631_epaper/platformio.ini
+++ b/variants/nrf52840/rak4631_epaper/platformio.ini
@@ -24,8 +24,8 @@ lib_deps =
   rakwireless/RAKwireless NCP5623 RGB LED library@1.0.3
   # renovate: datasource=custom.pio depName=RAK12034 packageName=beegee-tokyo/library/RAKwireless RAK12034
   beegee-tokyo/RAKwireless RAK12034@1.0.0
-  # renovate: datasource=custom.pio depName=RAK12035_SoilMoisture packageName=beegee-tokyo/library/RAK12035_SoilMoisture
-  beegee-tokyo/RAK12035_SoilMoisture@1.0.4
+  ; TODO: Replace with RAKWireless-official when https://github.com/RAKWireless/RAK12035_SoilMoisture/pull/3 is merged
+  https://github.com/vidplace7/RAK12035_SoilMoisture/archive/56594a0c918460b48ba6ff0b16c06a75f75e7a40.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ;upload_protocol = jlink
diff --git a/variants/nrf52840/rak4631_epaper_onrxtx/platformio.ini b/variants/nrf52840/rak4631_epaper_onrxtx/platformio.ini
index af57ea3cdf..648c68504c 100644
--- a/variants/nrf52840/rak4631_epaper_onrxtx/platformio.ini
+++ b/variants/nrf52840/rak4631_epaper_onrxtx/platformio.ini
@@ -25,8 +25,8 @@ lib_deps =
   rakwireless/RAKwireless NCP5623 RGB LED library@1.0.3
   # renovate: datasource=custom.pio depName=RAK12034 packageName=beegee-tokyo/library/RAKwireless RAK12034
   beegee-tokyo/RAKwireless RAK12034@1.0.0
-  # renovate: datasource=custom.pio depName=RAK12035_SoilMoisture packageName=beegee-tokyo/library/RAK12035_SoilMoisture
-  beegee-tokyo/RAK12035_SoilMoisture@1.0.4
+  ; TODO: Replace with RAKWireless-official when https://github.com/RAKWireless/RAK12035_SoilMoisture/pull/3 is merged
+  https://github.com/vidplace7/RAK12035_SoilMoisture/archive/56594a0c918460b48ba6ff0b16c06a75f75e7a40.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ;upload_protocol = jlink
diff --git a/variants/nrf52840/rak_wismeshtap/platformio.ini b/variants/nrf52840/rak_wismeshtap/platformio.ini
index bbf700c1fc..a7aa8d8e65 100644
--- a/variants/nrf52840/rak_wismeshtap/platformio.ini
+++ b/variants/nrf52840/rak_wismeshtap/platformio.ini
@@ -41,8 +41,8 @@ lib_deps =
   beegee-tokyo/RAKwireless RAK12034@1.0.0
   # renovate: datasource=custom.pio depName=RAK14014-FT6336U packageName=beegee-tokyo/library/RAK14014-FT6336U
   beegee-tokyo/RAK14014-FT6336U@1.0.1
-  # renovate: datasource=custom.pio depName=RAK12035_SoilMoisture packageName=beegee-tokyo/library/RAK12035_SoilMoisture
-  beegee-tokyo/RAK12035_SoilMoisture@1.0.4
+  ; TODO: Replace with RAKWireless-official when https://github.com/RAKWireless/RAK12035_SoilMoisture/pull/3 is merged
+  https://github.com/vidplace7/RAK12035_SoilMoisture/archive/56594a0c918460b48ba6ff0b16c06a75f75e7a40.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ;upload_protocol = jlink