diff --git a/device/testing/device-fairphone-fp2/APKBUILD b/device/testing/device-fairphone-fp2/APKBUILD
index 858a55a6047b4fc07874bae24690f6093291c637..bf15890e16f3b8b40f6ae41ec1edb4a8d2c410b7 100644
--- a/device/testing/device-fairphone-fp2/APKBUILD
+++ b/device/testing/device-fairphone-fp2/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp2
 pkgdesc="Fairphone 2"
-pkgver=7
-pkgrel=7
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -90,7 +90,7 @@ phosh() {
 }
 
 sha512sums="
-f44cc3b5db025b0df7e3df88561a46b10b8b106e27e5a227ea50b44ebbd91d2986f4eac3a5f1e3cbac2d3a8c119708d22c057bbb9e4fc7b3b9c0c03460f5e850  deviceinfo
+4f662c7c66601a9c277b260cbbd2806d37cdc273f39599bc49bbc0974a8dd6541338f3a4f9ca3758670b72ee56df64ae918781c21b7ee9441cee40408e983196  deviceinfo
 1a99953420a4068c6205dd90015e895909d39011dcc72fd73ac6880920fe4b95fe54377b9d4864a2d4fac56c4334e0c896ba8cc92dea61f93e9384de0998a910  modules-initfs.mainline
 55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f  FP2.conf
 b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1  hifi
diff --git a/device/testing/device-fairphone-fp2/deviceinfo b/device/testing/device-fairphone-fp2/deviceinfo
index 3c2cca11e0cfd0dce038577ff9909cd11e53bc1b..d9cc256d127cf18730ab55e316bcb962b004f0cd 100644
--- a/device/testing/device-fairphone-fp2/deviceinfo
+++ b/device/testing/device-fairphone-fp2/deviceinfo
@@ -26,6 +26,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1"
 deviceinfo_kernel_cmdline_mainline="earlycon=msm_serial_dm,0xf991e000 msm.vram=192m msm.allow_vram_carveout=1"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
diff --git a/device/testing/device-lg-hammerhead/APKBUILD b/device/testing/device-lg-hammerhead/APKBUILD
index 208ff66c55c332fdbda757d1a3fdb46f1bcd23d7..1fce184194e6b90fcf3f7436e22ff084af17fbd1 100644
--- a/device/testing/device-lg-hammerhead/APKBUILD
+++ b/device/testing/device-lg-hammerhead/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-hammerhead
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
 arch="armv7"
@@ -86,7 +86,7 @@ sha512sums="
 f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr.conf
 b0ff3cf868380481638cce975688eb622e50d4a45a877892e087789ad7f292f8723de1fbf3da2af445adad31df99d7976c31dcf4f685a046b644b38aa109067d  20-gsk-gpu-workaround.sh
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
-9d4839f940ff55dc3213e4fae3f119a5cd9c5242f06fb835fb7cf38d8455ba2278c41fef41e2dcd9f6aa06857ec772c2ca9ba018e482f7e8b32409a42542774f  deviceinfo
+a4cc185a61fd0657783ee3f3a1bb897ea5adced032b71e8fc84e0211bf91a194d2c9651211cf4f6a6e4309358466d708503643e15d316198294109c599ad749e  deviceinfo
 fd639faebbee2c0c2c227710678376e0d039b7d96a62103f7ba7e6304d7060023f09064918e93a125465d20d125c0334225680521a7aeae5a43d77d7360c180c  modules-initfs
 ee1deae3c21de4dfcf9842abc7ba984229fd37bff058cb630a9bd44e787484ddfa3e5d4d85dbd30850d3ac34822aa91c82c3a5d7c107a990f202fb7da2f4db98  phoc.ini
 0a9da551fa9d48d8a663f6bc74e8a7d6e2d2a6e009bd163fa46cd302e75656ad7ae57402a0bd70614ec253e0f2445b4c6999df07104f4c657ed630305c7f40d4  xorg.conf
diff --git a/device/testing/device-lg-hammerhead/deviceinfo b/device/testing/device-lg-hammerhead/deviceinfo
index 82e1b10462c557c05d15d4451d7e5ca83ad7de60..dc48944f7ffc42512b816d157327cb86f1973921 100644
--- a/device/testing/device-lg-hammerhead/deviceinfo
+++ b/device/testing/device-lg-hammerhead/deviceinfo
@@ -21,6 +21,7 @@ deviceinfo_gpu_accelerated="true"
 
 # Fastboot related
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_kernel_on_update="true"
diff --git a/device/testing/device-oneplus-bacon/APKBUILD b/device/testing/device-oneplus-bacon/APKBUILD
index b9bed54fa2c80d8b2743b272b4df38f90e305356..8f829efc325dacb4fa17203edc35587f03795e04 100644
--- a/device/testing/device-oneplus-bacon/APKBUILD
+++ b/device/testing/device-oneplus-bacon/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-bacon
-pkgver=3
-pkgrel=2
+pkgver=4
+pkgrel=0
 pkgdesc="OnePlus One"
 url="https://postmarketos.org"
 arch="armv7"
