diff --git a/internal/distro/fedora/distro.go b/internal/distro/fedora/distro.go
index 3211c8a0b..20e0d16d0 100644
--- a/internal/distro/fedora/distro.go
+++ b/internal/distro/fedora/distro.go
@@ -859,7 +859,7 @@ func newDistro(version int) distro.Distro {
 			BasePlatform: platform.BasePlatform{
 				ImageFormat: platform.FORMAT_RAW,
 			},
-			BIOS:       true,
+			BIOS:       false,
 			UEFIVendor: "fedora",
 		},
 		iotRawImgType,
diff --git a/internal/distro/fedora/partition_tables.go b/internal/distro/fedora/partition_tables.go
index dddef38ba..f6a2e2201 100644
--- a/internal/distro/fedora/partition_tables.go
+++ b/internal/distro/fedora/partition_tables.go
@@ -112,12 +112,6 @@ var iotBasePartitionTables = distro.BasePartitionTableMap{
 		UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
 		Type: "gpt",
 		Partitions: []disk.Partition{
-			{
-				Size:     1 * common.MebiByte, // 1MB
-				Bootable: true,
-				Type:     disk.BIOSBootPartitionGUID,
-				UUID:     disk.BIOSBootPartitionUUID,
-			},
 			{
 				Size: 501 * common.MebiByte, // 501 MiB
 				Type: disk.EFISystemPartitionGUID,
@@ -164,12 +158,6 @@ var iotBasePartitionTables = distro.BasePartitionTableMap{
 		UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
 		Type: "gpt",
 		Partitions: []disk.Partition{
-			{
-				Size:     1 * common.MebiByte, // 1MB
-				Bootable: true,
-				Type:     disk.BIOSBootPartitionGUID,
-				UUID:     disk.BIOSBootPartitionUUID,
-			},
 			{
 				Size: 501 * common.MebiByte, // 501 MiB
 				Type: disk.EFISystemPartitionGUID,
diff --git a/test/data/manifests/fedora_35-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_35-aarch64-iot_raw_image-boot.json
index a6772958c..4155ed629 100644
--- a/test/data/manifests/fedora_35-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_raw_image-boot.json
@@ -2042,28 +2042,21 @@
               "label": "gpt",
               "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
               "partitions": [
-                {
-                  "bootable": true,
-                  "size": 2048,
-                  "start": 2048,
-                  "type": "21686148-6449-6E6F-744E-656564454649",
-                  "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
-                },
                 {
                   "size": 1026048,
-                  "start": 4096,
+                  "start": 2048,
                   "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
                   "size": 2097152,
-                  "start": 1030144,
+                  "start": 1028096,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 17844191,
-                  "start": 3127296,
+                  "size": 17846239,
+                  "start": 3125248,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2089,7 +2082,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048,
                   "lock": true
                 }
@@ -2107,7 +2100,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152,
                   "lock": true
                 }
@@ -2125,8 +2118,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191,
+                  "start": 3125248,
+                  "size": 17846239,
                   "lock": true
                 }
               }
@@ -2156,7 +2149,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152
                 }
               },
@@ -2164,7 +2157,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048
                 }
               },
@@ -2172,8 +2165,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191
+                  "start": 3125248,
+                  "size": 17846239
                 }
               }
             },
diff --git a/test/data/manifests/fedora_35-x86_64-iot_raw_image-boot.json b/test/data/manifests/fedora_35-x86_64-iot_raw_image-boot.json
index 29aa0e368..f10a625d8 100644
--- a/test/data/manifests/fedora_35-x86_64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-iot_raw_image-boot.json
@@ -1397,22 +1397,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
-                  {
-                    "id": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:94104f196a74be27358ac696a3f6063d45f7c33df2785a42454b988141760564",
                     "options": {
@@ -2009,7 +1993,6 @@
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "modprobe.blacklist=vc4,rw",
-              "legacy": "i386-pc",
               "uefi": {
                 "vendor": "fedora",
                 "install": true,
@@ -2067,28 +2050,21 @@
               "label": "gpt",
               "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
               "partitions": [
-                {
-                  "bootable": true,
-                  "size": 2048,
-                  "start": 2048,
-                  "type": "21686148-6449-6E6F-744E-656564454649",
-                  "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
-                },
                 {
                   "size": 1026048,
-                  "start": 4096,
+                  "start": 2048,
                   "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
                   "size": 2097152,
-                  "start": 1030144,
+                  "start": 1028096,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 17844191,
-                  "start": 3127296,
+                  "size": 17846239,
+                  "start": 3125248,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2114,7 +2090,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048,
                   "lock": true
                 }
@@ -2132,7 +2108,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152,
                   "lock": true
                 }
@@ -2150,8 +2126,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191,
+                  "start": 3125248,
+                  "size": 17846239,
                   "lock": true
                 }
               }
@@ -2181,7 +2157,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152
                 }
               },
