diff --git a/.github/workflows/package_raspbian.yml b/.github/workflows/package_raspbian.yml
index 61f82e9d7..02b1ed5ad 100644
--- a/.github/workflows/package_raspbian.yml
+++ b/.github/workflows/package_raspbian.yml
@@ -40,7 +40,7 @@ jobs:
           mkdir -p .debpkg/usr/sbin
           mkdir -p .debpkg/etc/meshtasticd
           mkdir -p .debpkg/usr/lib/systemd/system/
-          cp release/meshtasticd_linux_arm64 .debpkg/usr/sbin/meshtasticd
+          cp release/meshtasticd_linux .debpkg/usr/sbin/meshtasticd
           cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml
           chmod +x .debpkg/usr/sbin/meshtasticd
           cp bin/meshtasticd.service .debpkg/usr/lib/systemd/system/meshtasticd.service
diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index ac7ba13ba..970640480 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -23,6 +23,7 @@ lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
   rweather/Crypto@^0.4.0
+  lovyan03/LovyanGFX@^1.1.12
 
 build_flags =
   ${arduino_base.build_flags}
diff --git a/bin/build-native.sh b/bin/build-native.sh
index 64c5adb50..dbec5bb95 100755
--- a/bin/build-native.sh
+++ b/bin/build-native.sh
@@ -14,14 +14,7 @@ rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
 platformio pkg update
-
-if command -v raspi-config &>/dev/null; then
-	pio run --environment raspbian
-	cp .pio/build/raspbian/program $OUTDIR/meshtasticd_linux_arm64
-else
-	pio run --environment native
-	cp .pio/build/native/program $OUTDIR/meshtasticd_linux_amd64
-fi
-
+pio run --environment native
+cp .pio/build/native/program $OUTDIR/meshtasticd_linux
 cp bin/device-install.* $OUTDIR
 cp bin/device-update.* $OUTDIR
diff --git a/bin/native-install.sh b/bin/native-install.sh
index d1d0c8707..afba04c6b 100755
--- a/bin/native-install.sh
+++ b/bin/native-install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-cp release/meshtasticd_linux_arm64 /usr/sbin/meshtasticd
+cp release/meshtasticd_linux /usr/sbin/meshtasticd
 mkdir /etc/meshtasticd
 if [[ -f "/etc/meshtasticd/config.yaml" ]]; then
 	cp bin/config-dist.yaml /etc/meshtasticd/config-upgrade.yaml
diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini
index 2641cc136..d37c6be21 100644
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -3,22 +3,4 @@ extends = portduino_base
 build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino
 board = cross_platform
 lib_deps = ${portduino_base.lib_deps}
-  lovyan03/LovyanGFX@^1.1.12
-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]
-extends = portduino_base
-build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino
-board = linux_hardware
-lib_deps = ${portduino_base.lib_deps}
-build_src_filter = ${portduino_base.build_src_filter}
-
-; The Raspberry Pi actually has accessible SPI and GPIO, so we can support real hardware there.
-[env:raspbian]
-extends = portduino_base
-build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino -DARCH_RASPBERRY_PI -lyaml-cpp
-board = linux_arm
-lib_deps = ${portduino_base.lib_deps}
-  https://github.com/jp-bennett/LovyanGFX.git#jp-bennett-patch-1 ; lovyan03/LovyanGFX@^1.1.9
 build_src_filter = ${portduino_base.build_src_filter}
\ No newline at end of file