diff --git a/features.in/arm-rpi4/config.mk b/features.in/arm-rpi4/config.mk
index 28c62a3c..45a23e3a 100644
--- a/features.in/arm-rpi4/config.mk
+++ b/features.in/arm-rpi4/config.mk
@@ -1,6 +1,12 @@
 ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+ifeq (aarch64,$(ARCH))
+use/arm-rpi4: use/efi/grub use/uboot
+else
 use/arm-rpi4: use/bootloader/uboot
+endif
 	@$(call add_feature)
+	@$(call set,VM_PARTTABLE,msdos)
+	@$(call add,THE_LISTS,uboot)
 	@$(call add,THE_PACKAGES,u-boot-tools)
 	@$(call add,THE_PACKAGES,rpi4-boot-switch)
 	@$(call add,THE_PACKAGES,rpi4-boot-nouboot-filetrigger)