@@ -2189,7 +2165,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048
                 }
               },
@@ -2197,8 +2173,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191
+                  "start": 3125248,
+                  "size": 17846239
                 }
               }
             },
@@ -2222,25 +2198,6 @@
                 "target": "/boot/efi"
               }
             ]
-          },
-          {
-            "type": "org.osbuild.grub2.inst",
-            "options": {
-              "filename": "disk.img",
-              "platform": "i386-pc",
-              "location": 2048,
-              "core": {
-                "type": "mkimage",
-                "partlabel": "gpt",
-                "filesystem": "ext4"
-              },
-              "prefix": {
-                "type": "partition",
-                "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
-              }
-            }
           }
         ]
       },
@@ -2520,9 +2477,6 @@
           "sha256:571ad1c79fa5dc94318169a18b5b395458580c74d7492215b5b0efc5aa07d29d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/d/dracut-config-generic-055-6.fc35.x86_64.rpm"
           },
-          "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-10.fc35.noarch.rpm"
-          },
           "sha256:59d8bf9aefb00d5ec8317c30561e05b9bd50d946ad3c9d5beaa4ec7c7d9a478d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/l/libverto-0.3.2-2.fc35.x86_64.rpm"
           },
@@ -2748,9 +2702,6 @@
           "sha256:bcc4edb810df0371fa4a1ca69b143386542505009eff4a1a0a806d13093e5c9d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/s/sqlite-libs-3.36.0-3.fc35.x86_64.rpm"
           },
-          "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-10.fc35.x86_64.rpm"
-          },
           "sha256:c1447e6ba83c7ea1faad6370f831c9b0adaa85d912727d165dfec32735f6fff7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/g/grubby-8.40-55.fc35.x86_64.rpm"
           },
@@ -4608,26 +4559,6 @@
         "checksum": "sha256:5a2c17e7ccc7d7482d977c6ea754fb994ea5e94b204ff8ebb8a9c22ba20827ee",
         "check_gpg": true
       },
-      {
-        "name": "grub2-pc",
-        "epoch": 1,
-        "version": "2.06",
-        "release": "10.fc35",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-2.06-10.fc35.x86_64.rpm",
-        "checksum": "sha256:bd422838b08aee333b919798924814148118cd1d2ec7051a3d01f0161eec4184",
-        "check_gpg": true
-      },
-      {
-        "name": "grub2-pc-modules",
-        "epoch": 1,
-        "version": "2.06",
-        "release": "10.fc35",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-updates-released-20220113/Packages/g/grub2-pc-modules-2.06-10.fc35.noarch.rpm",
-        "checksum": "sha256:59525eff25d7e8c661f3d2a5308d431234cbd5e4a70c4150c3a71639d0e0e136",
-        "check_gpg": true
-      },
       {
         "name": "grub2-tools",
         "epoch": 1,
diff --git a/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
index 31d81c76a..69f2ab81f 100644
--- a/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
@@ -2290,28 +2290,21 @@
               "label": "gpt",
               "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
               "partitions": [
-                {
-                  "bootable": true,
-                  "size": 2048,
-                  "start": 2048,
-                  "type": "21686148-6449-6E6F-744E-656564454649",
-                  "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
-                },
                 {
                   "size": 1026048,
-                  "start": 4096,
+                  "start": 2048,
                   "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
                   "size": 2097152,
-                  "start": 1030144,
+                  "start": 1028096,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 17844191,
-                  "start": 3127296,
+                  "size": 17846239,
+                  "start": 3125248,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2337,7 +2330,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048,
                   "lock": true
                 }
@@ -2355,7 +2348,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152,
                   "lock": true
                 }
@@ -2373,8 +2366,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191,
+                  "start": 3125248,
+                  "size": 17846239,
                   "lock": true
                 }
               }
@@ -2404,7 +2397,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152
                 }
               },
@@ -2412,7 +2405,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048
                 }
               },
@@ -2420,8 +2413,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191
+                  "start": 3125248,
+                  "size": 17846239
                 }
               }
             },
