diff --git a/device/community/device-samsung-manta/APKBUILD b/device/community/device-samsung-manta/APKBUILD
index bd67e2900..90fb01e35 100644
--- a/device/community/device-samsung-manta/APKBUILD
+++ b/device/community/device-samsung-manta/APKBUILD
@@ -3,8 +3,8 @@
 # Co-Maintainer: Alexandre Marquet <tb@a-marquet.fr>
 pkgname=device-samsung-manta
 pkgdesc="Google Nexus 10"
-pkgver=10
-pkgrel=1
+pkgver=11
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -12,8 +12,9 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf
 	linux-postmarketos-exynos5
-	mkbootimg
 	postmarketos-base
+	systemd-boot
+	u-boot-manta
 "
 makedepends="devicepkg-dev"
 subpackages="
@@ -74,7 +75,7 @@ disable_gsd_color() {
 }
 
 sha512sums="
-395df474cc86c2378a4e661d5004e8ec7ea03d6d8286b74d79e9333c6bf66ae9428a95a7c9ca151b902629fc3662a516b22de2f506154baa7c903ce4e2672865  deviceinfo
+299351360c0811c103bed580a90aac468edb00ad0f12c07a6f9b1a6e60e94f12f99e3994dc3b28b20bd6882f62f21b88e4392861039db40ee5a5f59dd62a9e03  deviceinfo
 e00c58936fa4340f8531538136ad028d002342a4399b68d26190b931831108007486257f9d8a48c3ed454696b45d176b1497d624c33ace21e61eba33ac7ce136  modules-initfs
 8a9756c66bf1eacd6a9717abf772a198123391deac7e32a520666dd6f72c4c5b09d1a4791437c8902f62cf4b49106ace195d57082972b1cb4c843c8e1b065875  hwclock
 0a3d0365369335fcb4793d6dce93b744111478e191f4725e06da431cd080874ba897ea5abf92da9fc9005a5520da253e199620229231b16fb58a41a1091e6a44  HiFi.conf
diff --git a/device/community/device-samsung-manta/deviceinfo b/device/community/device-samsung-manta/deviceinfo
index a562efbfb..57eb5ce94 100644
--- a/device/community/device-samsung-manta/deviceinfo
+++ b/device/community/device-samsung-manta/deviceinfo
@@ -17,17 +17,8 @@ deviceinfo_drm="true"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_sparse="true"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_offset_base="0x10000000"
-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_kernel_on_update="true"
+deviceinfo_generate_systemd_boot="true"
 
 # Kernel options
 deviceinfo_dtb="exynos5250-samsung-nexus10-manta"
-deviceinfo_append_dtb="true"