diff --git a/build_library/grub.cfg b/build_library/grub.cfg
index 11743bbb8f..77b083ff07 100644
--- a/build_library/grub.cfg
+++ b/build_library/grub.cfg
@@ -94,6 +94,12 @@ if [ "$grub_cpu" = arm64 ]; then
 fi
 
 set suf=""
+# UEFI uses linuxefi/initrdefi instead of linux/initrd except for arm64
+if [ "$grub_platform" = efi ]; then
+  if [ "$grub_cpu" != arm64 ]; then
+    set suf="efi"
+  fi
+fi
 
 # Assemble the options applicable to all the kernels below
 set linux_cmdline="rootflags=rw mount.usrflags=ro consoleblank=0 $linux_root $linux_console $first_boot $randomize_disk_guid $extra_options $oem $linux_append"