@@ -49,7 +49,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-28ba572e6e45383e5a55670977195235dab098439987f57aa02fa2bb4865877bf2156f665301e25af051742e828f15cae74ee2de306cfc45d092dedd6a83bac2  deviceinfo
+c287140317c0cf8bc912ceb75260dd95f95e4222b507e0f2c3d436e1c3e0ae9055108a9a70748b6bf0a5465339ffb18286e62d6f5e2ee1e050a1ef904474bd20  deviceinfo
 fd639faebbee2c0c2c227710678376e0d039b7d96a62103f7ba7e6304d7060023f09064918e93a125465d20d125c0334225680521a7aeae5a43d77d7360c180c  modules-initfs.mainline
 65e9ee7352b1dc39d99ea411eb0ed9c56f9975230907db5add3a1b4146cdf6f227c934052dab38a1937ed67d67585f28fb7410f10a1bec9dd5e4eb69d7253515  90-android-touch-dev.rules
 "
diff --git a/device/testing/device-oneplus-bacon/deviceinfo b/device/testing/device-oneplus-bacon/deviceinfo
index 28d9baa9a7e7d523621eaa747e7a4ffdafa31d79..a77c9a8ddd2e4285771a6a72ec0687e498c080fb 100644
--- a/device/testing/device-oneplus-bacon/deviceinfo
+++ b/device/testing/device-oneplus-bacon/deviceinfo
@@ -22,6 +22,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=bacon user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1 buildvariant=userdebug"
 deviceinfo_kernel_cmdline_mainline="msm.vram=192m msm.allow_vram_carveout=1"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02000000"
diff --git a/device/testing/device-samsung-klte/APKBUILD b/device/testing/device-samsung-klte/APKBUILD
index 6577c6acf26ac2287be1acf50af34e0943c7d319..2447b6da441ecc0abcf3f7a8c8aebe8a1a57f4c5 100644
--- a/device/testing/device-samsung-klte/APKBUILD
+++ b/device/testing/device-samsung-klte/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5 (G900F/G9006/G9008/G9009W)"
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -64,6 +64,6 @@ nonfree_firmware() {
 
 sha512sums="
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
-74118bac1032a58f4d337b91410fee5c71d3380bfef4f656407fa5cf93717ee0dcdd2464e4ccaad5c5f2f93f20f8ff6ad8e3a4631708cbee8227bc6056c904a0  deviceinfo
+ad2971c45756c705c0cb52709be14fe41a2cef8087aeeaefddecefa94dfe9c5d819f58379ee710dc9ab37a809b775c1fef848145b4694f34f289dbad0e2ac990  deviceinfo
 0e123f1ce1255395addf08218c7ca7947c7dbd0a81f578ff1c96c53c51bb2c616cd50b390fa92f6fc67ed9c73957f8dd8390213df1520e2d97b9ff256ddbb954  modules-initfs
 "
diff --git a/device/testing/device-samsung-klte/deviceinfo b/device/testing/device-samsung-klte/deviceinfo
index 5dc8ae2ada8e20f9aeb256cfc6fb5a1f96741389..969b4ab67d195418bf1e6d1d88029877e7227f22 100644
--- a/device/testing/device-samsung-klte/deviceinfo
+++ b/device/testing/device-samsung-klte/deviceinfo
@@ -25,6 +25,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_flash_sparse="true"
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 msm.vram=192m msm.allow_vram_carveout=1"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
diff --git a/device/testing/device-sony-leo/APKBUILD b/device/testing/device-sony-leo/APKBUILD
index 2a690d8fc3aae1f996d6fc4aea1dc7700bd076f0..bd1987972fb64ede028d27a6f700fb9270ba41dc 100644
--- a/device/testing/device-sony-leo/APKBUILD
+++ b/device/testing/device-sony-leo/APKBUILD
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-leo
 pkgdesc="Sony Xperia Z3"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -57,5 +57,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-cede75ba790a68fe96d8aa7fdc82439d20afb26bf9df78072e73ad3cca5fa3ea8d318a11008a7bb9bad71302fc28ca61219fb5fd19bfa839bf6ae9b76aa80f9d  deviceinfo
+6a3c544e9044c560af3cb2342b3c61d0c22a5e7e099e0a92dab4ed94b8ec3eae263f08209218d24c16382529a13f52d5bb0428a2a6730a3978823cb9f7a86094  deviceinfo
 "
diff --git a/device/testing/device-sony-leo/deviceinfo b/device/testing/device-sony-leo/deviceinfo
index ed03104635c81ca733e5427cf8c5f1dc74a3e82a..144e86317247f19da5b2e1dcc81f60ee4b1c06a7 100644
--- a/device/testing/device-sony-leo/deviceinfo
+++ b/device/testing/device-sony-leo/deviceinfo
@@ -23,6 +23,7 @@ deviceinfo_append_dtb_mainline="true"
 deviceinfo_flash_method="fastboot"
 
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x00000000"