diff --git a/device/testing/device-samsung-t03g/APKBUILD b/device/testing/device-samsung-t03g/APKBUILD
index 58efc3ee9..bd5ae158e 100644
--- a/device/testing/device-samsung-t03g/APKBUILD
+++ b/device/testing/device-samsung-t03g/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-t03g
 pkgdesc="Samsung Galaxy Note II (GSM)"
-pkgver=4
-pkgrel=1
+pkgver=5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -63,7 +63,7 @@ kernel_ea8061() {
 }
 
 sha512sums="
-d264c30d8e2f6d079f037f9b11b766de3948df94ec72f6fe612b9d35d63d4a94e71042a6176a45d9f503b5cba83c44a27b9f59e0002f9969e316e856bbf71b5b  deviceinfo
+d33b16f184ff3eb4c38b3b437586d7e834fb217928b7148ad03938ad8f460c90d1f73b300014cdc869998522ad55447282006d84e84f9ca7b9c48944e069b6fa  deviceinfo
 7f07ea4bc279549844d071d94d9000d6335ed7548e06c1526f82cd6ccb39b5f5a50414b1e6e77d803ed86074d35e5f9f66f8e1b6b8352a2b1d2a7cd1a9b68472  Midas.conf
 b25c730d18b176bed5890c800f1c1d3e224c1ccd410d2e4d64e9136fa1a715e46f85e66116d7a66c3b649c6ed09cdd9a48fc74ed7142c48092aef6ecb98c526a  HiFi.conf
 56a2bdffc273cb0a581192e65378ff50e71c7bc8a696af7d5e7c165a53c005aae104c4514c68afb668454c5a94ce78bd509f8a40e3401d67e16636b1ed81d051  modules-load.conf
diff --git a/device/testing/device-samsung-t03g/deviceinfo b/device/testing/device-samsung-t03g/deviceinfo
index 7b518e7e0..fc3d08953 100644
--- a/device/testing/device-samsung-t03g/deviceinfo
+++ b/device/testing/device-samsung-t03g/deviceinfo
@@ -2,35 +2,30 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
+
+# Device related
 deviceinfo_name="Samsung Galaxy Note II"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-t03g"
 deviceinfo_year="2012"
-deviceinfo_append_dtb="true"
-deviceinfo_dtb_s6evr02="exynos4412-n710x-s6evr02"
-deviceinfo_dtb_ea8061="exynos4412-n710x-ea8061"
-deviceinfo_arch="armv7"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
+deviceinfo_dtb_s6evr02="exynos4412-n7100-s6evr02"
+deviceinfo_dtb_ea8061="exynos4412-n7100-ea8061"
+deviceinfo_append_dtb="true"
 deviceinfo_external_storage="true"
-deviceinfo_screen_width="720"
-deviceinfo_screen_height="1280"
-deviceinfo_create_initfs_extra="true"
-
-# Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="2048"
+deviceinfo_arch="armv7"
+deviceinfo_create_initfs_extra="true"
+deviceinfo_drm="true"
+
+# Flashing related
 deviceinfo_flash_offset_base="0x40000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
-
-# Heimdall related
+deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_sparse="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_generate_bootimg="true"
 deviceinfo_flash_heimdall_partition_kernel="BOOT"
diff --git a/device/testing/device-samsung-t0lte/APKBUILD b/device/testing/device-samsung-t0lte/APKBUILD
index 840b73a54..bae84473e 100644
--- a/device/testing/device-samsung-t0lte/APKBUILD
+++ b/device/testing/device-samsung-t0lte/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-t0lte
 pkgdesc="Samsung Galaxy Note II LTE"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -63,7 +63,7 @@ kernel_ea8061() {
 }
 
 sha512sums="
-0a3de430c16b9cc93cfaa571e7fbfedac9b77d6dd719425818356dfa2973953cbfe9324502c2098732cdf1a703512f9b8b48ee3685bee904dbc421936ebf3b8b  deviceinfo
+5f42000045884155f81856ee697e5595618a5c809dd985c10cf5d2ef56488750407bfedd10eab199e80040a4318e02ed1d2700ec1dd9841bbc15277f736a2054  deviceinfo
 7f07ea4bc279549844d071d94d9000d6335ed7548e06c1526f82cd6ccb39b5f5a50414b1e6e77d803ed86074d35e5f9f66f8e1b6b8352a2b1d2a7cd1a9b68472  Midas.conf
 b25c730d18b176bed5890c800f1c1d3e224c1ccd410d2e4d64e9136fa1a715e46f85e66116d7a66c3b649c6ed09cdd9a48fc74ed7142c48092aef6ecb98c526a  HiFi.conf
 56a2bdffc273cb0a581192e65378ff50e71c7bc8a696af7d5e7c165a53c005aae104c4514c68afb668454c5a94ce78bd509f8a40e3401d67e16636b1ed81d051  modules-load.conf
diff --git a/device/testing/device-samsung-t0lte/deviceinfo b/device/testing/device-samsung-t0lte/deviceinfo
index 8ee4e8ec4..74d33eb3f 100644
--- a/device/testing/device-samsung-t0lte/deviceinfo
+++ b/device/testing/device-samsung-t0lte/deviceinfo
@@ -2,35 +2,30 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
+
+# Device related
 deviceinfo_name="Samsung Galaxy Note II LTE"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-t0lte"
 deviceinfo_year="2012"
-deviceinfo_append_dtb="true"
-deviceinfo_dtb_s6evr02="exynos4412-n710x-s6evr02"
-deviceinfo_dtb_ea8061="exynos4412-n710x-ea8061"
-deviceinfo_arch="armv7"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
 deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
+deviceinfo_dtb_s6evr02="exynos4412-n7105-s6evr02"
+deviceinfo_dtb_ea8061="exynos4412-n7105-ea8061"
+deviceinfo_append_dtb="true"
 deviceinfo_external_storage="true"
-deviceinfo_screen_width="720"
-deviceinfo_screen_height="1280"
-deviceinfo_create_initfs_extra="true"
-
-# Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="2048"
+deviceinfo_arch="armv7"
+deviceinfo_create_initfs_extra="true"
+deviceinfo_drm="true"
+
+# Flashing related
 deviceinfo_flash_offset_base="0x40000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
-
-# Heimdall related
+deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_sparse="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_generate_bootimg="true"
 deviceinfo_flash_heimdall_partition_kernel="BOOT"