diff --git a/device/testing/device-samsung-n1awifi/APKBUILD b/device/testing/device-samsung-n1awifi/APKBUILD
index 9b7a43aa9..0b49b7f2e 100644
--- a/device/testing/device-samsung-n1awifi/APKBUILD
+++ b/device/testing/device-samsung-n1awifi/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Hendrik Noack <hendrik.noack@protonmail.com>"
 pkgname=device-samsung-n1awifi
 pkgdesc="Samsung Galaxy Note 10.1 (2014) WiFi"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -13,8 +13,9 @@ depends="
 	linux-firmware-brcm
 	linux-firmware-s5p-mfc
 	linux-postmarketos-exynos5
-	mkbootimg
 	postmarketos-base
+	u-boot-exynos5420
+	systemd-boot
 "
 makedepends="devicepkg-dev"
 subpackages="$pkgname-disable-gsd-color:disable_gsd_color"
@@ -40,6 +41,6 @@ disable_gsd_color() {
 }
 
 sha512sums="
-7af7e0be9ed778d9fa2a8242339fd8a60383ad365a13015b4765e41c12245a3c81d5b24f19596b5187a38f4a2af3d53ae62b0f7c21814680d72eff6a3e1acdfa  deviceinfo
+7068ab7f3842d7199e8f98b52f693cee55d6ad2fbed9bc2c67fd716414ee4a8d697999d560d3a207f1127742a32d145a59c5647404b3b52c201468f0172a035d  deviceinfo
 4b3cb9dca85c04f1bfc5676029a6ae225409f173c6f0fc025786c1a72326dabad4b5ad75d0dd9a41cdebe8c15db5ca9761e15f3b9f99f8bf70b19769bb116fe6  modules-initfs
 "
diff --git a/device/testing/device-samsung-n1awifi/deviceinfo b/device/testing/device-samsung-n1awifi/deviceinfo
index ad226bf6f..42bd6fd78 100644
--- a/device/testing/device-samsung-n1awifi/deviceinfo
+++ b/device/testing/device-samsung-n1awifi/deviceinfo
@@ -8,29 +8,19 @@ deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-n1awifi"
 deviceinfo_year="2013"
 deviceinfo_arch="armv7"
-deviceinfo_append_dtb="true"
 deviceinfo_dtb="exynos5420-n1awifi"
 deviceinfo_getty="ttySAC2;115200"
 
 # Device related
 deviceinfo_chassis="tablet"
 deviceinfo_external_storage="true"
-deviceinfo_create_initfs_extra="true"
 deviceinfo_drm="true"
 
 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
-deviceinfo_bootimg_append_seandroidenforce="true"
-deviceinfo_header_version="0"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
 deviceinfo_flash_sparse_samsung_format="1"
 
 # Heimdall related
-deviceinfo_flash_heimdall_partition_kernel="BOOT"
+deviceinfo_flash_heimdall_partition_rootfs="USERDATA"