diff --git a/setup.sh b/setup.sh
index ede7b4d..5da1519 100644
--- a/setup.sh
+++ b/setup.sh
@@ -564,7 +564,7 @@ Components:
   Enabled: false
 EFI:
   ImageDir: /efi/EFI/ZBM
-  Versions: 1
+  Versions: false
   Enabled: true
   Stub: /etc/zfsbootmenu/stub-loader.d/linuxx64.efi.stub
 Kernel:
@@ -705,8 +705,7 @@ function set_new_uefi_boot_entries () {
         efi_disks_list="$(get_disks_with_one_efipart)"
         if grep -Piq -- '^'"${efi_drive}"'$' <<<"${efi_disks_list}"; then
             for uefi_image in "${uefi_images[@]}"; do
-                uefi_image_version="$(basename "${uefi_image##*-}")"
-                uefi_image_version="${uefi_image_version%%.EFI}"
+                uefi_image_version="$(basename "${uefi_image%%.EFI}")"
                 uefi_image_inverted="${uefi_image#/mnt/efi}"
                 uefi_image_inverted="${uefi_image_inverted//\//\\}"
                 efibootmgr --disk "${efi_drive}" \
diff --git a/zbm_set_new_uefi_boot_entries.sh b/zbm_set_new_uefi_boot_entries.sh
index d972051..f0729e6 100644
--- a/zbm_set_new_uefi_boot_entries.sh
+++ b/zbm_set_new_uefi_boot_entries.sh
@@ -158,8 +158,7 @@ function set_new_uefi_boot_entries () {
         efi_disks_list="$(get_disks_with_one_efipart)"
         if grep -Piq -- '^'"${efi_drive}"'$' <<<"${efi_disks_list}"; then
             for uefi_image in "${uefi_images[@]}"; do
-                uefi_image_version="$(basename "${uefi_image##*-}")"
-                uefi_image_version="${uefi_image_version%%.EFI}"
+                uefi_image_version="$(basename "${uefi_image%%.EFI}")"
                 uefi_image_inverted="${uefi_image#/efi}"
                 uefi_image_inverted="${uefi_image_inverted//\//\\}"
                 efibootmgr --disk "${efi_drive}" \