diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 1aff0d07c..7e90afa11 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -1,5 +1,7 @@
 ; The Portduino based sim environment on top of any host OS, all hardware will be simulated
 [portduino_base]
+platform = https://github.com/caveman99/platform-native.git#develop
+framework = arduino
 build_src_filter = 
   ${env.build_src_filter} 
   -<platform/esp32/> 
@@ -16,5 +18,6 @@ lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
   rweather/Crypto@^0.4.0
-  jgromes/RadioLib@5.4.1
+  ; jgromes/RadioLib@5.4.1
+  https://github.com/caveman99/RadioLib.git#master
 build_flags = ${arduino_base.build_flags} -Isrc/platform/portduino
diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini
index c95ae37fe..5bbde2adf 100644
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -1,16 +1,22 @@
 [env:native]
-platform = https://github.com/meshtastic/platform-native.git 
+extends = portduino_base
 build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino
-framework = arduino
 board = cross_platform
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}
 
 ; The Portduino based sim environment on top of a linux OS and touching linux hardware devices
 [env:linux]
-platform = https://github.com/meshtastic/platform-native.git 
+extends = portduino_base
 build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino
-framework = arduino
 board = linux_hardware
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}
+
+; The Portduino based sim environment on top of a linux OS and touching linux hardware devices
+[env:linux-arm]
+extends = portduino_base
+build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino
+board = linux_arm
+lib_deps = ${portduino_base.lib_deps}
+build_src_filter = ${portduino_base.build_src_filter}