diff --git a/test/data/manifests/fedora_36-x86_64-iot_raw_image-boot.json b/test/data/manifests/fedora_36-x86_64-iot_raw_image-boot.json
index 84c09e32d..be5769a0d 100644
--- a/test/data/manifests/fedora_36-x86_64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-iot_raw_image-boot.json
@@ -1525,22 +1525,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:6e265451f960d7703d83c4785b5902d1d8c7aea98f11f90868f3a32187b7e993",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
-                  {
-                    "id": "sha256:6941e683f920e90ffeff1a2014695e62deba44f3614103c7f1d2bd084c90f13b",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:b0e0c14e5fee07f5b40b087f56739344b25f7e852434e92a1c11ceca746c6b2d",
                     "options": {
@@ -2257,7 +2241,6 @@
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "modprobe.blacklist=vc4,rw",
-              "legacy": "i386-pc",
               "uefi": {
                 "vendor": "fedora",
                 "install": true,
@@ -2315,28 +2298,21 @@
               "label": "gpt",
               "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
               "partitions": [
-                {
-                  "bootable": true,
-                  "size": 2048,
-                  "start": 2048,
-                  "type": "21686148-6449-6E6F-744E-656564454649",
-                  "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
-                },
                 {
                   "size": 1026048,
-                  "start": 4096,
+                  "start": 2048,
                   "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
                   "size": 2097152,
-                  "start": 1030144,
+                  "start": 1028096,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 17844191,
-                  "start": 3127296,
+                  "size": 17846239,
+                  "start": 3125248,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2362,7 +2338,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048,
                   "lock": true
                 }
@@ -2380,7 +2356,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152,
                   "lock": true
                 }
@@ -2398,8 +2374,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191,
+                  "start": 3125248,
+                  "size": 17846239,
                   "lock": true
                 }
               }
@@ -2429,7 +2405,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152
                 }
               },
@@ -2437,7 +2413,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048
                 }
               },
@@ -2445,8 +2421,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191
+                  "start": 3125248,
+                  "size": 17846239
                 }
               }
             },
@@ -2470,25 +2446,6 @@
                 "target": "/boot/efi"
               }
             ]
-          },
-          {
-            "type": "org.osbuild.grub2.inst",
-            "options": {
-              "filename": "disk.img",
-              "platform": "i386-pc",
-              "location": 2048,
-              "core": {
-                "type": "mkimage",
-                "partlabel": "gpt",
-                "filesystem": "ext4"
-              },
-              "prefix": {
-                "type": "partition",
-                "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
-              }
-            }
           }
         ]
       },
@@ -2816,9 +2773,6 @@
           "sha256:6927b8d98d9d586c9252c56588ed539d691ad4552f1f26d1791d485ea50061d1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-fedora-20220617/Packages/l/libverto-0.3.2-3.fc36.x86_64.rpm"
           },
-          "sha256:6941e683f920e90ffeff1a2014695e62deba44f3614103c7f1d2bd084c90f13b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-20220705/Packages/g/grub2-pc-modules-2.06-42.fc36.noarch.rpm"
-          },
           "sha256:69d275d09ee2760b50cf8601b9a75e9101a78f858e238d794a97bbfd964329d6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-fedora-20220617/Packages/p/pam-libs-1.5.2-12.fc36.x86_64.rpm"
           },
@@ -2843,9 +2797,6 @@
           "sha256:6c7c429d157a9e803c56ac9b28bf74ae8908fc0d33515c9729ed51509a696026": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-fedora-20220617/Packages/p/pinentry-1.2.0-2.fc36.x86_64.rpm"
           },
-          "sha256:6e265451f960d7703d83c4785b5902d1d8c7aea98f11f90868f3a32187b7e993": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-20220705/Packages/g/grub2-pc-2.06-42.fc36.x86_64.rpm"
-          },
           "sha256:6f77d6472fc78a366d51eca781d634a018f44f6f20230da99f8f50b03a45040e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-fedora-20220617/Packages/f/fedora-gpg-keys-36-1.noarch.rpm"
           },
@@ -5109,26 +5060,6 @@
         "checksum": "sha256:5c4a0eafc33b320af3e6c370d1e9d3506f92b02607ef2ec773c602ba504da00a",
         "check_gpg": true
       },
