diff --git a/device/testing/device-kobo-clara/APKBUILD b/device/testing/device-kobo-clara/APKBUILD
index 577225b7f..db9e565b7 100644
--- a/device/testing/device-kobo-clara/APKBUILD
+++ b/device/testing/device-kobo-clara/APKBUILD
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-kobo-clara
 pkgdesc="Kobo Clara HD"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -30,6 +30,6 @@ package() {
 }
 
 sha512sums="
-b4b294767cf54299ae20b2f0a9520bd53ebae57e968f213f3f6216b3405868fa8bd78193d4e7652a7d3809f8d81343a2642cce1d85afbf4ec47c783e75629dbc  deviceinfo
+7235e7c690715b1a1fa508307b5051efbe46349d3b21812924105bf136d0420550b2cfaf5c22e3241b55c91438f35bf56b452b7afe84b31b44c4b89744c60efa  deviceinfo
 5d53ee902538e53c4fe79eaef8e3800b9d3f73ec70d2a9887ddb11a6715ca76ce17128e3c02c2b6f2f575fb86f15c2415c24466d4b1a031f7a346d0db186dcb1  modules-initfs
 "
diff --git a/device/testing/device-kobo-clara/deviceinfo b/device/testing/device-kobo-clara/deviceinfo
index df0c05d0a..66d81b735 100644
--- a/device/testing/device-kobo-clara/deviceinfo
+++ b/device/testing/device-kobo-clara/deviceinfo
@@ -25,5 +25,9 @@ deviceinfo_boot_part_start="49152"
 deviceinfo_getty="ttymxc0;115200"
 deviceinfo_no_framebuffer="true"
 
+# GPT is supported, but bootloader location conflict with default GPT header
+# location and specifying a custom location is not supported here yet
+deviceinfo_partition_type="msdos"
+
 deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_sd_embed_firmware="u-boot/kobo-clara/u-boot.imx:2"
diff --git a/device/testing/device-kobo-clara2e/APKBUILD b/device/testing/device-kobo-clara2e/APKBUILD
index a5cf37bce..572b97fbc 100644
--- a/device/testing/device-kobo-clara2e/APKBUILD
+++ b/device/testing/device-kobo-clara2e/APKBUILD
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-kobo-clara2e
 pkgdesc="Kobo Clara 2E"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -34,6 +34,6 @@ package() {
 }
 
 sha512sums="
-57a6c9fbf96f3adeb64462a859226fa846a0b1344667cf1b143f79e0c736b18be6be16d26856b48a77a819c7beb6fd6255fcceb57b1010a870aef369e2a21f10  deviceinfo
+8c9233bdeac073310b916efc8a3f59f1a69dec4cf561ce141e2701ecd245f61372cd16ce8bd718f34bb70014687f6cd02a1dc1d678201687cdb6c0f40e52efaa  deviceinfo
 90da9f4f7833af6286c7dad81c5601bb2e35f814f501d02d9e37a80f35c453ae8b8a5c49ed36fcb5b35eef1d81280679a82ef80a60b4bca373a33b0b8f881511  modules-initfs
 "
diff --git a/device/testing/device-kobo-clara2e/deviceinfo b/device/testing/device-kobo-clara2e/deviceinfo
index c485df689..cb6c1ec29 100644
--- a/device/testing/device-kobo-clara2e/deviceinfo
+++ b/device/testing/device-kobo-clara2e/deviceinfo
@@ -25,5 +25,9 @@ deviceinfo_boot_part_start="49152"
 deviceinfo_getty="ttymxc0;115200"
 deviceinfo_no_framebuffer="true"
 
+# GPT is supported, but bootloader location conflict with default GPT header
+# location and specifying a custom location is not supported here yet
+deviceinfo_partition_type="msdos"
+
 deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_sd_embed_firmware="u-boot/kobo-clara2e/u-boot.imx:2"
diff --git a/device/testing/device-kobo-librah2o/APKBUILD b/device/testing/device-kobo-librah2o/APKBUILD
index 71b8b12c5..d2bc3cd1e 100644
--- a/device/testing/device-kobo-librah2o/APKBUILD
+++ b/device/testing/device-kobo-librah2o/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-kobo-librah2o
 pkgdesc="Kobo Libra H2O"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -33,6 +33,6 @@ package() {
 }
 
 sha512sums="
-0365f6c88c15f9d99d00c28d45144bf0321a8484fbf44b491cbe1493643180f1fcd5192d42991073d771be17eae2ec0a8b6826018e9ffb68e530fad11f02b96c  deviceinfo
+c4a5ad43cbc8879b261ed995b7468315bb0984006de5824c778ecd93180a07def0aa27588478021af0b3eb306699530a689b7f0d221380d389d66dcda540533c  deviceinfo
 778674f41c19c56ed8677f151175d22da53e94e03c48d900036287b17a37ba9816976138ad317ec220d807a6ff97ca1006c6ae73c39801929f23927e665f35df  uboot-script.cmd
 "
diff --git a/device/testing/device-kobo-librah2o/deviceinfo b/device/testing/device-kobo-librah2o/deviceinfo
index d56a7718f..cf2946af4 100644
--- a/device/testing/device-kobo-librah2o/deviceinfo
+++ b/device/testing/device-kobo-librah2o/deviceinfo
@@ -25,5 +25,9 @@ deviceinfo_getty="ttymxc0;115200"
 deviceinfo_generate_legacy_uboot_initfs="true"
 deviceinfo_no_framebuffer="true"
 
+# GPT is supported, but bootloader location conflict with default GPT header
+# location and specifying a custom location is not supported here yet
+deviceinfo_partition_type="msdos"
+
 deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_sd_embed_firmware="u-boot/kobo-librah2o/u-boot.imx:2,u-boot/kobo-librah2o/u-boot-env.bin:1536"
