diff --git a/device/testing/device-amediatech-x96-mini/APKBUILD b/device/testing/device-amediatech-x96-mini/APKBUILD
index 050a8d38b..806ef7b64 100644
--- a/device/testing/device-amediatech-x96-mini/APKBUILD
+++ b/device/testing/device-amediatech-x96-mini/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=device-amediatech-x96-mini
-pkgver=2
+pkgver=3
 pkgrel=0
 pkgdesc="Amediatech X96 mini"
 url="https://postmarketos.org"
@@ -32,6 +32,6 @@ nonfree_firmware() {
 
 sha512sums="
 981ef458837524b2b1922e7bc5abd4936d629e3f83e92062b46597cef985b65fdb90900de1ef93a7d741b9b0ac4b41cef9c3c2625181ff0e10effc22cb2fa3a3  asound.state
-c7d9003f62a5622b2bf70a2a6a9affbc803b71d687db5775ff608b69eb2eab2c8d52fe6cda93d27a0f01e2c04c9d19952ac382014319080491afc0af3ae37162  deviceinfo
+aa23fb720f9fa5ed82b809fdc1aea6500f9747ddbb553907bc4292633bd7611e6ec07310ea72ce3fd3be6ee5e8a80ddb84d51901ce29d25a7725f423f66c6b7a  deviceinfo
 b9f3e1902c17909de928c99868265a257ba5873f6ea6aa1097ad10721f59d68342d50ee51992472ecd23722f7664a13dd15f4e26071a40595c7c3e5161e533d7  modules-initfs
 "
diff --git a/device/testing/device-amediatech-x96-mini/deviceinfo b/device/testing/device-amediatech-x96-mini/deviceinfo
index 94b27efc8..3d319ed5b 100644
--- a/device/testing/device-amediatech-x96-mini/deviceinfo
+++ b/device/testing/device-amediatech-x96-mini/deviceinfo
@@ -8,6 +8,7 @@ deviceinfo_dtb="amlogic/meson-gxl-s905w-x96-mini"
 deviceinfo_year="2017"
 deviceinfo_arch="aarch64"
 deviceinfo_disable_dhcpd="true"
+deviceinfo_partition_type="msdos"
 
 # Device related
 deviceinfo_gpu_accelerated="true"
diff --git a/device/testing/device-amlogic-tvbox/APKBUILD b/device/testing/device-amlogic-tvbox/APKBUILD
index 44b8dd68d..4d64fcd49 100644
--- a/device/testing/device-amlogic-tvbox/APKBUILD
+++ b/device/testing/device-amlogic-tvbox/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-amlogic-tvbox
 pkgdesc="Amlogic TV box"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -58,6 +58,6 @@ kernel_xiaomi_once() {
 }
 
 sha512sums="
-f676256f02dba6e0dcdf3ef763cb96e4a0e6b44ba5cddfb0e675a808d5dd37267abb9086d9fa401d7cb39cf99f7fe63866baacb0d9959b7357cc8824236e3789  deviceinfo
+f0051118ea2948821b11bf754c55e926fd3e35be1b1682310e45cf80e174c69ea3e7f13f294deef741a6198407e9b12b366202009269f80207ca45d7130bb786  deviceinfo
 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs
 "
diff --git a/device/testing/device-amlogic-tvbox/deviceinfo b/device/testing/device-amlogic-tvbox/deviceinfo
index 7994e27c0..688c53327 100644
--- a/device/testing/device-amlogic-tvbox/deviceinfo
+++ b/device/testing/device-amlogic-tvbox/deviceinfo
@@ -12,6 +12,7 @@ deviceinfo_dtb_p212="amlogic/meson-gxl-p212"
 deviceinfo_dtb_videostrong_kii_pro="amlogic/meson-gxbb-kii-pro"
 deviceinfo_dtb_xiaomi_once="amlogic/meson-gxl-s905x-xiaomi-once"
 deviceinfo_arch="aarch64"
+deviceinfo_partition_type="msdos"
 
 # Device related
 deviceinfo_chassis="desktop"
diff --git a/device/testing/device-beelink-gt1/APKBUILD b/device/testing/device-beelink-gt1/APKBUILD
index 7031ff137..2e8f01f89 100644
--- a/device/testing/device-beelink-gt1/APKBUILD
+++ b/device/testing/device-beelink-gt1/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer:
 pkgname=device-beelink-gt1
-pkgver=1
-pkgrel=6
+pkgver=2
+pkgrel=0
 pkgdesc="Beelink gt1 (Ultimate)"
 url="https://postmarketos.org"
 license="MIT"
@@ -50,7 +50,7 @@ nonfree_firmware() {
 
 sha512sums="
 a38e33d5bce26549c73f9aad2988ef8d7e7a3bbb28ac37348545fe7edb935be1b51dbdf8a857fb9d49be7e6eab7d40ac2f11fdcd618487747b809f7236ccf57b  asound.state
-7e772410cde1110e6b91a08fffdc6d8bc123497857f44ed2a9842deb6d63c107033659dafb25c075198be01ad2f83935e17eded06634680ddfe84776153834e5  deviceinfo
+b6099ab1d0f1f0f7d00c65275d0f5366793adf8755296408e0494decf4f6740e425ed1013c9940bdb869e66283b890b3e7446fbf171f3da692b1b67c9381c23f  deviceinfo
 b9f3e1902c17909de928c99868265a257ba5873f6ea6aa1097ad10721f59d68342d50ee51992472ecd23722f7664a13dd15f4e26071a40595c7c3e5161e533d7  modules-initfs.alpine
 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs.amlogic
 "
diff --git a/device/testing/device-beelink-gt1/deviceinfo b/device/testing/device-beelink-gt1/deviceinfo
index ed6993794..c7f4355b1 100644
--- a/device/testing/device-beelink-gt1/deviceinfo
+++ b/device/testing/device-beelink-gt1/deviceinfo
@@ -8,6 +8,7 @@ deviceinfo_codename="beelink-gt1"
 deviceinfo_dtb="amlogic/meson-gxm-gt1-ultimate"
 deviceinfo_year="2016"
 deviceinfo_arch="aarch64"
+deviceinfo_partition_type="msdos"
 
 # Device related
 deviceinfo_gpu_accelerated="true"
diff --git a/device/testing/device-librecomputer-lepotato/APKBUILD b/device/testing/device-librecomputer-lepotato/APKBUILD
index 8227beadb..118cbb6c4 100644
--- a/device/testing/device-librecomputer-lepotato/APKBUILD
+++ b/device/testing/device-librecomputer-lepotato/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-librecomputer-lepotato
 pkgdesc="Libre Computer AML-S905X-CC-V1.0"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -36,6 +36,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-b5005b9546c95275c9370a0ec808fbb80b0c46adfc5e3819c364df662ee88d8483b3ec150fb0b2a5a20fb13500f8c34ad19e5b68dd662eeac9d3f421feb5529f  deviceinfo
+79a809f6b2397b1e9d7a6a3d23811fe74eeb28f9039fef1f52329da9399a234d21161f92ffd1350efe5907195f8a8a6cb11e75c7264b4cb826afc942e903fc11  deviceinfo
 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs
 "
diff --git a/device/testing/device-librecomputer-lepotato/deviceinfo b/device/testing/device-librecomputer-lepotato/deviceinfo
index fd720e77b..1993ee815 100644
--- a/device/testing/device-librecomputer-lepotato/deviceinfo
+++ b/device/testing/device-librecomputer-lepotato/deviceinfo
@@ -9,6 +9,7 @@ deviceinfo_codename="librecomputer-lepotato"
 deviceinfo_year="2019"
 deviceinfo_dtb="amlogic/meson-gxl-s905x-libretech-cc"
 deviceinfo_arch="aarch64"
+deviceinfo_partition_type="msdos"
 
 # Device related
 deviceinfo_chassis="embedded"
diff --git a/device/testing/device-radxa-zero/APKBUILD b/device/testing/device-radxa-zero/APKBUILD
index d7167723e..1548cd674 100644
--- a/device/testing/device-radxa-zero/APKBUILD
+++ b/device/testing/device-radxa-zero/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=device-radxa-zero
-pkgver=1
-pkgrel=4
+pkgver=2
+pkgrel=0
 pkgdesc="Radxa Zero"
 url="https://postmarketos.org"
 license="MIT"
@@ -37,6 +37,6 @@ nonfree_firmware() {
 
 
 sha512sums="
-ebd96850655228d7a063312f71058e90306622914443453378e0079cfd235357b62c80abf8fadd9ca2b266cc8df0a6624920eb34467f606b661a4bd97b23030b  deviceinfo
+7626cb1d74af15ff89f70b9c7578daa71aeec5c5237db50ca188ce820dfab7a26f921f7c1c8c37a3ea4f57bed1797ff0ca7da4c0e065e68b509c191f15867c64  deviceinfo
 b9f3e1902c17909de928c99868265a257ba5873f6ea6aa1097ad10721f59d68342d50ee51992472ecd23722f7664a13dd15f4e26071a40595c7c3e5161e533d7  modules-initfs
 "
diff --git a/device/testing/device-radxa-zero/deviceinfo b/device/testing/device-radxa-zero/deviceinfo
index 670e0a080..4dcb2d148 100644
--- a/device/testing/device-radxa-zero/deviceinfo
+++ b/device/testing/device-radxa-zero/deviceinfo
@@ -8,6 +8,7 @@ deviceinfo_codename="radxa-zero"
 deviceinfo_dtb="amlogic/meson-g12a-radxa-zero"
 deviceinfo_year="2021"
 deviceinfo_arch="aarch64"
+deviceinfo_partition_type="msdos"
 
 # Device related
 deviceinfo_gpu_accelerated="true"
diff --git a/device/testing/device-zte-b860hv5/APKBUILD b/device/testing/device-zte-b860hv5/APKBUILD
index 997cb3555..bd53f2143 100644
--- a/device/testing/device-zte-b860hv5/APKBUILD
+++ b/device/testing/device-zte-b860hv5/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Doni Halim <donihaalim@gmail.com>
 pkgname=device-zte-b860hv5
 pkgdesc="ZTE ZXV10 B860HV5"
-pkgver=0.1
-pkgrel=1
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -28,6 +28,6 @@ package() {
 }
 
 sha512sums="
-c1d8a2047649cb745cb12226f1ce19cfeb6926a06d9f257446cd84600a1fbdb1fec3acb100502119cf95e0c0bf37a41756a41149406bf42fb76ef4b510da5ae0  deviceinfo
+bc718817e2b07c8720c5cfb7390c6c4d73e13b6dd81cd9c5bcfa1b4c9ed4edc83ca563e9127e367e26d03133cc2316cdc88318001bfa8e53125920eff599e327  deviceinfo
 cbd7012fcb2db0f11f694ffa621e4c47447f6b36690366da35a16918b20e58a0324cfd07eb3ed7165887e099100286098d19ae131bd62ac8b3a088780f59a1d8  modules-initfs
 "
diff --git a/device/testing/device-zte-b860hv5/deviceinfo b/device/testing/device-zte-b860hv5/deviceinfo
index e9e816a41..1a48d89e6 100644
--- a/device/testing/device-zte-b860hv5/deviceinfo
+++ b/device/testing/device-zte-b860hv5/deviceinfo
@@ -9,6 +9,7 @@ deviceinfo_codename="zte-b860hv5"
 deviceinfo_year="2019"
 deviceinfo_dtb="amlogic/meson-g12a-b860hv5"
 deviceinfo_arch="aarch64"
+deviceinfo_partition_type="msdos"
 
 # Device related
 deviceinfo_chassis="embedded"