diff --git a/efiboot.sh b/efiboot.sh
deleted file mode 100755
index e0c355c55..000000000
--- a/efiboot.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-mkdir -p /tmp/efi
-# create bootx64.efi
-grub-mkimage -o /tmp/efi/bootx64.efi -O x86_64-efi -p /EFI/BOOT part_gpt part_msdos fat ext2 search_disk_uuid normal configfile linux help loadenv test cat echo
-
-# using mtools create efiboot.img
-dd if=/dev/zero of=/tmp/efi/efiboot.img bs=1M count=10
-mkfs.vfat /tmp/efi/efiboot.img
-mmd -i /tmp/efi/efiboot.img efi
-mmd -i /tmp/efi/efiboot.img efi/boot
-mcopy -i /tmp/efi/efiboot.img /tmp/efi/bootx64.efi ::efi/boot/bootx64.efi
-
-#cp /tmp/efi/efiboot.img /home/eggs/.mnt/iso/boot/grub/
-cp /tmp/efi/efiboot.img /home/artisan
\ No newline at end of file
diff --git a/src/classes/ovary.ts b/src/classes/ovary.ts
index 47f23008e..4100e6e66 100644
--- a/src/classes/ovary.ts
+++ b/src/classes/ovary.ts
@@ -1095,9 +1095,6 @@ export default class Ovary {
       cmd = `mkdir -p ${this.settings.iso_work}boot/grub/${Utils.uefiFormat()}`
       this.tryCatch(cmd)
 
-      cmd = `mkdir -p ${this.settings.iso_work}efi/boot`
-      this.tryCatch(cmd)
-
       cmd = `mkdir -p ${this.settings.iso_work}isolinux`
       this.tryCatch(cmd)
 
@@ -1198,8 +1195,10 @@ export default class Ovary {
     await exec(`mkdir ${efiWorkDir}boot`, this.echo)
     await exec(`mkdir ${efiWorkDir}boot/grub`, this.echo)
     await exec(`mkdir ${efiWorkDir}boot/grub/${Utils.uefiFormat()}`, this.echo)
-    await exec(`mkdir ${efiWorkDir}efi`, this.echo)
-    await exec(`mkdir ${efiWorkDir}efi/boot`, this.echo)
+    // await exec(`mkdir ${efiWorkDir}efi`, this.echo)
+    // await exec(`mkdir ${efiWorkDir}efi/boot`, this.echo)
+    await exec(`mkdir ${efiWorkDir}EFI`, this.echo)
+    await exec(`mkdir ${efiWorkDir}EFI/BOOT`, this.echo)
 
     /**
      * copy splash to efiWorkDir
@@ -1277,7 +1276,8 @@ export default class Ovary {
     // popd torna in efiWorkDir
 
     // copy the grub image to efi/boot (to go later in the device's root)
-    await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}efi/boot`, this.echo)
+    // await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}efi/boot`, this.echo)
+    await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}EFI/BOOT`, this.echo)
 
     // #######################
 
@@ -1290,11 +1290,14 @@ export default class Ovary {
 
     await exec(`mount -o loop ${efiWorkDir}boot/grub/efiboot.img ${efiWorkDir}img-mnt`, this.echo)
 
-    await exec(`mkdir ${efiWorkDir}img-mnt/efi`, this.echo)
-    await exec(`mkdir ${efiWorkDir}img-mnt/efi/boot`, this.echo)
+    // await exec(`mkdir ${efiWorkDir}img-mnt/efi`, this.echo)
+    // await exec(`mkdir ${efiWorkDir}img-mnt/efi/boot`, this.echo)
+    await exec(`mkdir ${efiWorkDir}img-mnt/EFI`, this.echo)
+    await exec(`mkdir ${efiWorkDir}img-mnt/EFI/BOOT`, this.echo)
 
     // era cp -r
-    await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}img-mnt/efi/boot`, this.echo)
+    //await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}img-mnt/efi/boot`, this.echo)
+    await exec(`cp ${memdiskDir}/${Utils.uefiBN()} ${efiWorkDir}img-mnt/EFI/BOOT`, this.echo)
 
     // #######################
 
@@ -1323,7 +1326,8 @@ export default class Ovary {
 
     // Copy efi files to iso
     await exec(`rsync -avx  ${efiWorkDir}boot ${isoDir}/`, this.echo)
-    await exec(`rsync -avx ${efiWorkDir}efi  ${isoDir}/`, this.echo)
+    //await exec(`rsync -avx ${efiWorkDir}efi  ${isoDir}/`, this.echo)
+    await exec(`rsync -avx ${efiWorkDir}EFI  ${isoDir}/`, this.echo)
 
     // Do the main grub.cfg (which gets loaded last):
 
diff --git a/src/classes/utils.tsx b/src/classes/utils.tsx
index 70cf31967..30d09d5d7 100644
--- a/src/classes/utils.tsx
+++ b/src/classes/utils.tsx
@@ -478,7 +478,7 @@ export default class Utils {
    static uefiBN() {
       let bn = 'nothing.efi'
       if (process.arch === 'x64') {
-         bn = 'bootx64.efi'
+         bn = 'BOOTX64.EFI'
       } else if (process.arch === 'arm64') {
          bn = 'bootaa64.efi'
       }