diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index d9a5697..a2f4a1f 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -109,16 +109,17 @@
          "podman",
          "attr"],
 
-    "packages-aarch64": ["grub2-efi", "ostree-grub2",
-                         "efibootmgr", "shim", "atomic-devmode",
-                         "uboot-tools", "uboot-images-armv8", "bcm293x-firmware"],
+    "packages-aarch64": ["grub2-efi-aa64", "ostree-grub2",
+                         "efibootmgr", "shim-aa64", "atomic-devmode",
+                         "uboot-tools", "uboot-images-armv8", "bcm293x-firmware",
+                         "fwupdate", "fwupdate-efi"],
 
     "packages-armhfp": ["extlinux-bootloader",
-                         "uboot-tools", "uboot-images-armv7", "bcm293x-firmware"],
+                        "uboot-tools", "uboot-images-armv7", "bcm293x-firmware"],
 
     "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2",
-                         "efibootmgr", "shim", "atomic-devmode",
-                         "microcode_ctl"],
+                        "efibootmgr", "shim-x64", "atomic-devmode",
+                        "fwupdate", "fwupdate-efi", "microcode_ctl"],
 
     "default_target": "multi-user.target",