-      {
-        "name": "grub2-pc",
-        "epoch": 1,
-        "version": "2.06",
-        "release": "42.fc36",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-20220705/Packages/g/grub2-pc-2.06-42.fc36.x86_64.rpm",
-        "checksum": "sha256:6e265451f960d7703d83c4785b5902d1d8c7aea98f11f90868f3a32187b7e993",
-        "check_gpg": true
-      },
-      {
-        "name": "grub2-pc-modules",
-        "epoch": 1,
-        "version": "2.06",
-        "release": "42.fc36",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-20220705/Packages/g/grub2-pc-modules-2.06-42.fc36.noarch.rpm",
-        "checksum": "sha256:6941e683f920e90ffeff1a2014695e62deba44f3614103c7f1d2bd084c90f13b",
-        "check_gpg": true
-      },
       {
         "name": "grub2-tools",
         "epoch": 1,
diff --git a/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
index 2cf46964e..f58a0b45f 100644
--- a/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
@@ -2298,28 +2298,21 @@
               "label": "gpt",
               "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
               "partitions": [
-                {
-                  "bootable": true,
-                  "size": 2048,
-                  "start": 2048,
-                  "type": "21686148-6449-6E6F-744E-656564454649",
-                  "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
-                },
                 {
                   "size": 1026048,
-                  "start": 4096,
+                  "start": 2048,
                   "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
                   "size": 2097152,
-                  "start": 1030144,
+                  "start": 1028096,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 17844191,
-                  "start": 3127296,
+                  "size": 17846239,
+                  "start": 3125248,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2345,7 +2338,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048,
                   "lock": true
                 }
@@ -2363,7 +2356,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152,
                   "lock": true
                 }
@@ -2381,8 +2374,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191,
+                  "start": 3125248,
+                  "size": 17846239,
                   "lock": true
                 }
               }
@@ -2412,7 +2405,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152
                 }
               },
@@ -2420,7 +2413,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048
                 }
               },
@@ -2428,8 +2421,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191
+                  "start": 3125248,
+                  "size": 17846239
                 }
               }
             },
diff --git a/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json b/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json
index f69fdb185..f39c611ce 100644
--- a/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json
@@ -663,22 +663,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:3e23f712d3b15bd50bb12b01f209bad2bcc316977a1c45994711932447bc4262",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
-                  {
-                    "id": "sha256:cfe83a7faa009718f0ca5d9cafa5d61e4aa6cb4e439fdf2a9d3209d8057dc323",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:ba23ecf289572c7a1f3907b8bfab88630d00ca25d427156ed5a1ffa010ff5203",
                     "options": {
@@ -2265,7 +2249,6 @@
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "modprobe.blacklist=vc4,rw",
-              "legacy": "i386-pc",
               "uefi": {
                 "vendor": "fedora",
                 "install": true,
@@ -2323,28 +2306,21 @@
               "label": "gpt",
               "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
               "partitions": [
-                {
-                  "bootable": true,
-                  "size": 2048,
-                  "start": 2048,
-                  "type": "21686148-6449-6E6F-744E-656564454649",
-                  "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
-                },
                 {
                   "size": 1026048,
-                  "start": 4096,
+                  "start": 2048,
                   "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
                   "size": 2097152,
-                  "start": 1030144,
+                  "start": 1028096,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 17844191,
-                  "start": 3127296,
+                  "size": 17846239,
+                  "start": 3125248,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2370,7 +2346,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048,
                   "lock": true
                 }
@@ -2388,7 +2364,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152,
                   "lock": true
                 }
@@ -2406,8 +2382,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191,
+                  "start": 3125248,
+                  "size": 17846239,
                   "lock": true
                 }
               }
@@ -2437,7 +2413,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152
                 }
               },
@@ -2445,7 +2421,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048
                 }
               },
@@ -2453,8 +2429,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191
+                  "start": 3125248,
+                  "size": 17846239
                 }
               }
             },
@@ -2478,25 +2454,6 @@
                 "target": "/boot/efi"
               }
             ]
-          },
-          {
-            "type": "org.osbuild.grub2.inst",
-            "options": {
-              "filename": "disk.img",
-              "platform": "i386-pc",
-              "location": 2048,
-              "core": {
-                "type": "mkimage",
-                "partlabel": "gpt",
-                "filesystem": "ext4"
-              },
-              "prefix": {
-                "type": "partition",
-                "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
-              }
-            }
           }
         ]
       },
