diff --git a/xorriso/gen_input.sh.in b/xorriso/gen_input.sh.in
index e1edc52..6807d0f 100644
--- a/xorriso/gen_input.sh.in
+++ b/xorriso/gen_input.sh.in
@@ -5,8 +5,10 @@ echo "-outdev $(pwd)/build/deploy.iso"
 echo "-boot_image any replay"
 echo "-joliet on"
 echo "-compliance joliet_long_names"
-echo "-map $(pwd)/results/grub/grub.cfg grub/grub.cfg"
-echo "-chmod 0444 grub/grub.cfg
+echo "-map $(pwd)results/boot/grub2/grub.cfg boot/grub2/grub.cfg"
+echo "-chmod 0444 boot/grub2/grub.cfg
+echo "-map $(pwd)results/EFI/BOOT/grub.cfg EFI/BOOT/grub.cfg"
+echo "-chmod 0444 boot/grub2/grub.cfg
 pushd container > /dev/null
 for file in $(find ${IMAGE_NAME}-${IMAGE_TAG})
 do