diff --git a/device/community/device-generic-x86_64/APKBUILD b/device/community/device-generic-x86_64/APKBUILD
index 3b91630b7..100fa2876 100644
--- a/device/community/device-generic-x86_64/APKBUILD
+++ b/device/community/device-generic-x86_64/APKBUILD
@@ -3,7 +3,7 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=23
+pkgver=24
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -81,7 +81,7 @@ kernel_lts() {
 }
 
 sha512sums="
-882d40829d67384434af8666aaad8498f30ec0f41daeafcf12b59b10cc146d9bf6b678031fdaa40ac1b7edd7eb5c0ec2e34188ec50316a9e686a03d96afc2a4f  deviceinfo
+a88e80ef4cb33935bdc663c0b8be10e5be92aefcab3376c348c6dfe04c61c59e6a37520d9d658336aff54d5aefed310d21701bc9c48e39a35403565ad990c01f  deviceinfo
 9449922b5167d5c54cfea3b9bb58c4fa3f50d1974464b897a1e6a618bbb80377ec1348fb145fa95f4ba58f645b7e50f1f89feefcaa90de18679a1d73ed92b154  kernel-cmdline.conf
 45dcda9a8edbe5af3446d8d7922ea13f341c3d060afd3b74f43d213e122d0ca79c21962f76e7261cc680baa08982c9e86fd6f34bb0851768085a04801a0ce5ee  modules-initfs
 9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881  30-gpu-i915-firmware.files