@@ -2701,9 +2658,6 @@
           "sha256:3df7fd45694c994a41077966f80f48d28a5466c21e161c92d05629cc64efe0e6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20220831/Packages/p/polkit-121-4.fc37.x86_64.rpm"
           },
-          "sha256:3e23f712d3b15bd50bb12b01f209bad2bcc316977a1c45994711932447bc4262": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20220831/Packages/g/grub2-pc-2.06-52.fc37.x86_64.rpm"
-          },
           "sha256:3eea98413bd05506258a3fe592c7f781d58c7143e8f3767d528b875267b95613": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20220831/Packages/c/criu-3.17.1-3.fc37.x86_64.rpm"
           },
@@ -3115,9 +3069,6 @@
           "sha256:ce82ccdd05037e3f95b6dd71f1b0a8db88d8c9599131b9ae76215823486f0371": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20220831/Packages/k/kbd-misc-2.5.1-2.fc37.noarch.rpm"
           },
-          "sha256:cfe83a7faa009718f0ca5d9cafa5d61e4aa6cb4e439fdf2a9d3209d8057dc323": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20220831/Packages/g/grub2-pc-modules-2.06-52.fc37.noarch.rpm"
-          },
           "sha256:d2633fba63aecad94afd7eab596f5d4971c483148168114a58e633bcfc386663": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20220831/Packages/s/systemd-libs-251.4-53.fc37.x86_64.rpm"
           },
@@ -4066,26 +4017,6 @@
         "checksum": "sha256:16cd59849c42f94f36ca928874f0181e1cee537a7ae296e7b5749614c1dfee38",
         "check_gpg": true
       },
-      {
-        "name": "grub2-pc",
-        "epoch": 1,
-        "version": "2.06",
-        "release": "52.fc37",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20220831/Packages/g/grub2-pc-2.06-52.fc37.x86_64.rpm",
-        "checksum": "sha256:3e23f712d3b15bd50bb12b01f209bad2bcc316977a1c45994711932447bc4262",
-        "check_gpg": true
-      },
-      {
-        "name": "grub2-pc-modules",
-        "epoch": 1,
-        "version": "2.06",
-        "release": "52.fc37",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20220831/Packages/g/grub2-pc-modules-2.06-52.fc37.noarch.rpm",
-        "checksum": "sha256:cfe83a7faa009718f0ca5d9cafa5d61e4aa6cb4e439fdf2a9d3209d8057dc323",
-        "check_gpg": true
-      },
       {
         "name": "grub2-tools",
         "epoch": 1,
diff --git a/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
index d9972a68f..bd685df39 100644
--- a/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
@@ -2290,28 +2290,21 @@
               "label": "gpt",
               "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
               "partitions": [
-                {
-                  "bootable": true,
-                  "size": 2048,
-                  "start": 2048,
-                  "type": "21686148-6449-6E6F-744E-656564454649",
-                  "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
-                },
                 {
                   "size": 1026048,
-                  "start": 4096,
+                  "start": 2048,
                   "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
                   "size": 2097152,
-                  "start": 1030144,
+                  "start": 1028096,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 17844191,
-                  "start": 3127296,
+                  "size": 17846239,
+                  "start": 3125248,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2337,7 +2330,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048,
                   "lock": true
                 }
@@ -2355,7 +2348,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152,
                   "lock": true
                 }
@@ -2373,8 +2366,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191,
+                  "start": 3125248,
+                  "size": 17846239,
                   "lock": true
                 }
               }
@@ -2404,7 +2397,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152
                 }
               },
@@ -2412,7 +2405,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048
                 }
               },
@@ -2420,8 +2413,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191
+                  "start": 3125248,
+                  "size": 17846239
                 }
               }
             },
