diff --git a/diskimage_builder/elements/bootloader/pkg-map b/diskimage_builder/elements/bootloader/pkg-map
index a570ed11..e57aaf52 100644
--- a/diskimage_builder/elements/bootloader/pkg-map
+++ b/diskimage_builder/elements/bootloader/pkg-map
@@ -18,11 +18,11 @@
     "redhat": {
       "extlinux": "syslinux-extlinux",
       "grub-pc": "grub2-tools grub2",
-      "grub-efi-amd64": "grub2-tools grub2-pc grub2-efi-x64 grub2-efi-x64-modules",
-      "grub-efi-arm64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules",
-      "grub-efi-aarch64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules",
-      "grub-efi": "grub2-tools grub2-efi",
-      "grub-efi-x86_64": "grub2-tools grub2-efi-x64 grub2-efi-x64-modules",
+      "grub-efi-amd64": "grub2-tools grub2-pc grub2-efi-x64 grub2-efi-x64-modules efibootmgr",
+      "grub-efi-arm64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules efibootmgr",
+      "grub-efi-aarch64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules efibootmgr",
+      "grub-efi": "grub2-tools grub2-efi efibootmgr",
+      "grub-efi-x86_64": "grub2-tools grub2-efi-x64 grub2-efi-x64-modules efibootmgr",
       "grub-ppc64": "grub2-tools grub2"
     }
   },
@@ -30,8 +30,8 @@
     "dkms_package": "dkms",
     "extlinux": "extlinux",
     "grub-pc": "grub-pc",
-    "grub-efi-amd64": "grub-efi grub-pc-bin",
-    "grub-efi-arm64": "grub-efi-arm64",
+    "grub-efi-amd64": "grub-efi grub-pc-bin efibootmgr",
+    "grub-efi-arm64": "grub-efi-arm64 efibootmgr",
     "grub-ppc64": "grub-ieee1275"
   }
 }