diff --git a/device/device-purism-librem5dev/APKBUILD b/device/device-purism-librem5dev/APKBUILD
index c2b0aceef..b575c7bc6 100644
--- a/device/device-purism-librem5dev/APKBUILD
+++ b/device/device-purism-librem5dev/APKBUILD
@@ -2,16 +2,16 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname="device-purism-librem5dev"
 pkgdesc="Purism Librem 5 Devkit"
-pkgver=0.8
-pkgrel=3
+pkgver=0.9
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base
-	linux-purism-librem5dev
+	linux-purism-librem5
 	uboot-tools
-	u-boot-librem5dev
+	u-boot-librem5
 	gpsd
 	mesa-git mesa-git-glapi mesa-git-gl mesa-git-gles mesa-git-egl mesa-git-gbm
 	mesa-git-dri-etnaviv mesa-git-dri-kmsro
@@ -30,7 +30,7 @@ subpackages="$pkgname-plasma"
 install="$pkgname.post-install"
 
 build() {
-	mkimage -A arm64 -O linux -T script -C none -a 0 -e 0 -n postmarketos -d "$srcdir"/uboot-script.cmd "$srcdir"/boot.scr
+	mkimage -A arm64 -C none -O linux -T script -d "$srcdir/uboot-script.cmd" "$srcdir/boot.scr"
 	devicepkg_build $startdir $pkgname
 }
 
@@ -48,9 +48,9 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-sha512sums="65087052e7d18b5378f4c01594ed430a8c8533df836de89b0fa73aa0980bc5bc43b8865a530bdbefaa4e7df8351fd44fabac11265b70e259e318a9113acc53d9  deviceinfo
-79abf8de1035418220c1d9168b038df10e06f23def18c944c065846dc5c4f5da66e8e62ae7ce9f5804ef064b0832d0b938f0e11e68878f203c322b05eb0ed639  uboot-script.cmd
+sha512sums="d073e520a6732b9784d4a79e75dccdf4101f60708c429ca3ff1c12b4b2aaaf27aa2f5f1836c48be98fbc10a1a5fbfd888ba45f4651cca4774187a85f2a8b5a47  deviceinfo
+e4bb06e337d3f23abb0328a8e564e905ef571cdbeeefe442cbbd7e715f5a5b656d00679c48161736b3254bcba1ab39a6c99402f67bbde9838c881b1adeb360ed  uboot-script.cmd
 d10531ad6646ad6cfaf8ee1b0cc38f4e5e2eb39599251b75f25e954f1105761d5480d92cbe06ad52560207b883439071db89b19babf046a810360bd07c52c655  modprobe.d_rsi.conf
 5fdf45859f2bb154bcfe7c7341de4d5b239ef43d3f865e30456af073a8ee9d6682515c7e1dd52ddbe3969669d60689ba93c08ead32aadcfb164ff72a02b2e1a4  00-mesa.sh
 685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  00-kwin.sh
-aeb04c73359889444e3d7da3d6c935a7899e1c190542dfc0224ef0c728a914f61074808d3df920daf02671292ed43eb43a03525ac676f34185cdbb73b39442e1  flash_script.lst"
+e1acf19ac91f012f000ab19165327043ffc4e80575dcc05d6aeb457f6343db7ba962fe658839faeb63b453340ddf6a314ccfab57e55d5b9d763bdb621cf5fd63  flash_script.lst"
diff --git a/device/device-purism-librem5dev/deviceinfo b/device/device-purism-librem5dev/deviceinfo
index a72332135..a1f54e434 100644
--- a/device/device-purism-librem5dev/deviceinfo
+++ b/device/device-purism-librem5dev/deviceinfo
@@ -27,4 +27,5 @@ deviceinfo_getty="ttymxc0;115200"
 # Bootloader related
 deviceinfo_flash_method="uuu"
 deviceinfo_generate_legacy_uboot_initfs="true"
-deviceinfo_sd_embed_firmware="firmware/librem5dev/u-boot.bin:33,firmware/librem5dev/m4.bin:2"
+deviceinfo_sd_embed_firmware="firmware/librem5/devkit-boot.img:2"
+deviceinfo_boot_part_start="4096"
diff --git a/device/device-purism-librem5dev/flash_script.lst b/device/device-purism-librem5dev/flash_script.lst
index a8b7ae18d..0722149d6 100755
--- a/device/device-purism-librem5dev/flash_script.lst
+++ b/device/device-purism-librem5dev/flash_script.lst
@@ -4,11 +4,19 @@ uuu_version 1.0.1
 # all paths are relative to the native chroot and not to the device rootfs
 # chroot.
 
-SDP: boot -f /mnt/rootfs_purism-librem5dev/usr/share/firmware/librem5dev/u-boot.bin
+SDP: boot -f /mnt/rootfs_purism-librem5dev/usr/share/firmware/librem5/devkit-boot.img
+
 SDPU: delay 1000
-SDPU: write -f  /mnt/rootfs_purism-librem5dev/usr/share/firmware/librem5dev/u-boot.bin -offset 0x57c00
+SDPU: write -f  /mnt/rootfs_purism-librem5dev/usr/share/firmware/librem5/devkit-boot.img -offset 0x57c00
 SDPU: jump
-SDPU: delay 1000
+
+SDPV: delay 1000
+SDPV: write -f /mnt/rootfs_purism-librem5dev/usr/share/firmware/librem5/devkit-boot.img -skipspl
+SDPV: jump
+
+SDPS: boot -f /mnt/rootfs_purism-librem5dev/usr/share/firmware/librem5/devkit-boot.img
+
+FB: ucmd mmc dev 0
 FB: ucmd setenv fastboot_dev mmc
 FB: ucmd setenv mmcdev 0
 FB: flash -raw2sparse all /home/pmos/rootfs/purism-librem5dev.img
diff --git a/device/device-purism-librem5dev/uboot-script.cmd b/device/device-purism-librem5dev/uboot-script.cmd
index 0e442bae9..b12ad6ae7 100644
--- a/device/device-purism-librem5dev/uboot-script.cmd
+++ b/device/device-purism-librem5dev/uboot-script.cmd
@@ -7,10 +7,10 @@ echo Loading DTB
 ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} imx8mq-librem5-devkit.dtb
 
 echo Loading Initramfs
-ext2load mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r} uInitrd-purism-librem5dev
+ext2load mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r} uInitrd-purism-librem5
 
 echo Loading Kernel
-ext2load mmc ${mmcdev}:${mmcpart} ${kernel_addr_r} vmlinuz-purism-librem5dev
+ext2load mmc ${mmcdev}:${mmcpart} ${kernel_addr_r} vmlinuz-purism-librem5
 
 echo Resizing FDT
 fdt addr ${fdt_addr_r}