diff --git a/pkg/distro/fedora/distro.go b/pkg/distro/fedora/distro.go
index 8d237aa2d8..4fb9f359e4 100644
--- a/pkg/distro/fedora/distro.go
+++ b/pkg/distro/fedora/distro.go
@@ -814,19 +814,17 @@ func newDistro(version int) distro.Distro {
 				BasePlatform: platform.BasePlatform{
 					ImageFormat: platform.FORMAT_RAW,
 					FirmwarePackages: []string{
+						"grub2-efi-x64",
 						"grub2-efi-x64-cdboot",
-						"grub2-pc",
-						"grub2-pc-modules",
 						"grub2-tools",
-						"grub2-tools-extra",
 						"grub2-tools-minimal",
+						"efibootmgr",
+						"shim-x64",
 						"brcmfmac-firmware",
 						"iwlwifi-dvm-firmware",
 						"iwlwifi-mvm-firmware",
 						"realtek-firmware",
 						"microcode_ctl",
-						"syslinux",
-						"syslinux-nonlinux",
 					},
 				},
 				BIOS:       false,
@@ -843,8 +841,9 @@ func newDistro(version int) distro.Distro {
 						"grub2-efi-aa64",
 						"grub2-efi-aa64-cdboot",
 						"grub2-tools",
-						"grub2-tools-extra",
 						"grub2-tools-minimal",
+						"efibootmgr",
+						"shim-aa64",
 						"brcmfmac-firmware",
 						"iwlwifi-dvm-firmware",
 						"iwlwifi-mvm-firmware",