diff --git a/diskimage_builder/elements/bootloader/pkg-map b/diskimage_builder/elements/bootloader/pkg-map
index 2f99b3dc..c7db733d 100644
--- a/diskimage_builder/elements/bootloader/pkg-map
+++ b/diskimage_builder/elements/bootloader/pkg-map
@@ -28,7 +28,7 @@
     "redhat": {
       "extlinux": "syslinux-extlinux",
       "grub-pc": "grub2-tools grub2",
-      "grub-efi-amd64": "grub2-tools grub2-efi grub2-efi-modules",
+      "grub-efi-amd64": "grub2-tools 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",
diff --git a/diskimage_builder/elements/grub2/pkg-map b/diskimage_builder/elements/grub2/pkg-map
index 1cc49c98..e747eb69 100644
--- a/diskimage_builder/elements/grub2/pkg-map
+++ b/diskimage_builder/elements/grub2/pkg-map
@@ -17,7 +17,7 @@
       "grub_bios_arm64": "grub-efi-arm64-bin"
     },
     "redhat":{
-      "signed_grub_efi": "efibootmgr grub2-efi-modules grub2-efi",
+      "signed_grub_efi": "efibootmgr grub2-efi-x64-modules grub2-efi-x64",
       "signed_shim_efi": "shim",
       "grub_bios": "grub2"
     },