diff --git a/share/aarch64.tmpl b/share/aarch64.tmpl
index c341aae6..66af43f7 100644
--- a/share/aarch64.tmpl
+++ b/share/aarch64.tmpl
@@ -27,7 +27,7 @@ mkdir ${KERNELDIR}
 <% efiargs=""; efigraft="" %>
 %if exists("boot/efi/EFI/*/grubaa64.efi"):
     <%
-    efiarch = 'AARCH64'
+    efiarch = 'AA64'
     efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
     images = ["images/efiboot.img"]
     for img in images:
diff --git a/share/efi.tmpl b/share/efi.tmpl
index 4faea90d..c82e1c79 100644
--- a/share/efi.tmpl
+++ b/share/efi.tmpl
@@ -1,5 +1,6 @@
 <%page args="configdir, KERNELDIR, efiarch, isolabel"/>
 <%
+from string import lower
 EFIBOOTDIR="EFI/BOOT"
 APPLE_EFI_ICON=inroot+"/usr/share/pixmaps/bootloader/fedora.icns"
 APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
@@ -7,14 +8,9 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
 
 mkdir ${EFIBOOTDIR}
 mkdir ${EFIBOOTDIR}/fonts/
-%if efiarch == 'AARCH64':
-install boot/efi/EFI/*/grubaa64.efi ${EFIBOOTDIR}/BOOTAA64.efi
-install boot/efi/EFI/*/grubaa64.efi ${EFIBOOTDIR}/grubaa64.efi
-%else:
-install boot/efi/EFI/*/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi
+install boot/efi/EFI/*/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.EFI
 install boot/efi/EFI/*/MokManager.efi ${EFIBOOTDIR}/
-install boot/efi/EFI/*/gcdx64.efi ${EFIBOOTDIR}/grubx64.efi
-%endif
+install boot/efi/EFI/*/gcd${efiarch|lower}.efi ${EFIBOOTDIR}/grub${efiarch|lower}.efi
 install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
 
 ## actually make the EFI images
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 01c8ac61..d0a3020d 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -25,7 +25,7 @@ installpkg grubby
 
 ## arch-specific packages (bootloaders etc.)
 %if basearch == "aarch64":
-    installpkg grub2-efi grubby
+    installpkg efibootmgr grub2-efi grubby
 %endif
 %if basearch in ("arm", "armhfp"):
     installpkg kernel-lpae