diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 62f0b7ead..f2b47289f 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -27,9 +27,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     hwdata \
     gpg \
     gnupg2 \
+    libusb-1.0-0-dev \
+    libi2c-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN pipx install platformio==6.1.15
+RUN pipx install platformio
 
 COPY 99-platformio-udev.rules /etc/udev/rules.d/99-platformio-udev.rules
 
diff --git a/bin/build-native.sh b/bin/build-native.sh
index cda77b064..c6b1434dd 100755
--- a/bin/build-native.sh
+++ b/bin/build-native.sh
@@ -24,7 +24,7 @@ mkdir -p $OUTDIR/
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update --environment native || platformioFailed
+pio pkg update --environment native || platformioFailed
 pio run --environment native || platformioFailed
 cp .pio/build/native/program "$OUTDIR/meshtasticd_linux_$(uname -m)"
 cp bin/native-install.* $OUTDIR
diff --git a/lib/device-ui b/lib/device-ui
new file mode 160000
index 000000000..6b760f537
--- /dev/null
+++ b/lib/device-ui
@@ -0,0 +1 @@
+Subproject commit 6b760f5373b91de1d8234922a446f7232d5247d0