diff --git a/device/community/device-generic-x86_64/deviceinfo b/device/community/device-generic-x86_64/deviceinfo
index 7672cde7c..ed0af4249 100644
--- a/device/community/device-generic-x86_64/deviceinfo
+++ b/device/community/device-generic-x86_64/deviceinfo
@@ -15,4 +15,3 @@ deviceinfo_drm="true"
 
 # Bootloader related
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
diff --git a/device/community/device-google-x64cros/APKBUILD b/device/community/device-google-x64cros/APKBUILD
index 34a5ed631..da921b359 100644
--- a/device/community/device-google-x64cros/APKBUILD
+++ b/device/community/device-google-x64cros/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Aster Boese <asterboese@mailbox.org>"
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
-pkgver=18
+pkgver=19
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -81,7 +81,7 @@ firmware_intel() {
 sha512sums="
 38c53d91a60d0402d4cc5428d65e1e8c26360c481c70b34593b1812c87241c32e91904a3bd31fbfe507f7fdb8b50c909eaad8c4c3a37ca962760567329f7f6ee  00-amdgpu-firmware.files
 c17f5c505e0e280a9e51ac1b4264e7703b744fd3831d75ce95f41be4755ae4ccd24b7ca09ba1e236df499a5e748c64a0d2054c9d55d8c8c713fa8c5646ed9a3c  00-i915-firmware.files
-04bb2a069251a537071e868164b8bf65882b16f6ff6f161cdc8712ec6948bf89ffa1b979c3e86cf0486f303102d8dd17258b89358d028879cf223bb374a20401  deviceinfo
+6b7fa89b97047f346976a874f76fc926b2490a720708197e9e176a20cb3b4d4e727c7c54c82630a10fc3fdb5291ef420f273040fc201ab5c694e2f8f3f75e7ad  deviceinfo
 7697e35721191d34aa3139e2fd1f8aab93751b5f3cc0497f2a18087eb4dc3ab4a45f9cac86230a469b6180bba3bc992bd71389fd59b099a46879e9868b3ebd0d  kernel-cmdline.conf
 12d701be4f29b0d68b58156655c66b4cc969b6a449d8ab325c00fb5f8094901fe0105446e0e8c4c0dd7d1e1abf3157f336319c5dd638e4a5723493ad5d22fb60  modules-initfs
 "
diff --git a/device/community/device-google-x64cros/deviceinfo b/device/community/device-google-x64cros/deviceinfo
index a593d03da..83b325f64 100644
--- a/device/community/device-google-x64cros/deviceinfo
+++ b/device/community/device-google-x64cros/deviceinfo
@@ -23,4 +23,3 @@ deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
 deviceinfo_depthcharge_board="amd64-generic"
 deviceinfo_generate_depthcharge_image="true"
-deviceinfo_generate_systemd_boot="true"
diff --git a/device/community/device-lenovo-21bx/APKBUILD b/device/community/device-lenovo-21bx/APKBUILD
index 69a4e18c3..b18545dbc 100644
--- a/device/community/device-lenovo-21bx/APKBUILD
+++ b/device/community/device-lenovo-21bx/APKBUILD
@@ -5,7 +5,7 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=18
+pkgver=19
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -72,7 +72,7 @@ usbguard() {
 }
 
 sha512sums="
-d08dcbb7edac7f889cc1d2bda34f1c1a212147839405987bea4c4bdddb6bd988e1eea2a49ffa42937d7ec5e6a9651d5d9e53902182354e90df60e7fc957826e0  deviceinfo
+7a685de71e512b5b2bf21448fb8fc1055bb33c72149acd57e1754c212c40218a2b93ab603d3262c2c37ace051c5872b2fcaeb5379a5beaac680b7a2a0f115a1e  deviceinfo
 5f4e6a80455c8a2ed879bfd457a89f81790824657ed4101e03b7ec288a274e63340f48e2ad5028cf83744263a4529584b1e94c36d10b98912e5b31804fa98ff0  firmware.files
 45d56b8d6157dd7d679d0d4af4866973e6e0365c276fa56c008cbc8373f64626c881b6097ad1b9fa9c0d5b769e61b5a81466d6a773e2848c9ee89f06c0302249  modules-initfs
 52bbb9564ec713db5d46937701b121afe0c6c644fffe189a05766f491b4997b1bbc4c1f90229efb5764d795df8d40a57d4c840ee4b32d426e7a84520364b8bf5  pipewire.conf
diff --git a/device/community/device-lenovo-21bx/deviceinfo b/device/community/device-lenovo-21bx/deviceinfo
index c4d742a0d..be6176ba9 100644
--- a/device/community/device-lenovo-21bx/deviceinfo
+++ b/device/community/device-lenovo-21bx/deviceinfo
@@ -16,5 +16,4 @@ deviceinfo_chassis="laptop"
 deviceinfo_external_storage="true"
 
 # Bootloader related
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
diff --git a/device/community/device-pine64-pinenote/APKBUILD b/device/community/device-pine64-pinenote/APKBUILD
index 8d227af9f..9c02d9495 100644
--- a/device/community/device-pine64-pinenote/APKBUILD
+++ b/device/community/device-pine64-pinenote/APKBUILD
@@ -1,7 +1,7 @@
 maintainer="Antoine Martin (ayakael) <dev@ayakael.net>"
 pkgname=device-pine64-pinenote
 pkgdesc="Pine64 PineNote"
-pkgver=9
+pkgver=10
 pkgrel=0
 _commit="28d2c05ab4e80a7972611cd3188f3e8be4197f6a"
 url="https://postmarketos.org"
@@ -280,7 +280,7 @@ sha512sums="
 82babd0aa02084c7a05f7b2e3a6d74db373588cd612d4d75f5ec79db895d8bdda4fcde784a1b8340df33a8c5f26204151d55a9d9b9dd2cc317cef623f51b626e  sway-waybar-config-fix-endless-interval-and-invisible-icons.patch
 4a02a3fb225b16290fbc469da5acba8438e959c0471743950ae125ede6b75b61e1772d900bd1f7c5fca55222cf430cae6c953d6065553ea3594babf33b569405  sway-sane-scale.patch
 7effcd37bbf2cab66ccb57ab976de63c93bd03795ccd82f317fbfb16216da287ada4410d9b168057e651fa4d769588d1f0efa713caa28c5b71ba6b73909ae33c  sway-nwg-menu-fix-css-path.patch
-ebe4ce7d3fc0a4dcb10cfeebd672b0d76e0f39ce34374629e42edad6173f0263043b483cbaa4cd4829e5a1441c28adbb448342ce6b42b839753ad6aa9ac32e80  deviceinfo
+caad7868f86411d618e057fa0f377b95cdcdcb0b5296cb81fe7ac499b1f6fe6c0a71d09f1648a61cae4eba3807f663dd8df169fd0754391f000773402df5e57f  deviceinfo
 3a229912fad5d6aa8942fa987872cb0141c064f4bbbed813e9bcd0594ee4bdbf7c8715becb9e071c66ccd5f8b01cb8676686d8cdcf99b7a1f1abb1c9de38f7d4  kernel-cmdline.conf
 e0d3ac808e7a4f05df327a824e30dc54864908e31f4a643f6e85f054ab812eeb28fef647eb52ae85bfad7d40c9cd81c43c1cdc575de5dbc04304d74862d9772c  modules-initfs
 df0565391a66eed53ed817d3d1415bef000f9ed33ef2e8aa3016be3ecc21dd4a357e57838979d2710256776666dc01bfee8bf8a95b08a20a62d46cfbd8ac6c35  partition-table.txt
diff --git a/device/community/device-pine64-pinenote/deviceinfo b/device/community/device-pine64-pinenote/deviceinfo
index 1a98dddae..32515054a 100644
--- a/device/community/device-pine64-pinenote/deviceinfo
+++ b/device/community/device-pine64-pinenote/deviceinfo
@@ -45,4 +45,3 @@ deviceinfo_flash_rk_partition_rootfs="os1"
 # deviceinfo_sd_embed_firmware_step_size="512
 
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
diff --git a/device/community/device-qcom-sm7150/APKBUILD b/device/community/device-qcom-sm7150/APKBUILD
index 6d40cf069..473994a02 100644
--- a/device/community/device-qcom-sm7150/APKBUILD
+++ b/device/community/device-qcom-sm7150/APKBUILD
@@ -5,8 +5,8 @@
 maintainer="Aelin <aelin@postmarketos.org>"
 pkgname=device-qcom-sm7150
 pkgdesc="Generic device package for Qualcomm SM7150 devices"
-pkgver=8
-pkgrel=1
+pkgver=9
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -45,6 +45,6 @@ package() {
 
 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-180-degrees.rules
-e5245e5c74b8e2b01ccdcc8e6fc7cb1b3e2c3f2dc80f6440c328b34a81f4132d52cc28aa9f2c0807cc5e9e5eab5abdea5fa920bae4c28b8ef60b0b75e9bf2dd8  deviceinfo
+492b22ce3350e8b1452128234062f41a2e6a23e4f5fac2c56fbd43e354a1c6f3792f8bc760e59a2e89c51a83a87f2b4ef77bdf7c422e01d891a32854ec3f2d19  deviceinfo
 c3924d35b27e3c3dcd0df3684848698c1c0545be0a978d845c099aac4d74b4ccdddfd69f3808a18143f30609300aede929f6efbd035a868d2140f5335597da5f  kernel-cmdline.conf
 "
diff --git a/device/community/device-qcom-sm7150/deviceinfo b/device/community/device-qcom-sm7150/deviceinfo
index 423c9b1fa..e0b83a22b 100644
--- a/device/community/device-qcom-sm7150/deviceinfo
+++ b/device/community/device-qcom-sm7150/deviceinfo
@@ -15,7 +15,6 @@ deviceinfo_external_storage="true"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 # Required for devices using UFS as storage (instead of e.g. eMMC)
 deviceinfo_rootfs_image_sector_size="4096"
diff --git a/device/community/device-samsung-manta/APKBUILD b/device/community/device-samsung-manta/APKBUILD
index 5e023523e..71be210bb 100644
--- a/device/community/device-samsung-manta/APKBUILD
+++ b/device/community/device-samsung-manta/APKBUILD
@@ -3,7 +3,7 @@
 maintainer="Alexandre Marquet <tb@a-marquet.fr>"
 pkgname=device-samsung-manta
 pkgdesc="Google Nexus 10"
-pkgver=12
+pkgver=13
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -75,7 +75,7 @@ disable_gsd_color() {
 }
 
 sha512sums="
-f3c50238d9d1be2bd44ab67ff7b46690043cdb334abce0285fedb587f68e35c57812a84333b6f01be0c9fec7dfc5479092659c77c8a33fec428bd84faeb4543c  deviceinfo
+649bb79413e350ad6b57069395ea889fc81d03216e615e5afd3e76ed924b9a6219962c09795e72a449bbff15227d401ac43625d6d3c896d9d2a0d90453d7ad0b  deviceinfo
 e00c58936fa4340f8531538136ad028d002342a4399b68d26190b931831108007486257f9d8a48c3ed454696b45d176b1497d624c33ace21e61eba33ac7ce136  modules-initfs
 8a9756c66bf1eacd6a9717abf772a198123391deac7e32a520666dd6f72c4c5b09d1a4791437c8902f62cf4b49106ace195d57082972b1cb4c843c8e1b065875  hwclock
 0a3d0365369335fcb4793d6dce93b744111478e191f4725e06da431cd080874ba897ea5abf92da9fc9005a5520da253e199620229231b16fb58a41a1091e6a44  HiFi.conf
diff --git a/device/community/device-samsung-manta/deviceinfo b/device/community/device-samsung-manta/deviceinfo
index cc0b6d3ab..f5abc2778 100644
--- a/device/community/device-samsung-manta/deviceinfo
+++ b/device/community/device-samsung-manta/deviceinfo
@@ -19,7 +19,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_flash_sparse="true"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
 
 # Kernel options
 deviceinfo_dtb="exynos5250-samsung-nexus10-manta"
diff --git a/device/main/device-qemu-aarch64/APKBUILD b/device/main/device-qemu-aarch64/APKBUILD
index 4cfa9bc22..f80bc037f 100644
--- a/device/main/device-qemu-aarch64/APKBUILD
+++ b/device/main/device-qemu-aarch64/APKBUILD
@@ -2,8 +2,8 @@
 # Co-Maintainer: Achill Gilgenast <achill@achill.org>
 maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=device-qemu-aarch64
-pkgver=15
-pkgrel=5
+pkgver=16
+pkgrel=0
 pkgdesc="Simulated device in QEMU (aarch64)"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -80,6 +80,6 @@ pmtest() {
 }
 
 sha512sums="
-295b72c50f5900fde4075c3975affa863bc4334ec446b5a18021b3c4643bd0e6d1d6edcb61f17a56383f2e5ef38e2dc0935d560487b3987b8d0c883ba055bb91  deviceinfo
+0713e4371fc4f3db5e2715cd89a958b6c5dff9c6b71e24810715ba9827a2088c5b33411bfbdddff9f989a3d3c7f7b4019532f1189fa5b2bc1721ebf5b134adca  deviceinfo
 fb390f6dadd302f9747a305947a2002375fba56a7584206d30fd8fc723c10494786b49f9cc3fa14a3109ed140341dcd9cc6c2b8ccb4e011911b83a871eaa721d  kernel-cmdline.conf
 "
diff --git a/device/main/device-qemu-aarch64/deviceinfo b/device/main/device-qemu-aarch64/deviceinfo
index a20ba9877..91642214a 100644
--- a/device/main/device-qemu-aarch64/deviceinfo
+++ b/device/main/device-qemu-aarch64/deviceinfo
@@ -19,5 +19,4 @@ deviceinfo_getty="ttyAMA0;115200"
 # Bootloader related
 deviceinfo_disable_dhcpd="true"
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_initfs_compression="zstd"
diff --git a/device/main/device-qemu-amd64/APKBUILD b/device/main/device-qemu-amd64/APKBUILD
index c5bdfea25..ec4a8f363 100644
--- a/device/main/device-qemu-amd64/APKBUILD
+++ b/device/main/device-qemu-amd64/APKBUILD
@@ -2,8 +2,8 @@
 # Co-Maintainer: Achill Gilgenast <achill@achill.org>
 maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=device-qemu-amd64
-pkgver=16
-pkgrel=5
+pkgver=17
+pkgrel=0
 pkgdesc="Simulated device in QEMU (x86_64)"
 url="https://postmarketos.org"
 arch="x86_64"
@@ -67,6 +67,6 @@ pmtest() {
 }
 
 sha512sums="
-879044487e1432f0af5cc34b5a7c46cfe09ab837592b1d2febf22db2e4da0747174b3dac6accfa5be21261e38e7eeb25d3f2477f5b78267f92d30e051b6671c4  deviceinfo
+3f2daeae210e38e2672fad53afe6a7e1821339e3e7e5782d6fd16a3ab2b70dfcc0658f0340af2ed76fbfd2b38a55fb7d150680fde80260e7b8e66127edb3d447  deviceinfo
 433875074bc225f5509bde089409b079902a5f161ecb22abcee25b2e45399b3561288c1018e5e08a6a21c38844f7b185dc3683442f97ceddee1020fdc6cc022b  kernel-cmdline.conf
 "
diff --git a/device/main/device-qemu-amd64/deviceinfo b/device/main/device-qemu-amd64/deviceinfo
index ba441126e..e47130f7c 100644
--- a/device/main/device-qemu-amd64/deviceinfo
+++ b/device/main/device-qemu-amd64/deviceinfo
@@ -21,5 +21,4 @@ deviceinfo_dev_internal_storage_repartition="true"
 # Bootloader related
 deviceinfo_disable_dhcpd="true"
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_initfs_compression="zstd"
diff --git a/device/main/device-qemu-loongarch64/APKBUILD b/device/main/device-qemu-loongarch64/APKBUILD
index be04fc510..a6e4fefaf 100644
--- a/device/main/device-qemu-loongarch64/APKBUILD
+++ b/device/main/device-qemu-loongarch64/APKBUILD
@@ -3,8 +3,8 @@
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 maintainer="Aelin <aelin@postmarketos.org>"
 pkgname=device-qemu-loongarch64
-pkgver=5
-pkgrel=5
+pkgver=6
+pkgrel=0
 pkgdesc="Simulated device in QEMU (loongarch64)"
 url="https://postmarketos.org"
 arch="loongarch64"
@@ -54,6 +54,6 @@ kernel_mainline() {
 }
 
 sha512sums="
-847303ea219eb4aba98e30c2ba9d43e0396b7f2d0029f42552ec40e36858014347e07749f80b14a92db1dc9b38730a591b56d03dcb40a04ced8af21843e0b860  deviceinfo
+4c3f40c33af01a09f26add6af9d30e4f6b623e2e0378eacc35f59faa189bb1b10ebe62a7687ade6e9b813ce19e40a9863f0a97b3644e7ada0dade7c7527f8883  deviceinfo
 eb8f9fd9e4b58c7c2cd810ae6449e836d0fa095f6eaa2da661481df6eb40d452998613b3d032f0477f0ac32559689db48eb3da189495c16bd016b8eac3b67b16  kernel-cmdline.conf
 "
diff --git a/device/main/device-qemu-loongarch64/deviceinfo b/device/main/device-qemu-loongarch64/deviceinfo
index 7e4a8d4cc..85a51bc5b 100644
--- a/device/main/device-qemu-loongarch64/deviceinfo
+++ b/device/main/device-qemu-loongarch64/deviceinfo
@@ -19,4 +19,3 @@ deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
diff --git a/device/main/device-qemu-riscv64/APKBUILD b/device/main/device-qemu-riscv64/APKBUILD
index e6c9099d9..0a54937db 100644
--- a/device/main/device-qemu-riscv64/APKBUILD
+++ b/device/main/device-qemu-riscv64/APKBUILD
@@ -2,8 +2,8 @@
 # Co-Maintainer: Achill Gilgenast <achill@achill.org>
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-qemu-riscv64
-pkgver=11
-pkgrel=4
+pkgver=12
+pkgrel=0
 pkgdesc="Simulated device in QEMU (riscv64)"
 url="https://postmarketos.org"
 arch="riscv64"
@@ -54,5 +54,5 @@ kernel_mainline() {
 
 sha512sums="
 8411587834a64f96673e890195d7e6d7451e0316a69126197a4d6a1522e36c7c5a8a522647f1712038653803d19cf27916a66c6f0e409bd41ddca19f6ff1cda9  kernel-cmdline.conf
-d9edefbfba3d9892981d0278e4867bd743fbe86c58300d0aeb66d751c8714f40d63f915e9d9a5d32b736924d28e9cfacfac155972c619e696b53b96eac92bfad  deviceinfo
+2d6247cece4c6fd474dee4905f3626fcc1ce8a32086e72535693753b06ae5a729cdf71d1312f001d819b360a05b960a3071dbb59866eaf58bed12492bb8e7d7b  deviceinfo
 "
diff --git a/device/main/device-qemu-riscv64/deviceinfo b/device/main/device-qemu-riscv64/deviceinfo
index 99d26ece3..cfcf63f2b 100644
--- a/device/main/device-qemu-riscv64/deviceinfo
+++ b/device/main/device-qemu-riscv64/deviceinfo
@@ -19,4 +19,3 @@ deviceinfo_getty="ttyS0;230400"
 # Bootloader related
 deviceinfo_disable_dhcpd="true"
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
diff --git a/device/testing/device-acer-aspire1/APKBUILD b/device/testing/device-acer-aspire1/APKBUILD
index 89c8b7e2d..f0789d781 100644
--- a/device/testing/device-acer-aspire1/APKBUILD
+++ b/device/testing/device-acer-aspire1/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Nikita Travkin <nikita@trvn.ru>"
 pkgname=device-acer-aspire1
 pkgdesc="Acer Aspire 1"
-pkgver=8
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -70,7 +70,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-bb7b76339ae60092d8253d4388895a3ed1980e66d155a6639d0fb67556f94553bddb3fe79fd36b856bb0789cab4143e25a0c83f35026cd2a77a1726fc10c0cda  deviceinfo
+9f3a50cf2aa26fa421101800cf954cf80a2a3ca25f0ef567932621d525df755f8a6b06e79b82365f62aa79674b4942c4b2db81b596aad70d735f0332b7f2a4bd  deviceinfo
 d77c87adffec9d5f5a5d0d87e05aceefbcd42d112d3ed6068ab23566b21e52046018c8e0c9c1f5165c58f43b370bbbd632a45b2d9e397a35fc74563930639db0  kernel-cmdline.conf
 99b3c6fee1e4088ad0246170b6884c5f342893efa4d4846c4e9fa47fbf58f2dc655b8379f465e7d690621630804634533392254fc4305fea6d292a9d5eb4795a  modules-initfs
 0626518d52fb56b80115e333030abe409fb5ca13aa7c13387e3f41e7d34c3b7c7da3ff06dd7062b79b5472f93119100bffa98f32f05f530623ccca7282777302  sc7180.conf
diff --git a/device/testing/device-acer-aspire1/deviceinfo b/device/testing/device-acer-aspire1/deviceinfo
index 8dbc2e81f..244814f06 100644
--- a/device/testing/device-acer-aspire1/deviceinfo
+++ b/device/testing/device-acer-aspire1/deviceinfo
@@ -17,5 +17,4 @@ deviceinfo_screen_width="1920"
 deviceinfo_screen_height="1080"
 
 # Bootloader related
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
diff --git a/device/testing/device-apple-mac-aarch64/APKBUILD b/device/testing/device-apple-mac-aarch64/APKBUILD
index 223e0bc68..c987c0548 100644
--- a/device/testing/device-apple-mac-aarch64/APKBUILD
+++ b/device/testing/device-apple-mac-aarch64/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=device-apple-mac-aarch64
 pkgdesc="Apple M-series Macs"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -78,7 +78,7 @@ vulkan() {
 }
 
 sha512sums="
-42a8fe25e024a9cec7b900ddbb2bd1275810b80bafadc043e571e060c76c8aa0eb545c5ad4714aa6ce0354785187ae987827dfc3b3948d7d9901575bbc2a70b0  deviceinfo
+5d8e2bf4f74daa44dbdd8c3718fd428f70a136fac9019ec0a0c2a148955a0328a0b0fd110897ad766bbbbbaa84ec3b1f07ae095d36192166506f08ea0d987aae  deviceinfo
 f111ddc0484f079af23520dcc9b4d909b55da327aec91545921a4ceafc52b21d88f37fbdb702e51ca1e49440b6afc2011ada8b681c1801f572bddc9cd34c9d9e  initramfs_copy_vendorfw.sh
 11d5d6af50ed73e7e6940f7d56730f94a1bb42990d5dba9a798522060e7717c410c025b12def0345b4f43c97da268dabcb484c3004d23c1ac39b1eeaaefd2967  initramfs_setup_vendorfw.sh
 d85e4c6660fe53ffaca5600fb907bf564dfe5e40a9a8069b1ee74701e58910d9d67c899c345e850c7cc29f8ae29f433883beae7eb84d375e8a4ae225c8dc0d78  modules-initfs
diff --git a/device/testing/device-apple-mac-aarch64/deviceinfo b/device/testing/device-apple-mac-aarch64/deviceinfo
index 4faa1a238..b4be4d51e 100644
--- a/device/testing/device-apple-mac-aarch64/deviceinfo
+++ b/device/testing/device-apple-mac-aarch64/deviceinfo
@@ -15,5 +15,4 @@ deviceinfo_external_storage="false"
 deviceinfo_drm="true"
 
 # Bootloader related
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
diff --git a/device/testing/device-apple-tonga/APKBUILD b/device/testing/device-apple-tonga/APKBUILD
index 0b94415a2..942a1bc86 100644
--- a/device/testing/device-apple-tonga/APKBUILD
+++ b/device/testing/device-apple-tonga/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="EDKPiepaint <2163971449v@gmail.com>"
 pkgname=device-apple-tonga
 pkgdesc="Apple Macbook Air M1"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -28,6 +28,6 @@ package() {
 }
 
 sha512sums="
-60be45fb5fb77774f3a131355d680c5d795b4fac6553b771888c22120e7d04ea7075b2ebb998072c76fe4a4182621752da9e12a6fd5cf847fa0420187ca6769a  deviceinfo
+f73a6aad3968e5776729628e3df5b94d2edad372b8b1549671fdb288873d6f8363d4336459f565c2aec147c04ea17cddf5c0bd4cb468b48c5078d628b52bd0e5  deviceinfo
 0d7bfa506942e551b0bbbefd465ab8f19b241db93de393efbd788ade6113da37e96e4141633356207a2d9645d668b2aa7cdaa9e78d27723208f4205c8af4bbba  kernel-cmdline.conf
 "
diff --git a/device/testing/device-apple-tonga/deviceinfo b/device/testing/device-apple-tonga/deviceinfo
index 652993728..c87ad8337 100644
--- a/device/testing/device-apple-tonga/deviceinfo
+++ b/device/testing/device-apple-tonga/deviceinfo
@@ -14,5 +14,4 @@ deviceinfo_chassis="laptop"
 deviceinfo_external_storage="false"
 deviceinfo_drm="true"
 # Bootloader related
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
diff --git a/device/testing/device-asus-s5507q/APKBUILD b/device/testing/device-asus-s5507q/APKBUILD
index 2db3f4186..e12544b1f 100644
--- a/device/testing/device-asus-s5507q/APKBUILD
+++ b/device/testing/device-asus-s5507q/APKBUILD
@@ -2,7 +2,7 @@
 maintainer=""
 pkgname=device-asus-s5507q
 pkgdesc="ASUS Vivobook S 15"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -36,7 +36,7 @@ package() {
 }
 
 sha512sums="
-d4b631c89fa664598a9e8e5b0d3d647d98e531e0f73d34a9b67a8d47f76b7c4e7a155a413eb569db15d77e56ee366de10db63a9347d83c9f800fb0b753b72775  deviceinfo
+66fd96566c65d016a5b83b93151943f5ccf853ab24b67a265462c88b177ad0d849270c9869b192121d1da69f802750aa203f6241eef6e5db4f3886b4035c7dd0  deviceinfo
 04cc87ed6b0041ede7edb2693ee4dd58d6ac8f1b036a0b37e1a86cce57b66e35d9f400a3ea75d75278b028132535033915f3a2fff919866e85336c5f92a68ffe  kernel-cmdline.conf
 67ee789a0c6bb0daacc5795abc5cad87a17d51194234bf58b7e26b6a733b0fcf501a8fa78695d02067aa233f58733228e09558cd6f001095d2122011ccee7357  modules-initfs
 "
diff --git a/device/testing/device-asus-s5507q/deviceinfo b/device/testing/device-asus-s5507q/deviceinfo
index 8e14acbce..79e2b6ae6 100644
--- a/device/testing/device-asus-s5507q/deviceinfo
+++ b/device/testing/device-asus-s5507q/deviceinfo
@@ -18,4 +18,3 @@ deviceinfo_drm="true"
 
 # Bootloader related
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
diff --git a/device/testing/device-ayaneo-pocket-s2/APKBUILD b/device/testing/device-ayaneo-pocket-s2/APKBUILD
index 8000f6b91..bac793421 100644
--- a/device/testing/device-ayaneo-pocket-s2/APKBUILD
+++ b/device/testing/device-ayaneo-pocket-s2/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Neil Armstrong <neil.armstrong@linaro.org>"
 pkgname=device-ayaneo-pocket-s2
 pkgdesc="Ayaneo Pocket S2"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -45,7 +45,7 @@ package() {
 }
 
 sha512sums="
-2783943592780e261d287bce93f17e2d9baff853c11e6d7680d2efe6079181e033bf168f6cc91f07af99c89d15bef23a6daa7d4d0cae153b1b63f3f20c8f4e03  deviceinfo
+1c85bb0c68fc6cb7836a8116661533684e4eb2fcb29b958f46f14e5ce1f207139d3c04d2b94f088abf48ac7bdb3c26c02097109f48c24ab5b4f756d997136145  deviceinfo
 6c6a1393fd91dbb565e5b09aacf5f18a0911de19074f25548174a2d1a6db6f52f27ea556bfb5f4731085c345c42047fddbacc2a77ffe288728ff96d4c7a2cbed  kernel-cmdline.conf
 5c219e5532705402a2cff81ae792ee5d74751bccfe0038d5ea2d6701cc07df860808f7879ba93a80241bfbcb2a2527587b1c1d770602dd682c15f7d5800d03a3  firmware.files
 bc2f6134fc2612344dacddfb4146d6c028f3d8916ba1e78598ed16307446f4266b76afadfdf18543813bbca2727eda8523b5f8467f89c65922e70221d004f899  modules-initfs
diff --git a/device/testing/device-ayaneo-pocket-s2/deviceinfo b/device/testing/device-ayaneo-pocket-s2/deviceinfo
index 0ef4d121c..c1b143500 100644
--- a/device/testing/device-ayaneo-pocket-s2/deviceinfo
+++ b/device/testing/device-ayaneo-pocket-s2/deviceinfo
@@ -16,7 +16,6 @@ deviceinfo_external_storage="true"
 deviceinfo_drm="true"
 
 # Bootloader related
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 
 # Required for devices using UFS as storage (instead of e.g. eMMC)
diff --git a/device/testing/device-ayn-odin/APKBUILD b/device/testing/device-ayn-odin/APKBUILD
index 3fe17c33f..ab1f62e30 100644
--- a/device/testing/device-ayn-odin/APKBUILD
+++ b/device/testing/device-ayn-odin/APKBUILD
@@ -2,7 +2,7 @@
 maintainer=""
 pkgname=device-ayn-odin
 pkgdesc="AYN Odin"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -80,7 +80,7 @@ _phosh_m2() {
 }
 
 sha512sums="
-6985dfcec7e4c676295daad24c4ff72cd0cab92afcbe8ad8e76d1b5a555649662ac770f261edefeb040d93b07f7d34c13551d3ab9db8174a3365cae1407b991a  deviceinfo
+f5276b15b372c9be47c0b2905bc5574eda8458456e9bb7e56d3a85f6eaa925786252608c11eee0a18edb1a325c6819bf74114d6bc0359e0edef9ab3c3e877a22  deviceinfo
 4991bd4df62daf75dc051f45c9250636d819c3509fec650026da72b6fb5fe57a6703fb8a15c1b1d4eb63751eed403fc90e3cf867f799596a0a52960cabfc4f58  kernel-cmdline.conf
 cd3da21e666698f92382938bf75c8e57e7582b440c8de69c19841a5d36861a8bdd3f4e1ac5282c1e9a8ad5009cc4ffbb2bf40cd8bb8fb9a22acdf5d8caf37e67  hexagonrpcd.confd
 dc987332abe6d5c7ac511be1045af227d80b9dbe2f907e23e89b62217ca867dd064484caec36f0605dda89a9894da780b75beb23d9b893bd0f9a46593e675393  modules-initfs
diff --git a/device/testing/device-ayn-odin/deviceinfo b/device/testing/device-ayn-odin/deviceinfo
index f9d04ae43..ab32c346d 100644
--- a/device/testing/device-ayn-odin/deviceinfo
+++ b/device/testing/device-ayn-odin/deviceinfo
@@ -17,7 +17,6 @@ deviceinfo_external_storage="true"
 deviceinfo_drm="true"
 
 # Bootloader related
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 
 # Required for devices using UFS as storage (instead of e.g. eMMC)
diff --git a/device/testing/device-blackberry-key2-generic/APKBUILD b/device/testing/device-blackberry-key2-generic/APKBUILD
index 85bfc6ca9..fa8973284 100644
--- a/device/testing/device-blackberry-key2-generic/APKBUILD
+++ b/device/testing/device-blackberry-key2-generic/APKBUILD
@@ -2,8 +2,8 @@
 maintainer="Paul Sajna <sajattack@postmarketos.org>"
 pkgname=device-blackberry-key2-generic
 pkgdesc="BlackBerry KEY2"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -83,7 +83,7 @@ sha512sums="
 ab91ae3241d058edc507cd4551477e04918735bd2b56e193fac29daf7d5a3c6110eab7c4e92bdc4dad8e04519ad3187c8f16a92692367c869cdf50c87d56bb4b  10-initfs-keymap.sh
 2edc79d25b71ab931113d9fac9ff244123e540b7faedae64ecefa987f16f9c30d4a891993c68c792b8d28c8ef41d62d50871b37cda46c03b68eb2a4609be0880  10-initfs-keymap.files
 8b3c8701e4561ec37c11244b38d85a99b26290a5b50c12a8eb59dd0ca1c7b6330744f7efba9e51669bb5ee2ddddcda55c39a2cfc14d646ebe9c2309f876e1ff1  40-xkb.conf
-2f8de2ef4d8da3b7a3fc16e59141d34b7d0ab65d4393ae828f449ceabe070514b788dbcd6cd42adfe023873145c59471442b8ef68c0d6a4e9bf12f6dbc14b358  deviceinfo
+50d45e83270089d66c4369da5582609284acf41d25306731084917bead61752921cb6aa284c6e19a017cfef514dd8b0184ede4cf50532941124db18acacc15fb  deviceinfo
 1c1f23a6a7fc6f46d9b1f7ff463a3a65ec8f9a84e4a18bee8adf756fc1b2c5365fcb3b5473553752eecb7e21613081e337d3e132beadba5647e257fcd4645b74  etc-sway-config.d-key2.conf
 8d5d99c1ffb0a3bbc132708894247f14aee6d80d7f9ac78d8a93a5ccef9ba8a32b8b0e5af6fe596a08aca6f9eaa1d78e05f35fe7d350c27a770b5de81d2d2aba  us-key2.map
 eadabfc07e465ce7acdd11428fb86b7c8dc5210779c7511b3e6dbe325332a1402f847392401172940cf23c4aab670629e47c6b67dbd76c8cdba9495cd9000ddb  keypad.conf
diff --git a/device/testing/device-blackberry-key2-generic/deviceinfo b/device/testing/device-blackberry-key2-generic/deviceinfo
index 557992c0e..395f5ea41 100644
--- a/device/testing/device-blackberry-key2-generic/deviceinfo
+++ b/device/testing/device-blackberry-key2-generic/deviceinfo
@@ -18,7 +18,6 @@ deviceinfo_keymaps="us/us-key2"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_fastboot_partition_kernel="cache"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_header_version="0"
 deviceinfo_flash_offset_base="0x00000000"
diff --git a/device/testing/device-generic-loongarch64/APKBUILD b/device/testing/device-generic-loongarch64/APKBUILD
index 1e4a1f177..aea7abb86 100644
--- a/device/testing/device-generic-loongarch64/APKBUILD
+++ b/device/testing/device-generic-loongarch64/APKBUILD
@@ -2,7 +2,7 @@
 # Co-Maintainer: Achill Gilgenast <achill@achill.org>
 maintainer="Aelin <aelin@postmarketos.org>"
 pkgname=device-generic-loongarch64
-pkgver=6
+pkgver=7
 pkgrel=0
 pkgdesc="Generic loongarch64 system"
 url="https://postmarketos.org"
@@ -55,7 +55,7 @@ kernel_mainline() {
 }
 
 sha512sums="
-1eb994913893442dedfa1a3f2b9159bc815f3c294a69e85f77bd16ae90fb74f2cf7b1a984a2f7ce27276df8ddf76de67416e173659c65ec1f65b675ece223baa  deviceinfo
+c1922ebc0aa8698de73ebd6def464bd900c518250415497cb0e2c151481e700c50b309cce05c8630bf38a66d4691b45af43aa30fc75dde21bf8a8194d6c08a0f  deviceinfo
 eb8f9fd9e4b58c7c2cd810ae6449e836d0fa095f6eaa2da661481df6eb40d452998613b3d032f0477f0ac32559689db48eb3da189495c16bd016b8eac3b67b16  kernel-cmdline.conf
 2acfb32ce5d9c43956a49f48113bdfca6558a8c67a5ffd52aa30e35fc281abd7eff5808f8ae47707f4ba6d75d18acbd013813127263e8eb7529660380e9c3e85  modules-initfs
 "
diff --git a/device/testing/device-generic-loongarch64/deviceinfo b/device/testing/device-generic-loongarch64/deviceinfo
index 9487c206a..580d71cff 100644
--- a/device/testing/device-generic-loongarch64/deviceinfo
+++ b/device/testing/device-generic-loongarch64/deviceinfo
@@ -16,4 +16,3 @@ deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
diff --git a/device/testing/device-lenovo-flex-5g/APKBUILD b/device/testing/device-lenovo-flex-5g/APKBUILD
index ee4866728..ad86171ac 100644
--- a/device/testing/device-lenovo-flex-5g/APKBUILD
+++ b/device/testing/device-lenovo-flex-5g/APKBUILD
@@ -2,7 +2,7 @@
 maintainer=""
 pkgname=device-lenovo-flex-5g
 pkgdesc="Lenovo Flex 5G"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -27,7 +27,7 @@ package() {
 
 
 sha512sums="
-7e94aeaaed3b479deb345d8dc53e209effe53296cffa515d1d78fa45a6fe51836e937c77ed2bcb1f14dffe9e7b6fd21a11a79e15903dac54392a291226b6159d  deviceinfo
+f586090327919f7001860de6dee7698ac93056d112759b311d28258531d07a5a5eec623b10e9ea361ecf3ee9b4f528269a9f1b0332a9a960e097a3faa2f76498  deviceinfo
 8fddc59e59615a85038d0cdc6a75c58b63b7b78791ece6e911b519f5cbef301366c12b3f11512b254b1f2f4563d29c1a2dbd0cd576c0b5925620f31cd29df498  kernel-cmdline.conf
 438f30d14ad15fa87e5fa3b5127e5430af35cdddc400d2a01acbba6487792a602fcf3400e2c42ee991e6785fe62b083030ea977292efa88dacb3fcbe03bc32d7  modules-initfs
 "
diff --git a/device/testing/device-lenovo-flex-5g/deviceinfo b/device/testing/device-lenovo-flex-5g/deviceinfo
index f9d5fcfe7..6d24aff77 100644
--- a/device/testing/device-lenovo-flex-5g/deviceinfo
+++ b/device/testing/device-lenovo-flex-5g/deviceinfo
@@ -18,5 +18,4 @@ deviceinfo_screen_height="1080"
 
 # Bootloader related
 # most parameters from: https://github.com/jhovold/linux/wiki/X13s#kernel-command-line
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
diff --git a/device/testing/device-lenovo-yoga-5g/APKBUILD b/device/testing/device-lenovo-yoga-5g/APKBUILD
index fc8f8d834..a6998e4fd 100644
--- a/device/testing/device-lenovo-yoga-5g/APKBUILD
+++ b/device/testing/device-lenovo-yoga-5g/APKBUILD
@@ -2,7 +2,7 @@
 maintainer=""
 pkgname=device-lenovo-yoga-5g
 pkgdesc="Lenovo Yoga 5G"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -34,7 +34,7 @@ nonfree_firmware() {
 
 
 sha512sums="
-6ebf0f4c2bc2dbb34dfcf9cc153e5033207850bafb33b218e853f0cd61e12413201b756c604e97af5f9f43f07a4950c2b47465f6865854c636df679ffa4cee5f  deviceinfo
+879972b711e1c0dd1e1b99e848ccff89cc1f2340cd2bc49fd3dea76208205735fadf47232abaf84418071bcbdcbab6789ca3077d8e90f1b4f171813e38e2ebd9  deviceinfo
 8fddc59e59615a85038d0cdc6a75c58b63b7b78791ece6e911b519f5cbef301366c12b3f11512b254b1f2f4563d29c1a2dbd0cd576c0b5925620f31cd29df498  kernel-cmdline.conf
 438f30d14ad15fa87e5fa3b5127e5430af35cdddc400d2a01acbba6487792a602fcf3400e2c42ee991e6785fe62b083030ea977292efa88dacb3fcbe03bc32d7  modules-initfs
 "
diff --git a/device/testing/device-lenovo-yoga-5g/deviceinfo b/device/testing/device-lenovo-yoga-5g/deviceinfo
index e01535ab2..2b7664384 100644
--- a/device/testing/device-lenovo-yoga-5g/deviceinfo
+++ b/device/testing/device-lenovo-yoga-5g/deviceinfo
@@ -18,5 +18,4 @@ deviceinfo_screen_height="1080"
 
 # Bootloader related
 # most parameters from: https://github.com/jhovold/linux/wiki/X13s#kernel-command-line
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
diff --git a/device/testing/device-lenovo-yoga-c630/APKBUILD b/device/testing/device-lenovo-yoga-c630/APKBUILD
index 3b04a25ad..d2fed56cc 100644
--- a/device/testing/device-lenovo-yoga-c630/APKBUILD
+++ b/device/testing/device-lenovo-yoga-c630/APKBUILD
@@ -2,7 +2,7 @@
 maintainer=""
 pkgname=device-lenovo-yoga-c630
 pkgdesc="Lenovo Yoga C630"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -31,7 +31,7 @@ package() {
 }
 
 sha512sums="
-bdab0b1a9a50da967a244fe733ce21650911669a80b5885bdc6923fd77672d7d763b9969a262899f67430ae0ab49f3394811e45cc4e2bdeab6ee26aeb52b9880  deviceinfo
+9b198b8f59cfa2b3995cd15bea745deab3cd9f9afebdbabe2f0c890a11d8dc0029df3c55bf92e390b7621dc4046e4729fabfaa749af3ba5dcfc09fb6078d5218  deviceinfo
 1a1a5cbd53fa37b89961b45ba091787c235dd144c69530f5b1b2daaa63ec84974f90936dee7de048086b39adf21d61b43deab1dec8f2b43d02731feb2afa4bb4  kernel-cmdline.conf
 490dd21b7775cea13e9dde9cb7568ddd204230fc786dad04dadee9b82b15749317fcf9c89286b4f73e8eeadd4bf19b5451f46d744d23f226d94e5bbbbc1692c3  modules-initfs
 "
diff --git a/device/testing/device-lenovo-yoga-c630/deviceinfo b/device/testing/device-lenovo-yoga-c630/deviceinfo
index 817472cd2..a439f0ccd 100644
--- a/device/testing/device-lenovo-yoga-c630/deviceinfo
+++ b/device/testing/device-lenovo-yoga-c630/deviceinfo
@@ -19,7 +19,6 @@ deviceinfo_screen_height="1080"
 
 # Bootloader related
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_dtb="qcom/sdm850-lenovo-yoga-c630"
 deviceinfo_getty="ttyMSM0;115200"
 
diff --git a/device/testing/device-postmarketos-trailblazer/APKBUILD b/device/testing/device-postmarketos-trailblazer/APKBUILD
index b49a9d6f1..d929876e3 100644
--- a/device/testing/device-postmarketos-trailblazer/APKBUILD
+++ b/device/testing/device-postmarketos-trailblazer/APKBUILD
@@ -3,7 +3,7 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=device-postmarketos-trailblazer
 pkgdesc="postmarketOS Trailblazer generic ARM64"
-pkgver=19
+pkgver=20
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -95,7 +95,7 @@ kernel_postmarketos_amlogic() {
 }
 
 sha512sums="
-3f361d9a3993b7e17d213db848882fa6aa3ad51873b613a8633c97fdf3e9ec542f70b0d4c280a1208736f660d8681ad714dc8307ec01e4528170a2219edabd27  deviceinfo
+36812279ace456345d289a038d718dd08baa5e414a1429c7de5eec50ec9fa74d396e4d6bed5c38808c044d30dec46b21bc4dfe46861c6f338527e8cbd3029856  deviceinfo
 81492d13da96e7718ca546a6e879c54fc105e4b1dc4316b6e91f8c51cfbc816bbb0673222579afb5ce5a38fad91d8be7639aa938e0e8f77ff29a8d5d301d4949  kernel-cmdline.conf
 e26948d1f5005b16fefcaa51985010a5e55adef9ba3ed9d1f3d046c4b8928afbdd317123d0ca2fb0904e5431536c0d995144f66ad9025c7937ff0aae0537dfef  modules-initfs
 "
diff --git a/device/testing/device-postmarketos-trailblazer/deviceinfo b/device/testing/device-postmarketos-trailblazer/deviceinfo
index 24c9797af..77890d022 100644
--- a/device/testing/device-postmarketos-trailblazer/deviceinfo
+++ b/device/testing/device-postmarketos-trailblazer/deviceinfo
@@ -15,5 +15,4 @@ deviceinfo_drm="true"
 
 # Bootloader related
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
 
diff --git a/device/testing/device-qcom-qcs6490/APKBUILD b/device/testing/device-qcom-qcs6490/APKBUILD
index d7da2fb5e..4895f5a09 100644
--- a/device/testing/device-qcom-qcs6490/APKBUILD
+++ b/device/testing/device-qcom-qcs6490/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Aelin <aelin@postmarketos.org>"
 pkgname=device-qcom-qcs6490
 pkgdesc="Generic QCS6490"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -52,7 +52,7 @@ vulkan() {
 
 sha512sums="
 3287fbc2155133f350896028c205ebba910a491e8d4e951391ce414c8aa4f49801c80720df2c672894215e2a81ae65cfd2753dea1f76ff92e80e106cf211224f  30-initramfs-firmware-qcom-qcs6490.files
-c5c5c5e4e58ae7dfb78be6cbcff77b257f828eee7720b07a92e885acbf8e1b3201fca3d500630cadcf35c78f5eee09e1f398303ee1eed8573f240b81bdb9b445  deviceinfo
+f59289f88a4fabae73951a50d1ce54009800b409e6b9743a14a2ef57ce0fa8658f1fc009995e6188e1a644b7b3147263c16b9f8eedab1285f17f00d25d5f2084  deviceinfo
 b011963364382785cfc3b80ec380007ab8ff413b772421de40d2004f2f4bbe4bbfb0ed2ff038f1060329689edfedbfe7269e690309317db18d6c2c3ce08dcb5a  kernel-cmdline.conf
 a8c659732a4fa105baed0c94fb8d83cca84cb13392cd051765684f44a04e2ac0fd027ca7f363dcf137d2cc2a762bfcae257ff6c9728de211ea07230fceddf3dd  modules-initfs
 "
diff --git a/device/testing/device-qcom-qcs6490/deviceinfo b/device/testing/device-qcom-qcs6490/deviceinfo
index ffa2ade89..dfb642809 100644
--- a/device/testing/device-qcom-qcs6490/deviceinfo
+++ b/device/testing/device-qcom-qcs6490/deviceinfo
@@ -25,7 +25,6 @@ deviceinfo_flash_method="fastboot-bootpart"
 deviceinfo_flash_fastboot_partition_kernel="efi"
 deviceinfo_flash_fastboot_partition_rootfs="system"
 deviceinfo_getty="ttyMSM0;115200"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 # Required for devices using UFS as storage (instead of e.g. eMMC)
 deviceinfo_rootfs_image_sector_size="4096"
diff --git a/device/testing/device-qcom-rbx/APKBUILD b/device/testing/device-qcom-rbx/APKBUILD
index aca0b2927..a2b94d92e 100644
--- a/device/testing/device-qcom-rbx/APKBUILD
+++ b/device/testing/device-qcom-rbx/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=device-qcom-rbx
 pkgdesc="Generic device package for Qualcomm development boards"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -42,7 +42,7 @@ package() {
 }
 
 sha512sums="
-c98b1e452c534bb4b9f66ffa45f4fa1cd55bd30fa5a24ba179285560309473c07e2c5c2fc897548303fc1ccb4cd0ea74bdd41c715eb06df2772181c30b9abb48  deviceinfo
+d26ee511b31024c671ad770dd1bc88217c5b4c66406fbe9fed6fa0047899f8b6e790e93b827c72bac189a510cac5be2bd23f5beb88fe0e30619d670cc214d4b2  deviceinfo
 b011963364382785cfc3b80ec380007ab8ff413b772421de40d2004f2f4bbe4bbfb0ed2ff038f1060329689edfedbfe7269e690309317db18d6c2c3ce08dcb5a  kernel-cmdline.conf
 c48cf25a8d95dbd077fa159daa7bee312921b47aa2e1ac628fea92a74520b039736ce6b82509954ba1c4f4b99ed32fd26d1b2602b900308dee87581fa87c7129  modules-initfs
 "
diff --git a/device/testing/device-qcom-rbx/deviceinfo b/device/testing/device-qcom-rbx/deviceinfo
index 7ad108c2e..0e647df7b 100644
--- a/device/testing/device-qcom-rbx/deviceinfo
+++ b/device/testing/device-qcom-rbx/deviceinfo
@@ -19,7 +19,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_no_framebuffer="true"
 # uncomment to enable a getty on the serial port
 deviceinfo_getty="ttyMSM0;115200"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 
 # Look ma! no hands!
diff --git a/device/testing/device-qualcomm-sdm845/APKBUILD b/device/testing/device-qualcomm-sdm845/APKBUILD
index 19d1fae8c..df65d7634 100644
--- a/device/testing/device-qualcomm-sdm845/APKBUILD
+++ b/device/testing/device-qualcomm-sdm845/APKBUILD
@@ -3,7 +3,7 @@
 maintainer="Casey Connolly <casey.connolly@linaro.org>"
 pkgname=device-qualcomm-sdm845
 pkgdesc="Generic device package for Qualcomm SDM845 devices"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -43,7 +43,7 @@ package() {
 }
 
 sha512sums="
-47a2df65376db053b31f525f6f568b44fc2b4a5ff902c2ce4aa41f0169fd0853307b4e60169552b9c1b1179dbf7a85cc9f67d12b515931cc27681416c83a3b0b  deviceinfo
+9d2fd442e36426014d98e96afc55a0625db6f07bffe0d31822baad493e69ccc8a17eb687281ca8e5bd50edcd60df1c54583b67d05ead54a15efda32032bbb665  deviceinfo
 441cc0ae3fddf8026df58b0e0611024d321f2435d8be874a908f0670083676f2301596a2d789651dc3afb6b819905812eefa761503668d5f46fdd59e0de4e8ed  kernel-cmdline.conf
 5f3e1c286baea16a5b0a4a34cef7ad774d3aa5cc384e1deb4fba40d1f9372a708baf3b587e3edac69edcf04b5513f0111c1976b649b424cc721733ce4ddabc19  q6voiced.conf
 3bbacc8c260e2c0af509b9b123218f830610ac7aef82efc9b117fc62ccda4155e588be718dcb399102b5534a25900e53840083add166a7ac5b399ddc702de904  modules-initfs
diff --git a/device/testing/device-qualcomm-sdm845/deviceinfo b/device/testing/device-qualcomm-sdm845/deviceinfo
index 946b0a11e..e3ccf1cbf 100644
--- a/device/testing/device-qualcomm-sdm845/deviceinfo
+++ b/device/testing/device-qualcomm-sdm845/deviceinfo
@@ -19,7 +19,6 @@ deviceinfo_flash_method="fastboot-bootpart"
 # This is a bit confusing.
 deviceinfo_flash_fastboot_partition_kernel="system"
 deviceinfo_getty="ttyMSM0;115200"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 
 # Look ma! no hands!
diff --git a/device/testing/device-samsung-w767/APKBUILD b/device/testing/device-samsung-w767/APKBUILD
index e75cb30cb..fef75f27f 100644
--- a/device/testing/device-samsung-w767/APKBUILD
+++ b/device/testing/device-samsung-w767/APKBUILD
@@ -2,7 +2,7 @@
 maintainer=""
 pkgname=device-samsung-w767
 pkgdesc="Samsung Galaxy Book S"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -34,7 +34,7 @@ nonfree_firmware() {
 
 
 sha512sums="
-b2693bc449ee8b92383e17265b0ac89fcaee5e7bb800159ddcb05a29a96e7b01b4d72b4514819be2b16de29cdf2fccbc662d705ca7056bf2bc7eaa947c8ac994  deviceinfo
+0f9a706acaa61c880ac1d3ac1c9ce870d5b87b14542784a8e04ceb0d8476d045bf16ec6b921668cea3bf6783592c7a57dba36f90c5a58c44b9988039b4325cee  deviceinfo
 8fddc59e59615a85038d0cdc6a75c58b63b7b78791ece6e911b519f5cbef301366c12b3f11512b254b1f2f4563d29c1a2dbd0cd576c0b5925620f31cd29df498  kernel-cmdline.conf
 23ade4e4526fa1445240219d227f34a445a3298b63c15fca751eea7c5ba0306ce3a76e4ddee341f9aa6f0e02a7f9d3d0ebb4dda0aec8ae0585dd8f6de7483c85  modules-initfs
 "
diff --git a/device/testing/device-samsung-w767/deviceinfo b/device/testing/device-samsung-w767/deviceinfo
index fe1cfcf6d..55c73552c 100644
--- a/device/testing/device-samsung-w767/deviceinfo
+++ b/device/testing/device-samsung-w767/deviceinfo
@@ -18,5 +18,4 @@ deviceinfo_screen_height="1080"
 
 # Bootloader related
 # most parameters from: https://github.com/jhovold/linux/wiki/X13s#kernel-command-line
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
diff --git a/device/testing/device-valve-jupiter/APKBUILD b/device/testing/device-valve-jupiter/APKBUILD
index 03d01f690..f42d25bb4 100644
--- a/device/testing/device-valve-jupiter/APKBUILD
+++ b/device/testing/device-valve-jupiter/APKBUILD
@@ -1,7 +1,7 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=device-valve-jupiter
 pkgdesc="Valve Steam Deck"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -43,7 +43,7 @@ gnome_mobile() {
 
 sha512sums="
 f2b0e3bf013b87e13828f95d3db7327c7afee33a0703d764ea5b96f0f791a01af2f2685ab5b17db1729fe68e78fd0e39f3a9b2f53530aa493897066d87b43248  00-scaling-factor.gschema.override
-66062abf3fc325c3a180b46c60177e24384a2694fa5c055882fc713e885f5eba1b6a9fe7c006fe96693f6b06c82b3ac3b00badc097b8da47e1a8054540843e4c  deviceinfo
+8f68d7d07b9c69e7ef161a7bd192f31d1ad71532ab3d602d024568cb0f2ee73ea5776fe1b4afb48703153479facd4728dff1adf8caa10780b2f8e81f3233f1b8  deviceinfo
 5f84e68b7acb0387b479031c97cbb648452ff04fdf0667aeb27d8f3365f099a41dd97a5a470a7971d0eaf61f128f75f44c514c05bf5901c394209331250223c3  kernel-cmdline.conf
 07005dfb4be471a3988d34cb7cc40113e4b6ef6f518fc1f586d816673d5bb7a9c7c5878db77e635fdc460a2c6ceb120a5e8f9a06c20730d0aefc65e5a3165659  modules-initfs
 "
diff --git a/device/testing/device-valve-jupiter/deviceinfo b/device/testing/device-valve-jupiter/deviceinfo
index da692145a..59b6ee54d 100644
--- a/device/testing/device-valve-jupiter/deviceinfo
+++ b/device/testing/device-valve-jupiter/deviceinfo
@@ -16,5 +16,4 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="1280"
 deviceinfo_screen_height="800"
 # Bootloader related
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
diff --git a/device/testing/device-xiaomi-miatoll/APKBUILD b/device/testing/device-xiaomi-miatoll/APKBUILD
index c747d81e7..f3c887a99 100644
--- a/device/testing/device-xiaomi-miatoll/APKBUILD
+++ b/device/testing/device-xiaomi-miatoll/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Nikroks <nikroks@mainlining.org>"
 pkgname=device-xiaomi-miatoll
 pkgdesc="Xiaomi Redmi Note 9 Pro / Redmi Note 9S"
-pkgver=8
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -63,7 +63,7 @@ nonfree_firmware_openrc() {
 }
 
 sha512sums="
-feac868197774bf8f5ca28fa0ea832cd50dbdf49b5a052822b9c6d2e3fff54eb0596adbbdc88ca08da09e71d0e15794aac429fcbb8a11bf090cc416c21d9482e  deviceinfo
+78ba6fa05487289eaca8046992a6b4d26b29d64131e0628d01e43fb8cd9fbba5c07468e752984729cb500f24845439d28afea38db1f3360afbf1c8faae6257af  deviceinfo
 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb  kernel-cmdline.conf
 9a70ba5c036f2d3dc90c5c34a1d5bf0ef0805a19e5b49cd2821897bf3e6fe8af0cd2148aebb263807359ac616958da1c4032d85079d91d975f4bf220df1028ea  hexagonrpcd.confd
 9c1e77fd27ca8efb288099ed48f5f4cad71ae29a9c76a96d6aef471d3870a7aee3548cd0ed892407d5ce391814cf88145d22e1eba148e7008634c06700eecfbc  modules-initfs
diff --git a/device/testing/device-xiaomi-miatoll/deviceinfo b/device/testing/device-xiaomi-miatoll/deviceinfo
index 401d412f4..21fd85cb8 100644
--- a/device/testing/device-xiaomi-miatoll/deviceinfo
+++ b/device/testing/device-xiaomi-miatoll/deviceinfo
@@ -21,7 +21,6 @@ deviceinfo_flash_method="fastboot-bootpart"
 # Where to flash boot.img, or in our case where to flash the pmOS boot partition.
 # This is a bit confusing.
 deviceinfo_flash_fastboot_partition_kernel="cache"
-deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 
 # Required for devices using UFS as storage (instead of e.g. eMMC)
diff --git a/device/testing/device-xunlong-orangepi5-plus/APKBUILD b/device/testing/device-xunlong-orangepi5-plus/APKBUILD
index 5274fc3a2..629d9477f 100644
--- a/device/testing/device-xunlong-orangepi5-plus/APKBUILD
+++ b/device/testing/device-xunlong-orangepi5-plus/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="WeirdTreeThing <bradyn127@protonmail.com>"
 pkgname=device-xunlong-orangepi5-plus
 pkgdesc="Xunlong Orange Pi 5 Plus"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -32,7 +32,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-a4279c6471cc58781d542aef21ed236310490481a81ff21019f82c4eec4ae9877eb5a984f78232a003eeffde20ab9e9e89416f3b8b49a0ac5cc495df90ef05bc  deviceinfo
+3bed41bae1a8cf93b2418eda7bbf218a715bae1b33a2c3a10487ef153f4833ad9627126d3bcc7cbd3f06523ac5fb338b28d3134c94f486f9e8aa0b6680323ffe  deviceinfo
 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb  kernel-cmdline.conf
 c787cb2c449bb493375e7c1519f1c6e0c35bce038277ca3032364c4867693f9099050611c0cbd7f22181f33dda11888d1f09e3e5272cf73fe3245aadfe9c2bd8  modules-initfs
 "
diff --git a/device/testing/device-xunlong-orangepi5-plus/deviceinfo b/device/testing/device-xunlong-orangepi5-plus/deviceinfo
index 4b2bbcd69..a034cd08f 100644
--- a/device/testing/device-xunlong-orangepi5-plus/deviceinfo
+++ b/device/testing/device-xunlong-orangepi5-plus/deviceinfo
@@ -18,4 +18,3 @@ deviceinfo_getty="ttyS2;1500000"
 
 # Bootloader related
 deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"