diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
index d2e2fd9c5..798fb3d5a 100644
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -1,7 +1,7 @@
 ; Common settings for ESP targes, mixin with extends = esp32_base
 [esp32_base]
 extends = arduino_base
-platform = espressif32@^5.2.0
+platform = platformio/espressif32@^5.2.0
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040>
 upload_speed = 921600
diff --git a/arch/esp32/esp32s3.ini b/arch/esp32/esp32s3.ini
index e19b9aaf7..8dc6d0b62 100644
--- a/arch/esp32/esp32s3.ini
+++ b/arch/esp32/esp32s3.ini
@@ -1,6 +1,6 @@
 [esp32s3_base]
 extends = arduino_base
-platform = espressif32@^5.2.0
+platform = platformio/espressif32@^5.2.0
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040>
 upload_speed = 961200
diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
index 8e0d2f1b8..f4e2af236 100644
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -1,11 +1,9 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
 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
-; note: liboberon provides the AES256 implementation for NRF52 (though not using the hardware acceleration of the NRF52840 - FIXME)
 build_flags = 
   ${arduino_base.build_flags} -Wno-unused-variable 
   -Isrc/platform/nrf52
diff --git a/arch/nrf52/nrf52840.ini b/arch/nrf52/nrf52840.ini
index 2a02f36d8..14cc1d1e1 100644
--- a/arch/nrf52/nrf52840.ini
+++ b/arch/nrf52/nrf52840.ini
@@ -4,8 +4,7 @@ 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/caveman99/Adafruit_nRFCrypto.git#patch-3 # pending fix pull on kongduino repo
+  https://github.com/Kongduino/Adafruit_nRFCrypto.git#e31a8825ea3300b163a0a3c1ddd5de34e10e1371
 
 ; Note: By default no lora device is created for this build - it uses a simulated interface
 [env:nrf52840dk]
diff --git a/arch/stm32/stm32wl5e.ini b/arch/stm32/stm32wl5e.ini
index fc3f42ba7..d13750fdb 100644
--- a/arch/stm32/stm32wl5e.ini
+++ b/arch/stm32/stm32wl5e.ini
@@ -1,5 +1,5 @@
 [stm32wl5e_base]
-platform = ststm32
+platform = platformio/ststm32@^15.4.1
 board = generic_wl5e
 framework = arduino
 build_type = debug