diff --git a/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json b/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json
index 6b61eafda..be0af4c9b 100644
--- a/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json
@@ -671,22 +671,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:aabd27aa8687b29d4334ac2e40ecbe14d7adc18df0f430505f0c8f1df3e9f55f",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
-                  {
-                    "id": "sha256:c6d2a12382aa9c1de1a9867e6bf554aaf6a25b6e6fd08ba8eb04fdf177de82f3",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:75447f4c68574c2504b27033da0e611b5fb09e0e7fd47c94c6a8a899501e9a33",
                     "options": {
@@ -2257,7 +2241,6 @@
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "modprobe.blacklist=vc4,rw",
-              "legacy": "i386-pc",
               "uefi": {
                 "vendor": "fedora",
                 "install": true,
@@ -2315,28 +2298,21 @@
               "label": "gpt",
               "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
               "partitions": [
-                {
-                  "bootable": true,
-                  "size": 2048,
-                  "start": 2048,
-                  "type": "21686148-6449-6E6F-744E-656564454649",
-                  "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
-                },
                 {
                   "size": 1026048,
-                  "start": 4096,
+                  "start": 2048,
                   "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
                   "size": 2097152,
-                  "start": 1030144,
+                  "start": 1028096,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 17844191,
-                  "start": 3127296,
+                  "size": 17846239,
+                  "start": 3125248,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2362,7 +2338,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048,
                   "lock": true
                 }
@@ -2380,7 +2356,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152,
                   "lock": true
                 }
@@ -2398,8 +2374,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191,
+                  "start": 3125248,
+                  "size": 17846239,
                   "lock": true
                 }
               }
@@ -2429,7 +2405,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1030144,
+                  "start": 1028096,
                   "size": 2097152
                 }
               },
@@ -2437,7 +2413,7 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 4096,
+                  "start": 2048,
                   "size": 1026048
                 }
               },
@@ -2445,8 +2421,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 3127296,
-                  "size": 17844191
+                  "start": 3125248,
+                  "size": 17846239
                 }
               }
             },
@@ -2470,25 +2446,6 @@
                 "target": "/boot/efi"
               }
             ]
-          },
-          {
-            "type": "org.osbuild.grub2.inst",
-            "options": {
-              "filename": "disk.img",
-              "platform": "i386-pc",
-              "location": 2048,
-              "core": {
-                "type": "mkimage",
-                "partlabel": "gpt",
-                "filesystem": "ext4"
-              },
-              "prefix": {
-                "type": "partition",
-                "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
-              }
-            }
           }
         ]
       },
@@ -2978,9 +2935,6 @@
           "sha256:aa9327946e86d20192948513e27b5314e565bd533f4e801215cf62190314056e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-rawhide-20220817/Packages/l/libbrotli-1.0.9-9.fc37.x86_64.rpm"
           },
-          "sha256:aabd27aa8687b29d4334ac2e40ecbe14d7adc18df0f430505f0c8f1df3e9f55f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-rawhide-20220817/Packages/g/grub2-pc-2.06-48.fc38.x86_64.rpm"
-          },
           "sha256:aad543b786b8f870cd0a7a1d472199b5ac3f10a87e58133146470c3183d6862a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-rawhide-20220817/Packages/l/libsepol-3.4-3.fc37.x86_64.rpm"
           },
@@ -3068,9 +3022,6 @@
           "sha256:c67f867a6bad6badc7c27ba481280b6116c6c1b18bb0935c28b843a83333f00c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-rawhide-20220817/Packages/d/device-mapper-libs-1.02.175-9.fc37.x86_64.rpm"
           },
-          "sha256:c6d2a12382aa9c1de1a9867e6bf554aaf6a25b6e6fd08ba8eb04fdf177de82f3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-rawhide-20220817/Packages/g/grub2-pc-modules-2.06-48.fc38.noarch.rpm"
-          },
           "sha256:c6e1018e5327403c955cb766feaa112687b3210f06afc7702abae185de061506": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-rawhide-20220817/Packages/d/duktape-2.6.0-3.fc37.x86_64.rpm"
           },
@@ -4065,26 +4016,6 @@
         "checksum": "sha256:1893ae33a510532818fc8c2cb01a7be5d7470ab53930b480ba9b52ee0d57785c",
         "check_gpg": true
       },
-      {
-        "name": "grub2-pc",
-        "epoch": 1,
-        "version": "2.06",
-        "release": "48.fc38",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-rawhide-20220817/Packages/g/grub2-pc-2.06-48.fc38.x86_64.rpm",
-        "checksum": "sha256:aabd27aa8687b29d4334ac2e40ecbe14d7adc18df0f430505f0c8f1df3e9f55f",
-        "check_gpg": true
-      },
-      {
-        "name": "grub2-pc-modules",
-        "epoch": 1,
-        "version": "2.06",
-        "release": "48.fc38",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-rawhide-20220817/Packages/g/grub2-pc-modules-2.06-48.fc38.noarch.rpm",
-        "checksum": "sha256:c6d2a12382aa9c1de1a9867e6bf554aaf6a25b6e6fd08ba8eb04fdf177de82f3",
-        "check_gpg": true
-      },
       {
         "name": "grub2-tools",
         "epoch": 1,