diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
index a79ebda48..8e0d2f1b8 100644
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -1,7 +1,7 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
-; platform = nordicnrf52 ;pending https://github.com/platformio/builder-framework-arduino-nrf5/pull/7
-platform = https://github.com/meshtastic/platform-nordicnrf52.git#merge
+platform = platformio/nordicnrf52@^9.4.0
+; platform = https://github.com/meshtastic/platform-nordicnrf52.git#merge
 
 extends = arduino_base
 build_type = debug ; I'm debugging with ICE a lot now
diff --git a/arch/nrf52/nrf52840.ini b/arch/nrf52/nrf52840.ini
index 29c32e795..2a02f36d8 100644
--- a/arch/nrf52/nrf52840.ini
+++ b/arch/nrf52/nrf52840.ini
@@ -4,7 +4,8 @@ build_flags = ${nrf52_base.build_flags}
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
-  https://github.com/Kongduino/Adafruit_nRFCrypto.git#20fc7fdaf086bd70e901c007dd23c6e8856aec25
+  # https://github.com/Kongduino/Adafruit_nRFCrypto.git#20fc7fdaf086bd70e901c007dd23c6e8856aec25
+  https://github.com/caveman99/Adafruit_nRFCrypto.git#patch-3 # pending fix pull on kongduino repo
 
 ; Note: By default no lora device is created for this build - it uses a simulated interface
 [env:nrf52840dk]