diff --git a/device/testing/device-kobo-nia/APKBUILD b/device/testing/device-kobo-nia/APKBUILD
index 895cd584f..a71c3c4a2 100644
--- a/device/testing/device-kobo-nia/APKBUILD
+++ b/device/testing/device-kobo-nia/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-kobo-nia
 pkgdesc="Kobo Nia"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -28,6 +28,6 @@ package() {
 }
 
 sha512sums="
-2b9fc664aca8686e215ffde3deeca3b2d9d167d9d0fd9109333fae7ae3a1beb6759bed6d2bb3d9aa822ac50477505158db710317e756ecd7295356f622972d19  deviceinfo
+c41d24344d7660a5b2ccc37d6558800789c15561d2d7d551a090f79ce514f5125a99b5391d071f8563f37a372407f7e893e668feb95e458eea1ab5e6d904bb2b  deviceinfo
 4f38f2805647406ff8114833aed585048f1d1412844c645b7fc9813acba7d4149db400ec942d293aee8f090f8369c295bad4d418c28563a33b41340102ff0263  modules-initfs
 "
diff --git a/device/testing/device-kobo-nia/deviceinfo b/device/testing/device-kobo-nia/deviceinfo
index e7b111b6f..5e3cdea14 100644
--- a/device/testing/device-kobo-nia/deviceinfo
+++ b/device/testing/device-kobo-nia/deviceinfo
@@ -25,5 +25,9 @@ deviceinfo_boot_part_start="49152"
 deviceinfo_getty="ttymxc0;115200"
 deviceinfo_no_framebuffer="true"
 
+# GPT is supported, but bootloader location conflict with default GPT header
+# location and specifying a custom location is not supported here yet
+deviceinfo_partition_type="msdos"
+
 deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_sd_embed_firmware="u-boot/kobo-nia/u-boot.imx:2"
diff --git a/device/testing/device-tolino-shine2hd/APKBUILD b/device/testing/device-tolino-shine2hd/APKBUILD
index 1fbcc4b46..49a372e5f 100644
--- a/device/testing/device-tolino-shine2hd/APKBUILD
+++ b/device/testing/device-tolino-shine2hd/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-tolino-shine2hd
 pkgdesc="Tolino Shine 2 HD"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -37,6 +37,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-5cd2564af554277cfa5ec5d191ed3841ca15c1a5eeb34cfba3ae3e4f8d8eb3dea5ab4c1b7382344bcb2dc782475690b3b78b62ecf7e2eb1d563a40ea587e665d  deviceinfo
+f34e4efe2b36bf8dfc4aa8e5fcd34d3561e4fc39783429e030635617041cce26f1b8ac8ee36e6eb37579386faa02f964c2119549ed02ab09092b47b9a52e6669  deviceinfo
 5d53ee902538e53c4fe79eaef8e3800b9d3f73ec70d2a9887ddb11a6715ca76ce17128e3c02c2b6f2f575fb86f15c2415c24466d4b1a031f7a346d0db186dcb1  modules-initfs
 "
diff --git a/device/testing/device-tolino-shine2hd/deviceinfo b/device/testing/device-tolino-shine2hd/deviceinfo
index 8590efc4c..8132990de 100644
--- a/device/testing/device-tolino-shine2hd/deviceinfo
+++ b/device/testing/device-tolino-shine2hd/deviceinfo
@@ -27,5 +27,9 @@ deviceinfo_boot_part_start="49152"
 deviceinfo_getty="ttymxc0;115200"
 deviceinfo_no_framebuffer="true"
 
+# GPT is supported, but bootloader location conflict with default GPT header
+# location and specifying a custom location is not supported here yet
+deviceinfo_partition_type="msdos"
+
 deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_sd_embed_firmware="u-boot/tolino-shine2hd/u-boot.imx:2"
diff --git a/device/testing/device-tolino-shine3/APKBUILD b/device/testing/device-tolino-shine3/APKBUILD
index 28b61248a..ac6a5d217 100644
--- a/device/testing/device-tolino-shine3/APKBUILD
+++ b/device/testing/device-tolino-shine3/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-tolino-shine3
 pkgdesc="Tolino Shine 3"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -30,6 +30,6 @@ package() {
 }
 
 sha512sums="
-73515b117808d883ce54c7526fdc9a63c67f5ecedc4be6fff6022dca1df9a4f3bdfae95184078368ce5962dd2538083ae6a27c877f77079abba9694a3feeb5b0  deviceinfo
+d77b979f694c8bcb672267800bc276d7888da73cb6fb666558789fd44030af00caf1aee75b82a216d496b2690c98392ef00dc8bc33f5e24755ba0fdab80100ae  deviceinfo
 5d53ee902538e53c4fe79eaef8e3800b9d3f73ec70d2a9887ddb11a6715ca76ce17128e3c02c2b6f2f575fb86f15c2415c24466d4b1a031f7a346d0db186dcb1  modules-initfs
 "
diff --git a/device/testing/device-tolino-shine3/deviceinfo b/device/testing/device-tolino-shine3/deviceinfo
index 0165b7c9d..b1d2b1015 100644
--- a/device/testing/device-tolino-shine3/deviceinfo
+++ b/device/testing/device-tolino-shine3/deviceinfo
@@ -27,5 +27,9 @@ deviceinfo_boot_part_start="49152"
 deviceinfo_getty="ttymxc0;115200"
 deviceinfo_no_framebuffer="true"
 
+# GPT is supported, but bootloader location conflict with default GPT header
+# location and specifying a custom location is not supported here yet
+deviceinfo_partition_type="msdos"
+
 deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_sd_embed_firmware="u-boot/tolino-shine3/u-boot.imx:2"