diff --git a/config.sh b/config.sh
index 90bbedb..b8f4119 100644
--- a/config.sh
+++ b/config.sh
@@ -150,6 +150,15 @@ EOF
   echo -e 'rocky\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
   sed -i '1i # Modified for cloud image' /etc/cloud/cloud.cfg
   sed -i 's/name: cloud-user/name: rocky/g' /etc/cloud/cloud.cfg
+
+  # Remove unneeded EFI files to match an actual installed system
+  case "$(uname -m)" in
+    x86_64)  arch="x64";  ARCH="X64";;
+    aarch64) arch="aa64"; ARCH="AA64";;
+  esac
+  test -f "/boot/efi/EFI/BOOT/grub${arch}.efi" && /bin/rm "/boot/efi/EFI/BOOT/grub${arch}.efi"
+  test -f "/boot/efi/EFI/BOOT/mm${arch}.efi" && /bin/rm "/boot/efi/EFI/BOOT/mm${arch}.efi"
+  test -f "/boot/efi/EFI/BOOT/grub.cfg" && /bin/rm "/boot/efi/EFI/BOOT/grub.cfg"
 }
 
 ################################################################################