diff --git a/internal/distro/rhel8/ami.go b/internal/distro/rhel8/ami.go
index db4bee7fe..324e12476 100644
--- a/internal/distro/rhel8/ami.go
+++ b/internal/distro/rhel8/ami.go
@@ -30,6 +30,12 @@ func amiImgTypeX86_64(rd distribution) imageType {
 }
 
 func ec2ImgTypeX86_64(rd distribution) imageType {
+	basePartitionTables := ec2BasePartitionTables
+	// use legacy partition tables for RHEL 8.8 and older
+	if common.VersionLessThan(rd.osVersion, "8.9") {
+		basePartitionTables = ec2LegacyBasePartitionTables
+	}
+
 	it := imageType{
 		name:        "ec2",
 		filename:    "image.raw.xz",
@@ -46,12 +52,18 @@ func ec2ImgTypeX86_64(rd distribution) imageType {
 		buildPipelines:      []string{"build"},
 		payloadPipelines:    []string{"os", "image", "xz"},
 		exports:             []string{"xz"},
-		basePartitionTables: ec2BasePartitionTables,
+		basePartitionTables: basePartitionTables,
 	}
 	return it
 }
 
 func ec2HaImgTypeX86_64(rd distribution) imageType {
+	basePartitionTables := ec2BasePartitionTables
+	// use legacy partition tables for RHEL 8.8 and older
+	if common.VersionLessThan(rd.osVersion, "8.9") {
+		basePartitionTables = ec2LegacyBasePartitionTables
+	}
+
 	it := imageType{
 		name:        "ec2-ha",
 		filename:    "image.raw.xz",
@@ -68,7 +80,7 @@ func ec2HaImgTypeX86_64(rd distribution) imageType {
 		buildPipelines:      []string{"build"},
 		payloadPipelines:    []string{"os", "image", "xz"},
 		exports:             []string{"xz"},
-		basePartitionTables: ec2BasePartitionTables,
+		basePartitionTables: basePartitionTables,
 	}
 	return it
 }
@@ -95,6 +107,12 @@ func amiImgTypeAarch64(rd distribution) imageType {
 }
 
 func ec2ImgTypeAarch64(rd distribution) imageType {
+	basePartitionTables := ec2BasePartitionTables
+	// use legacy partition tables for RHEL 8.8 and older
+	if common.VersionLessThan(rd.osVersion, "8.9") {
+		basePartitionTables = ec2LegacyBasePartitionTables
+	}
+
 	it := imageType{
 		name:        "ec2",
 		filename:    "image.raw.xz",
@@ -111,12 +129,18 @@ func ec2ImgTypeAarch64(rd distribution) imageType {
 		buildPipelines:      []string{"build"},
 		payloadPipelines:    []string{"os", "image", "xz"},
 		exports:             []string{"xz"},
-		basePartitionTables: ec2BasePartitionTables,
+		basePartitionTables: basePartitionTables,
 	}
 	return it
 }
 
 func ec2SapImgTypeX86_64(rd distribution) imageType {
+	basePartitionTables := ec2BasePartitionTables
+	// use legacy partition tables for RHEL 8.8 and older
+	if common.VersionLessThan(rd.osVersion, "8.9") {
+		basePartitionTables = ec2LegacyBasePartitionTables
+	}
+
 	it := imageType{
 		name:        "ec2-sap",
 		filename:    "image.raw.xz",
@@ -133,7 +157,7 @@ func ec2SapImgTypeX86_64(rd distribution) imageType {
 		buildPipelines:      []string{"build"},
 		payloadPipelines:    []string{"os", "image", "xz"},
 		exports:             []string{"xz"},
-		basePartitionTables: ec2BasePartitionTables,
+		basePartitionTables: basePartitionTables,
 	}
 	return it
 }
diff --git a/internal/distro/rhel8/distro.go b/internal/distro/rhel8/distro.go
index c0ec315db..9679deeac 100644
--- a/internal/distro/rhel8/distro.go
+++ b/internal/distro/rhel8/distro.go
@@ -443,6 +443,16 @@ func newDistro(name string, minor int) *distribution {
 		// add azure to RHEL distro only
 		x86_64.addImageTypes(azureX64Platform, azureRhuiImgType(), azureByosImgType(), azureSapRhuiImgType(rd))
 
+		// keep the RHEL EC2 x86_64 images before 8.9 BIOS-only for backward compatibility
+		if common.VersionLessThan(rd.osVersion, "8.9") {
+			ec2X86Platform = &platform.X86{
+				BIOS: true,
+				BasePlatform: platform.BasePlatform{
+					ImageFormat: platform.FORMAT_RAW,
+				},
+			}
+		}
+
 		// add ec2 image types to RHEL distro only
 		x86_64.addImageTypes(ec2X86Platform, ec2ImgTypeX86_64(rd), ec2HaImgTypeX86_64(rd))
 		aarch64.addImageTypes(rawAarch64Platform, ec2ImgTypeAarch64(rd))
diff --git a/internal/distro/rhel8/partition_tables.go b/internal/distro/rhel8/partition_tables.go
index 65be7cd64..bde0df905 100644
--- a/internal/distro/rhel8/partition_tables.go
+++ b/internal/distro/rhel8/partition_tables.go
@@ -218,6 +218,80 @@ var ec2BasePartitionTables = distro.BasePartitionTableMap{
 	},
 }
 
+// ec2LegacyBasePartitionTables is the partition table layout for RHEL EC2
+// images prior to 8.9. It is used for backwards compatibility.
+var ec2LegacyBasePartitionTables = distro.BasePartitionTableMap{
+	distro.X86_64ArchName: disk.PartitionTable{
+		UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
+		Type: "gpt",
+		Partitions: []disk.Partition{
+			{
+				Size:     1 * common.MebiByte,
+				Bootable: true,
+				Type:     disk.BIOSBootPartitionGUID,
+				UUID:     disk.BIOSBootPartitionUUID,
+			},
+			{
+				Size: 2 * common.GibiByte, // 2 GiB
+				Type: disk.FilesystemDataGUID,
+				UUID: disk.RootPartitionUUID,
+				Payload: &disk.Filesystem{
+					Type:         "xfs",
+					Label:        "root",
+					Mountpoint:   "/",
+					FSTabOptions: "defaults",
+					FSTabFreq:    0,
+					FSTabPassNo:  0,
+				},
+			},
+		},
+	},
+	distro.Aarch64ArchName: disk.PartitionTable{
+		UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
+		Type: "gpt",
+		Partitions: []disk.Partition{
+			{
+				Size: 200 * common.MebiByte,
+				Type: disk.EFISystemPartitionGUID,
+				UUID: disk.EFISystemPartitionUUID,
+				Payload: &disk.Filesystem{
+					Type:         "vfat",
+					UUID:         disk.EFIFilesystemUUID,
+					Mountpoint:   "/boot/efi",
+					FSTabOptions: "defaults,uid=0,gid=0,umask=077,shortname=winnt",
+					FSTabFreq:    0,
+					FSTabPassNo:  2,
+				},
+			},
+			{
+				Size: 512 * common.MebiByte,
+				Type: disk.FilesystemDataGUID,
+				UUID: disk.FilesystemDataUUID,
+				Payload: &disk.Filesystem{
+					Type:         "xfs",
+					Mountpoint:   "/boot",
+					FSTabOptions: "defaults",
+					FSTabFreq:    0,
+					FSTabPassNo:  0,
+				},
+			},
+			{
+				Size: 2 * common.GibiByte, // 2 GiB
+				Type: disk.FilesystemDataGUID,
+				UUID: disk.RootPartitionUUID,
+				Payload: &disk.Filesystem{
+					Type:         "xfs",
+					Label:        "root",
+					Mountpoint:   "/",
+					FSTabOptions: "defaults",
+					FSTabFreq:    0,
+					FSTabPassNo:  0,
+				},
+			},
+		},
+	},
+}
+
 var edgeBasePartitionTables = distro.BasePartitionTableMap{
 	distro.X86_64ArchName: disk.PartitionTable{
 		UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
diff --git a/test/data/manifests/rhel_8-aarch64-ec2-boot.json b/test/data/manifests/rhel_8-aarch64-ec2-boot.json
index 186c77192..3b3d49ab2 100644
--- a/test/data/manifests/rhel_8-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-ec2-boot.json
@@ -2119,14 +2119,14 @@
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
-                  "size": 1024000,
+                  "size": 1048576,
                   "start": 411648,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
+                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 19535839,
-                  "start": 1435648,
+                  "size": 19511263,
+                  "start": 1460224,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2162,8 +2162,7 @@
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
-              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
+              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
             },
             "devices": {
               "device": {
@@ -2171,7 +2170,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000,
+                  "size": 1048576,
                   "lock": true
                 }
               }
@@ -2188,8 +2187,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839,
+                  "start": 1460224,
+                  "size": 19511263,
                   "lock": true
                 }
               }
@@ -2220,7 +2219,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000
+                  "size": 1048576
                 }
               },
               "boot.efi": {
@@ -2235,8 +2234,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839
+                  "start": 1460224,
+                  "size": 19511263
                 }
               }
             },
diff --git a/test/data/manifests/rhel_8-x86_64-ec2-boot.json b/test/data/manifests/rhel_8-x86_64-ec2-boot.json
index 8c8efce1a..8cdcbc2ed 100644
--- a/test/data/manifests/rhel_8-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-ec2-boot.json
@@ -120,9 +120,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -645,9 +642,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:4d1be1a327a1ef7f0fa6a0005f32b962d446597febebae80b21d8f8f1355a8aa"
                   },
@@ -756,9 +750,6 @@
                   {
                     "id": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -780,15 +771,6 @@
                   {
                     "id": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:45c47f5146e39f50ca18d1561821607bc582c5fd4de0bf05bc06a5e0eb33df34"
                   },
@@ -825,9 +807,6 @@
                   {
                     "id": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
                   },
-                  {
-                    "id": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-                  },
                   {
                     "id": "sha256:59b3cff57ffbea4c4c011e6a81341a1203c18b91569fff019c93b756331300f8"
                   },
@@ -888,9 +867,6 @@
                   {
                     "id": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
                   },
-                  {
-                    "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-                  },
                   {
                     "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
                   },
@@ -1068,9 +1044,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:7145b8d179b6c72e61de2b822551b343209adb63b76023fe26e7162d4ff6c107"
                   },
@@ -1083,12 +1056,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:4a62975251933dcaff77fdbd7704e8a12bea0ecb6eaaae5ea5e552bedd6788ec"
                   },
@@ -1188,9 +1155,6 @@
                   {
                     "id": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8"
                   },
@@ -1266,9 +1230,6 @@
                   {
                     "id": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:018409b1eda8be48a11a5b76b95e82ff1d9002569e0644291532d8424dc31edf"
                   },
@@ -1302,18 +1263,12 @@
                   {
                     "id": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
                   },
-                  {
-                    "id": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-                  },
                   {
                     "id": "sha256:ca6208d771fbbfc703217b0f4314d214a866da86b105f222753a6efeb12d6f69"
                   },
                   {
                     "id": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
                   },
-                  {
-                    "id": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1632,9 +1587,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -1761,36 +1713,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3"
-                  },
-                  {
-                    "id": "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6"
-                  },
-                  {
-                    "id": "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9"
-                  },
-                  {
-                    "id": "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756"
-                  },
-                  {
-                    "id": "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44"
-                  },
-                  {
-                    "id": "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d"
-                  },
-                  {
-                    "id": "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd"
-                  },
-                  {
-                    "id": "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:d16252dcb91c3e581ecb29234180fb99ac3199a052a89d0e23603cb6054bee16"
                   },
@@ -1800,30 +1722,9 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce"
-                  },
                   {
                     "id": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
                   },
-                  {
-                    "id": "sha256:82cd233003b87e6b810070eead73ec44073050aabccec9a619309074a1868fe9"
-                  },
-                  {
-                    "id": "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a"
-                  },
-                  {
-                    "id": "sha256:319d3d51dfc09875cdbb61518410fe2963887228089d4a9de8f673acc7a2ff82"
-                  },
-                  {
-                    "id": "sha256:4bcbfd3229e3fd2d6e1adfe46bc233872c4184838de40b2e61a9ba84fcb81512"
-                  },
-                  {
-                    "id": "sha256:507c1a196520e4263a0581e70b669c352097d6bdc7a5409ae748ee3942e71f5c"
-                  },
-                  {
-                    "id": "sha256:94d5c3946873b079aa5af985e31501981fef1cb3065024e9f41f70c40fc9b975"
-                  },
                   {
                     "id": "sha256:4f542ac06b9101e66033210648ba4bcc86c23f508a194d3a6ccba2966e4ade73"
                   },
@@ -1875,15 +1776,9 @@
                   {
                     "id": "sha256:37ca74f003d06ada0528d353bdc0df49193a058cece3c51173dc8b9c80f410e5"
                   },
-                  {
-                    "id": "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f"
-                  },
                   {
                     "id": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -1903,9 +1798,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2073,23 +1966,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2097,13 +1977,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-425.3.1.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2168,20 +2044,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2197,45 +2061,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2243,8 +2072,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2270,28 +2099,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2301,18 +2114,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2330,8 +2131,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -2490,9 +2291,6 @@
           "sha256:1d47e465939bba5bcf9c37be2516e60d6c9449ccee70a54a6133df989ac8b1f5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libksba-1.3.5-7.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -2541,9 +2339,6 @@
           "sha256:2733570f8ea94551f3381538f9c8642c88532c800b384c07b4db02f6b8896c3f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libattr-2.4.48-3.el8.x86_64.rpm"
           },
-          "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm"
-          },
           "sha256:283285b4c414c5d0614849e64971730af9d0037e62e535adb538166051e52e1d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libdhash-0.5.0-40.el8.x86_64.rpm"
           },
@@ -2580,24 +2375,12 @@
           "sha256:2ff643bfe17476a8dfa94ea900ddf9d89ed0e5f56839f18209f8304a0e31bb2f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dmidecode-3.3-4.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30c6dbc7d2dd8024a16fe2d00b01fa71f4a1ea9d4af5519dc092695d4fa735cf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libss-1.45.6-5.el8.x86_64.rpm"
           },
           "sha256:30e0334ada8f6453cd8c2335ac40417f636cdae7d7dc744b6d2bff78785013de": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glibc-all-langpacks-2.28-211.el8.x86_64.rpm"
           },
-          "sha256:319d3d51dfc09875cdbb61518410fe2963887228089d4a9de8f673acc7a2ff82": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-softokn-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:3267605bdad55274cd02ce3e656edb83048c740fa709452b3fe6ed98f5f5bbbe": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/rpm-4.14.3-24.el8_6.x86_64.rpm"
           },
@@ -2670,9 +2453,6 @@
           "sha256:3a9aede6732c73278d74c413ad9559c1ccf0c0bbdfd1b61734cf984e75d20367": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-configobj-5.0.6-11.el8.noarch.rpm"
           },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3d6a5eeb0da36ce36cd6ddc5e3c2d2bc36cd5962d1450077c5c5754b8f5ac02c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glib2-2.56.4-159.el8.x86_64.rpm"
           },
@@ -2706,9 +2486,6 @@
           "sha256:4658cf807723123b513587887bf226d0b3daf69049c13951c5f88f6196acbb7d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsss_sudo-2.7.3-4.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-2.02-142.el8.x86_64.rpm"
           },
@@ -2751,9 +2528,6 @@
           "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm"
           },
-          "sha256:4bcbfd3229e3fd2d6e1adfe46bc233872c4184838de40b2e61a9ba84fcb81512": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-softokn-freebl-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:4bdac8b052ea5031f85f17e8f8499d491cc2ea8d5110467c5a0e4ec7b7763c2d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/authselect-compat-1.2.5-1.el8.x86_64.rpm"
           },
@@ -2787,9 +2561,6 @@
           "sha256:50603f9a5c2a643252949c922d656c83194047469116a33c3c265871bfd0a531": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dnf-data-4.7.0-11.el8.noarch.rpm"
           },
-          "sha256:507c1a196520e4263a0581e70b669c352097d6bdc7a5409ae748ee3942e71f5c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-sysinit-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:51eb082082e78afa70dd64591219c026d11cf7a6adf3771a36624c80be34dc3e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/nettle-3.4.1-7.el8.x86_64.rpm"
           },
@@ -2844,9 +2615,6 @@
           "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-modules-2.02-142.el8.noarch.rpm"
           },
-          "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-mdraid-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:5d9c5b3341e9b10091a5bc66c08455ce7d9c62911fac6b759b847a46749a1adf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-jsonpointer-1.10-11.el8.noarch.rpm"
           },
@@ -2880,9 +2648,6 @@
           "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsolv-0.7.20-3.el8.x86_64.rpm"
           },
-          "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libudisks2-2.9.0-9.el8.x86_64.rpm"
-          },
           "sha256:6950a3136327480137b0c3ed7555bd36d107ebb39b687354d2d34c5542e19d2d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dbus-1.12.8-23.el8.x86_64.rpm"
           },
@@ -2901,9 +2666,6 @@
           "sha256:6d7a41fb238610416349a53d024cc505ab7f3f6e9953cc2244abb663ec404dad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ncurses-6.1-9.20180224.el8.x86_64.rpm"
           },
-          "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm"
-          },
           "sha256:6dcdb3c2afc64822ed6945bf9607cd0406197bd9764718beef51f5332edd7c05": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glibc-gconv-extra-2.28-211.el8.x86_64.rpm"
           },
@@ -2925,9 +2687,6 @@
           "sha256:709fb09876846df58d761b2ddb973bbf2b870d995452648ef929a2cdf3ea8216": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libarchive-3.3.3-4.el8.x86_64.rpm"
           },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
           "sha256:7145b8d179b6c72e61de2b822551b343209adb63b76023fe26e7162d4ff6c107": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcc-8.5.0-15.el8.x86_64.rpm"
           },
@@ -2940,9 +2699,6 @@
           "sha256:73c29baa2cd94f1ae6a1d1333818969a281b16dd4262f413ad284c5333719a4d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/groff-base-1.22.3-18.el8.x86_64.rpm"
           },
-          "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-part-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:74cdb3a60d777eb0de980bfc902005757fc16ef0af7db01c1ade1cc56c3852c9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/elfutils-libs-0.187-4.el8.x86_64.rpm"
           },
@@ -3009,18 +2765,12 @@
           "sha256:821923c32f6cd4c764ea7e97bee3335993d405694aa81b923cf1ef46c9e03cf9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/rhc-0.2.1-9.el8.x86_64.rpm"
           },
-          "sha256:82cd233003b87e6b810070eead73ec44073050aabccec9a619309074a1868fe9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nspr-4.34.0-3.el8_6.x86_64.rpm"
-          },
           "sha256:830940ac1860e506f78be51323f21144a40e6244eff2331c1648da06baee9ea6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dhcp-libs-4.3.6-48.el8.x86_64.rpm"
           },
           "sha256:84c4a7d89325e5d405712dff6db06ef55996a09faf7490c1693d032171730777": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/procps-ng-3.3.15-9.el8.x86_64.rpm"
           },
-          "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-swap-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:862e75a1cf6aa5be750a530c8ce8b999d0b2efe9737e20f37f9f9153a82e56fa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libassuan-2.5.1-3.el8.x86_64.rpm"
           },
@@ -3039,9 +2789,6 @@
           "sha256:88f6945f8c7875f85a8f6befdfee8f3460f6f929fc6fb64eba1411bf8c2c6361": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-audit-3.0.7-4.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a631d059089724f11aed2114ddaf7511c9771f415f638ed5b3a135bb90f2a31": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/coreutils-8.30-13.el8.x86_64.rpm"
           },
@@ -3054,9 +2801,6 @@
           "sha256:8c6da26441750b3970fe73b6a9d2d780931da6cdea48f10d0b34c65c79a9e341": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-jinja2-2.10.1-3.el8.noarch.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8d371e753071edc796d2eadb8278980290511be6279fdf46649c81b859497d6a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/prefixdevname-0.1.0-6.el8.x86_64.rpm"
           },
@@ -3072,9 +2816,6 @@
           "sha256:8e838f5065490d117f247f55047de7e46ea36193432ff17eab9e4e7724c8c8e1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/snappy-1.1.8-3.el8.x86_64.rpm"
           },
-          "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-loop-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:8efc0d874bbba80e64c99732956704826ce93ddd1476809c43b4d0b240f1e401": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/authselect-1.2.5-1.el8.x86_64.rpm"
           },
@@ -3087,9 +2828,6 @@
           "sha256:912ff00d4f533a0fc8342910586ecc83f566e43f53e150c5cb7c1a6274dd1ba7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/tzdata-2022d-1.el8.noarch.rpm"
           },
-          "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:9137a707b7793567b38e7d8dba78fcf3f70c39320e68a9ee0b745b3a77f182ee": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/teamd-1.31-2.el8.x86_64.rpm"
           },
@@ -3114,12 +2852,6 @@
           "sha256:9461fa7a5e74bfd8d9e9961af9d3003d9d2b496830c2fd6b0641ae8b8bc8e178": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libacl-2.2.53-1.el8.x86_64.rpm"
           },
-          "sha256:94d5c3946873b079aa5af985e31501981fef1cb3065024e9f41f70c40fc9b975": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-util-3.79.0-10.el8_6.x86_64.rpm"
-          },
-          "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-fs-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/unbound-libs-1.16.2-2.el8.x86_64.rpm"
           },
@@ -3234,15 +2966,6 @@
           "sha256:ae6dd4ea3852d1ce30a0988bde8d35e91a8b0709615e3ac64c65a5e24e68fefa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/device-mapper-libs-1.02.181-6.el8.x86_64.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
-          "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:afb86bb3de3f8b6f8ea6be0318f95d6938749ccf91e0cabe5d95c0f197d5de1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/hardlink-1.3-6.el8.x86_64.rpm"
           },
@@ -3279,9 +3002,6 @@
           "sha256:b4babe48d93eccce4f0249ba34d592bfc306c3b14b40df7a5cc9eaec2eaae20f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/numactl-libs-2.0.12-13.el8.x86_64.rpm"
           },
-          "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm"
-          },
           "sha256:b76a180508132aaceb8dcebc5de9cec87d3459a39e4749f9af342d242c410dab": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/oddjob-mkhomedir-0.34.7-2.el8.x86_64.rpm"
           },
@@ -3351,9 +3071,6 @@
           "sha256:c637ccd812d6458885af67910db0e6698917abd8c397a34ebaf7b66052914433": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glibc-langpack-en-2.28-211.el8.x86_64.rpm"
           },
-          "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/udisks2-2.9.0-9.el8.x86_64.rpm"
-          },
           "sha256:c759f74a96a42a539568a16805461352f84c7e1766f41faccb519ac14a8825d3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/pam-1.3.1-22.el8.x86_64.rpm"
           },
@@ -3372,9 +3089,6 @@
           "sha256:cb849487fb29d658b714045a4afe4886324e4add7d47a7296ae0ee89e3477014": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libini_config-1.3.1-40.el8.x86_64.rpm"
           },
-          "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-crypto-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:cccb98acc0ead0737b2f7406c48a2039165276a129de1c7c840e412078437f1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libbasicobjects-0.1.1-40.el8.x86_64.rpm"
           },
@@ -3456,18 +3170,12 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d570af0578f5b2c6225f1f2354404f65bccf91c3974e98dcbc0c7b55a61b9b46": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grep-3.1-6.el8.x86_64.rpm"
           },
           "sha256:d67580b9b2af79f599f77c35c694714d2d39d2ea01c28e8aaca1312e6ab25184": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-libselinux-2.9-6.el8.x86_64.rpm"
           },
-          "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm"
-          },
           "sha256:d94ea399f82d4f9537af1098a588c5cc9a80454ba7c1de9b26dd11cb5c730d8a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-requests-2.20.0-2.1.el8_1.noarch.rpm"
           },
@@ -3504,9 +3212,6 @@
           "sha256:e29131b502b6a199003ed61e27eb3e5cb3d46f4b4a3f8ca1034945a406dcfe80": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsemanage-2.9-9.el8.x86_64.rpm"
           },
-          "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mdadm-4.2-5.el8.x86_64.rpm"
-          },
           "sha256:e4f799b634299835dc1a8e79adcfb223d13b369bd033cbdb14170f845c9464ad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ethtool-5.13-2.el8.x86_64.rpm"
           },
@@ -3630,9 +3335,6 @@
           "sha256:fc46ac94289cd660db8452aa7093c446b0f087cda089b3c3aeeb988286d80ee2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/systemd-239-68.el8.x86_64.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
           "sha256:fd60066d9141529ea385fa8fc3af88d0f6ac0cb7a8515af0abe9b65498707f6f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-urllib3-1.24.2-5.el8.noarch.rpm"
           },
@@ -3645,9 +3347,6 @@
           "sha256:fe1a3e821eab7aafd11152c5d5b9f6cf57de36d8ef3b517e0e2f2315b062742c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-jwt-1.6.1-2.el8.noarch.rpm"
           },
-          "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-utils-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:fec32d37b2f34c891a64a8c5e2faf3d08de25d144289b6f2b7f5fafdd5eec4d2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/parted-3.2-39.el8.x86_64.rpm"
           },
@@ -3900,15 +3599,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5378,15 +5068,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2-libs",
         "epoch": 0,
@@ -5711,15 +5392,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dnf-plugins-core-4.0.21-14.1.el8.noarch.rpm",
         "checksum": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5783,33 +5455,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/e2fsprogs-libs-1.45.6-5.el8.x86_64.rpm",
         "checksum": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -5918,15 +5563,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fuse-libs-2.9.7-16.el8.x86_64.rpm",
         "checksum": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.8",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm",
-        "checksum": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -6107,15 +5743,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-common-2.02-142.el8.noarch.rpm",
         "checksum": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "142.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
-        "checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -6647,15 +6274,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -6692,24 +6310,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libidn2",
         "epoch": 0,
@@ -7007,15 +6607,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmartcols-2.32.1-38.el8.x86_64.rpm",
         "checksum": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -7241,15 +6832,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxml2-2.9.7-15.el8.x86_64.rpm",
         "checksum": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libyaml",
         "epoch": 0,
@@ -7349,15 +6931,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm",
         "checksum": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.2",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mdadm-4.2-5.el8.x86_64.rpm",
-        "checksum": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -7376,15 +6949,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/microcode_ctl-20220809-1.el8.x86_64.rpm",
         "checksum": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -8339,15 +7903,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.6",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm",
-        "checksum": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -8726,96 +8281,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-crypto-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-fs-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-loop-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-mdraid-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-part-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-swap-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-utils-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -8843,15 +8308,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "9.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libudisks2-2.9.0-9.el8.x86_64.rpm",
-        "checksum": "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce"
-      },
       {
         "name": "libxkbcommon",
         "epoch": 0,
@@ -8861,60 +8317,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libxkbcommon-0.9.1-1.el8.x86_64.rpm",
         "checksum": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
       },
-      {
-        "name": "nspr",
-        "epoch": 0,
-        "version": "4.34.0",
-        "release": "3.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nspr-4.34.0-3.el8_6.x86_64.rpm",
-        "checksum": "sha256:82cd233003b87e6b810070eead73ec44073050aabccec9a619309074a1868fe9"
-      },
-      {
-        "name": "nss",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a"
-      },
-      {
-        "name": "nss-softokn",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-softokn-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:319d3d51dfc09875cdbb61518410fe2963887228089d4a9de8f673acc7a2ff82"
-      },
-      {
-        "name": "nss-softokn-freebl",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-softokn-freebl-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:4bcbfd3229e3fd2d6e1adfe46bc233872c4184838de40b2e61a9ba84fcb81512"
-      },
-      {
-        "name": "nss-sysinit",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-sysinit-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:507c1a196520e4263a0581e70b669c352097d6bdc7a5409ae748ee3942e71f5c"
-      },
-      {
-        "name": "nss-util",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-util-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:94d5c3946873b079aa5af985e31501981fef1cb3065024e9f41f70c40fc9b975"
-      },
       {
         "name": "oddjob",
         "epoch": 0,
@@ -9068,15 +8470,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/rsyslog-8.2102.0-10.el8.x86_64.rpm",
         "checksum": "sha256:37ca74f003d06ada0528d353bdc0df49193a058cece3c51173dc8b9c80f410e5"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "9.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/udisks2-2.9.0-9.el8.x86_64.rpm",
-        "checksum": "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -9086,15 +8479,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/unbound-libs-1.16.2-2.el8.x86_64.rpm",
         "checksum": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json
index b0bf5765a..18b44e906 100644
--- a/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-ec2_ha-boot.json
@@ -129,9 +129,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -658,9 +655,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:ac5e4942921cee7c931186db79f14c54ddda3d98756e37bd6bb5b0a1024f0e82"
                   },
@@ -790,9 +784,6 @@
                   {
                     "id": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -814,15 +805,6 @@
                   {
                     "id": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:45c47f5146e39f50ca18d1561821607bc582c5fd4de0bf05bc06a5e0eb33df34"
                   },
@@ -862,9 +844,6 @@
                   {
                     "id": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
                   },
-                  {
-                    "id": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-                  },
                   {
                     "id": "sha256:59b3cff57ffbea4c4c011e6a81341a1203c18b91569fff019c93b756331300f8"
                   },
@@ -925,9 +904,6 @@
                   {
                     "id": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
                   },
-                  {
-                    "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-                  },
                   {
                     "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
                   },
@@ -1120,9 +1096,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:7145b8d179b6c72e61de2b822551b343209adb63b76023fe26e7162d4ff6c107"
                   },
@@ -1135,12 +1108,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:fe37f767487e0806535a06cda4e302555c27166b6320657ae945d5217b8c36aa"
                   },
@@ -1246,9 +1213,6 @@
                   {
                     "id": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8"
                   },
@@ -1327,9 +1291,6 @@
                   {
                     "id": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15"
                   },
@@ -1372,18 +1333,12 @@
                   {
                     "id": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
                   },
-                  {
-                    "id": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-                  },
                   {
                     "id": "sha256:ca6208d771fbbfc703217b0f4314d214a866da86b105f222753a6efeb12d6f69"
                   },
                   {
                     "id": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
                   },
-                  {
-                    "id": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1837,9 +1792,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -2095,36 +2047,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3"
-                  },
-                  {
-                    "id": "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6"
-                  },
-                  {
-                    "id": "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9"
-                  },
-                  {
-                    "id": "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756"
-                  },
-                  {
-                    "id": "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44"
-                  },
-                  {
-                    "id": "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d"
-                  },
-                  {
-                    "id": "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd"
-                  },
-                  {
-                    "id": "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:d16252dcb91c3e581ecb29234180fb99ac3199a052a89d0e23603cb6054bee16"
                   },
@@ -2137,9 +2059,6 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce"
-                  },
                   {
                     "id": "sha256:34001e2596b82803f289adefe1a263b61917e8a67ff8e45d9ff5fc1ca150eb57"
                   },
@@ -2329,15 +2248,9 @@
                   {
                     "id": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
                   },
-                  {
-                    "id": "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f"
-                  },
                   {
                     "id": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -2418,9 +2331,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2588,23 +2499,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2612,13 +2510,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-425.3.1.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2683,20 +2577,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2712,45 +2594,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2758,8 +2605,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2785,28 +2632,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2816,18 +2647,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2845,8 +2664,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -3065,9 +2884,6 @@
           "sha256:1d47e465939bba5bcf9c37be2516e60d6c9449ccee70a54a6133df989ac8b1f5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libksba-1.3.5-7.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -3134,9 +2950,6 @@
           "sha256:2733570f8ea94551f3381538f9c8642c88532c800b384c07b4db02f6b8896c3f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libattr-2.4.48-3.el8.x86_64.rpm"
           },
-          "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm"
-          },
           "sha256:27efba5e62430987380ca7f2e4185e1d27c517a6f8d22958dd3fd0bc2591d3fe": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/rubygem-io-console-0.4.6-110.module+el8.6.0+15956+aa803fc1.x86_64.rpm"
           },
@@ -3197,15 +3010,6 @@
           "sha256:2ff643bfe17476a8dfa94ea900ddf9d89ed0e5f56839f18209f8304a0e31bb2f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dmidecode-3.3-4.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30c6dbc7d2dd8024a16fe2d00b01fa71f4a1ea9d4af5519dc092695d4fa735cf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libss-1.45.6-5.el8.x86_64.rpm"
           },
@@ -3296,9 +3100,6 @@
           "sha256:3a9aede6732c73278d74c413ad9559c1ccf0c0bbdfd1b61734cf984e75d20367": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-configobj-5.0.6-11.el8.noarch.rpm"
           },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3d6a5eeb0da36ce36cd6ddc5e3c2d2bc36cd5962d1450077c5c5754b8f5ac02c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glib2-2.56.4-159.el8.x86_64.rpm"
           },
@@ -3359,9 +3160,6 @@
           "sha256:46ed1904100326d5ded33a027840de37cf90d3dffe8d1fa88a8f01654539a322": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/fence-agents-hpblade-4.2.1-103.el8.noarch.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-2.02-142.el8.x86_64.rpm"
           },
@@ -3536,9 +3334,6 @@
           "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-modules-2.02-142.el8.noarch.rpm"
           },
-          "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-mdraid-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:5d9c5b3341e9b10091a5bc66c08455ce7d9c62911fac6b759b847a46749a1adf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-jsonpointer-1.10-11.el8.noarch.rpm"
           },
@@ -3578,9 +3373,6 @@
           "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsolv-0.7.20-3.el8.x86_64.rpm"
           },
-          "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libudisks2-2.9.0-9.el8.x86_64.rpm"
-          },
           "sha256:6950a3136327480137b0c3ed7555bd36d107ebb39b687354d2d34c5542e19d2d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dbus-1.12.8-23.el8.x86_64.rpm"
           },
@@ -3605,9 +3397,6 @@
           "sha256:6d7a41fb238610416349a53d024cc505ab7f3f6e9953cc2244abb663ec404dad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ncurses-6.1-9.20180224.el8.x86_64.rpm"
           },
-          "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm"
-          },
           "sha256:6dcdb3c2afc64822ed6945bf9607cd0406197bd9764718beef51f5332edd7c05": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glibc-gconv-extra-2.28-211.el8.x86_64.rpm"
           },
@@ -3629,9 +3418,6 @@
           "sha256:709fb09876846df58d761b2ddb973bbf2b870d995452648ef929a2cdf3ea8216": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libarchive-3.3.3-4.el8.x86_64.rpm"
           },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
           "sha256:7145b8d179b6c72e61de2b822551b343209adb63b76023fe26e7162d4ff6c107": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcc-8.5.0-15.el8.x86_64.rpm"
           },
@@ -3656,9 +3442,6 @@
           "sha256:746243a941d8d8299e220e75bed360debcb7f27df661a5f7637deb21cdd67976": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-n8.7-20221015/Packages/libknet1-crypto-nss-plugin-1.24-2.el8.x86_64.rpm"
           },
-          "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-part-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:74c60aed4f76cf297ec7fc218763d5b8b87c03280ed94d216f1a71100441ed3f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-n8.7-20221015/Packages/libknet1-compress-lz4-plugin-1.24-2.el8.x86_64.rpm"
           },
@@ -3770,9 +3553,6 @@
           "sha256:84c4a7d89325e5d405712dff6db06ef55996a09faf7490c1693d032171730777": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/procps-ng-3.3.15-9.el8.x86_64.rpm"
           },
-          "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-swap-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:862e75a1cf6aa5be750a530c8ce8b999d0b2efe9737e20f37f9f9153a82e56fa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libassuan-2.5.1-3.el8.x86_64.rpm"
           },
@@ -3794,9 +3574,6 @@
           "sha256:891b4ffa90ef5369b7a846fabe4ce87e0d7e604fa31a43104b93c7f5654bbb7c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libwbclient-4.16.4-2.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a631d059089724f11aed2114ddaf7511c9771f415f638ed5b3a135bb90f2a31": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/coreutils-8.30-13.el8.x86_64.rpm"
           },
@@ -3809,9 +3586,6 @@
           "sha256:8c6da26441750b3970fe73b6a9d2d780931da6cdea48f10d0b34c65c79a9e341": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-jinja2-2.10.1-3.el8.noarch.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8d371e753071edc796d2eadb8278980290511be6279fdf46649c81b859497d6a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/prefixdevname-0.1.0-6.el8.x86_64.rpm"
           },
@@ -3827,9 +3601,6 @@
           "sha256:8e838f5065490d117f247f55047de7e46ea36193432ff17eab9e4e7724c8c8e1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/snappy-1.1.8-3.el8.x86_64.rpm"
           },
-          "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-loop-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:8efc0d874bbba80e64c99732956704826ce93ddd1476809c43b4d0b240f1e401": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/authselect-1.2.5-1.el8.x86_64.rpm"
           },
@@ -3845,9 +3616,6 @@
           "sha256:912ff00d4f533a0fc8342910586ecc83f566e43f53e150c5cb7c1a6274dd1ba7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/tzdata-2022d-1.el8.noarch.rpm"
           },
-          "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:9137a707b7793567b38e7d8dba78fcf3f70c39320e68a9ee0b745b3a77f182ee": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/teamd-1.31-2.el8.x86_64.rpm"
           },
@@ -3878,9 +3646,6 @@
           "sha256:94d5c3946873b079aa5af985e31501981fef1cb3065024e9f41f70c40fc9b975": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-util-3.79.0-10.el8_6.x86_64.rpm"
           },
-          "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-fs-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/unbound-libs-1.16.2-2.el8.x86_64.rpm"
           },
@@ -4049,12 +3814,6 @@
           "sha256:ae6dd4ea3852d1ce30a0988bde8d35e91a8b0709615e3ac64c65a5e24e68fefa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/device-mapper-libs-1.02.181-6.el8.x86_64.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-3.79.0-10.el8_6.x86_64.rpm"
           },
@@ -4109,9 +3868,6 @@
           "sha256:b516896f3b3a83a1a5c9d0d6e84b025ecdb8d3676cbb195751b44224ad720078": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-n8.7-20221015/Packages/pacemaker-cli-2.1.4-5.el8.x86_64.rpm"
           },
-          "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm"
-          },
           "sha256:b5ceaedb078fd24f7b1c8c739c2492ba3c187ac139ee751578b6bae1564c8ca5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/device-mapper-multipath-0.8.4-28.el8.x86_64.rpm"
           },
@@ -4217,9 +3973,6 @@
           "sha256:c65f150b84982102e17a772d66b2db460f74caaa4f56086322efc31ad7121fa7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/device-mapper-event-1.02.181-6.el8.x86_64.rpm"
           },
-          "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/udisks2-2.9.0-9.el8.x86_64.rpm"
-          },
           "sha256:c759f74a96a42a539568a16805461352f84c7e1766f41faccb519ac14a8825d3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/pam-1.3.1-22.el8.x86_64.rpm"
           },
@@ -4256,9 +4009,6 @@
           "sha256:cbc9960daa473a381ebac94367a9f4acb633e603fba4683010c4a040ef7f9f57": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/fence-agents-heuristics-ping-4.2.1-103.el8.noarch.rpm"
           },
-          "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-crypto-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:cccb98acc0ead0737b2f7406c48a2039165276a129de1c7c840e412078437f1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libbasicobjects-0.1.1-40.el8.x86_64.rpm"
           },
@@ -4358,18 +4108,12 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d570af0578f5b2c6225f1f2354404f65bccf91c3974e98dcbc0c7b55a61b9b46": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grep-3.1-6.el8.x86_64.rpm"
           },
           "sha256:d67580b9b2af79f599f77c35c694714d2d39d2ea01c28e8aaca1312e6ab25184": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-libselinux-2.9-6.el8.x86_64.rpm"
           },
-          "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm"
-          },
           "sha256:d8f93540a6a7329a5158d3e543f77110104f30494f4d6f187427e5010d8df379": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libaio-0.3.112-1.el8.x86_64.rpm"
           },
@@ -4445,9 +4189,6 @@
           "sha256:e33a380e981f44fb1e1987142e4a41bf3dbeb452490f2030876d221640c52e14": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/samba-client-libs-4.16.4-2.el8.x86_64.rpm"
           },
-          "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mdadm-4.2-5.el8.x86_64.rpm"
-          },
           "sha256:e4f799b634299835dc1a8e79adcfb223d13b369bd033cbdb14170f845c9464ad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ethtool-5.13-2.el8.x86_64.rpm"
           },
@@ -4631,9 +4372,6 @@
           "sha256:fc46ac94289cd660db8452aa7093c446b0f087cda089b3c3aeeb988286d80ee2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/systemd-239-68.el8.x86_64.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
           "sha256:fd60066d9141529ea385fa8fc3af88d0f6ac0cb7a8515af0abe9b65498707f6f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-urllib3-1.24.2-5.el8.noarch.rpm"
           },
@@ -4649,9 +4387,6 @@
           "sha256:fe37f767487e0806535a06cda4e302555c27166b6320657ae945d5217b8c36aa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libicu-60.3-2.el8_1.x86_64.rpm"
           },
-          "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-utils-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:fe7cfd8d7281295cbc16dd06dcb79f80c1d18679b4eafe8bb22f61bffec2ca25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/fence-agents-ipmilan-4.2.1-103.el8.noarch.rpm"
           },
@@ -4910,15 +4645,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -6397,15 +6123,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2",
         "epoch": 0,
@@ -6793,15 +6510,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dnf-plugins-core-4.0.21-14.1.el8.noarch.rpm",
         "checksum": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -6865,33 +6573,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/e2fsprogs-libs-1.45.6-5.el8.x86_64.rpm",
         "checksum": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -7009,15 +6690,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fuse-libs-2.9.7-16.el8.x86_64.rpm",
         "checksum": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.8",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm",
-        "checksum": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -7198,15 +6870,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-common-2.02-142.el8.noarch.rpm",
         "checksum": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "142.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
-        "checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -7783,15 +7446,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -7828,24 +7482,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libicu",
         "epoch": 0,
@@ -8161,15 +7797,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmartcols-2.32.1-38.el8.x86_64.rpm",
         "checksum": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -8404,15 +8031,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxml2-2.9.7-15.el8.x86_64.rpm",
         "checksum": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libxslt",
         "epoch": 0,
@@ -8539,15 +8157,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm",
         "checksum": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.2",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mdadm-4.2-5.el8.x86_64.rpm",
-        "checksum": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -8566,15 +8175,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/microcode_ctl-20220809-1.el8.x86_64.rpm",
         "checksum": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -9934,15 +9534,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.6",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm",
-        "checksum": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -10708,96 +10299,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-crypto-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-fs-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-loop-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-mdraid-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-part-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-swap-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-utils-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -10834,15 +10335,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "9.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libudisks2-2.9.0-9.el8.x86_64.rpm",
-        "checksum": "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce"
-      },
       {
         "name": "libverto-libev",
         "epoch": 0,
@@ -11410,15 +10902,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/telnet-0.17-76.el8.x86_64.rpm",
         "checksum": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "9.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/udisks2-2.9.0-9.el8.x86_64.rpm",
-        "checksum": "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -11428,15 +10911,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/unbound-libs-1.16.2-2.el8.x86_64.rpm",
         "checksum": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json
index dca50673a..e693c2ac9 100644
--- a/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-ec2_sap-boot.json
@@ -154,9 +154,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -725,9 +722,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:ac5e4942921cee7c931186db79f14c54ddda3d98756e37bd6bb5b0a1024f0e82"
                   },
@@ -914,15 +908,6 @@
                   {
                     "id": "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:45c47f5146e39f50ca18d1561821607bc582c5fd4de0bf05bc06a5e0eb33df34"
                   },
@@ -980,9 +965,6 @@
                   {
                     "id": "sha256:c33debf1cedf1a6c38ed7e2bc37416a3b2c26d27c0ced755fd640cb49db95987"
                   },
-                  {
-                    "id": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-                  },
                   {
                     "id": "sha256:59b3cff57ffbea4c4c011e6a81341a1203c18b91569fff019c93b756331300f8"
                   },
@@ -1049,9 +1031,6 @@
                   {
                     "id": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
                   },
-                  {
-                    "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-                  },
                   {
                     "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
                   },
@@ -1289,9 +1268,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:7145b8d179b6c72e61de2b822551b343209adb63b76023fe26e7162d4ff6c107"
                   },
@@ -1448,9 +1424,6 @@
                   {
                     "id": "sha256:cfa953b5825141026d5e6cd951f5aca15a88e8998e297e07d537e4aae8da5b21"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8"
                   },
@@ -1541,9 +1514,6 @@
                   {
                     "id": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15"
                   },
@@ -1616,9 +1586,6 @@
                   {
                     "id": "sha256:48e1edacae05696360d0dd0706b2d3debb617ae15e9f7ce47e528839231a6c25"
                   },
-                  {
-                    "id": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -2105,9 +2072,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -3082,9 +3046,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -3369,23 +3331,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -3393,13 +3342,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-425.3.1.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -3464,20 +3409,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -3493,45 +3426,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -3539,8 +3437,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -3566,28 +3464,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -3597,18 +3479,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -3626,8 +3496,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -3993,9 +3863,6 @@
           "sha256:273c756dce0c543a12e1a6c3ccf745235397430ab9258bb13cb34d3a79e215e7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python39-libs-3.9.13-1.module+el8.7.0+15656+ffd4a257.x86_64.rpm"
           },
-          "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm"
-          },
           "sha256:27d04a9a33eb9300a55a8ec7623c02da13d19185278e367b60422c8fe70279e7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/sssd-common-pac-2.7.3-4.el8.x86_64.rpm"
           },
@@ -4086,18 +3953,12 @@
           "sha256:2ff643bfe17476a8dfa94ea900ddf9d89ed0e5f56839f18209f8304a0e31bb2f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dmidecode-3.3-4.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
           "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
           },
           "sha256:308c79a13fac07e1884dbbe056ce39bdd68348b8e4dd3c1914f4c0038e898434": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/sos-4.3-5.el8.noarch.rpm"
           },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30c6dbc7d2dd8024a16fe2d00b01fa71f4a1ea9d4af5519dc092695d4fa735cf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libss-1.45.6-5.el8.x86_64.rpm"
           },
@@ -4296,9 +4157,6 @@
           "sha256:471930ec9d0e115809eaae8aa5c888bc07104c600ff49b55ab746701691c7c0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/iptables-libs-1.8.4-23.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-2.02-142.el8.x86_64.rpm"
           },
@@ -4638,9 +4496,6 @@
           "sha256:6d7a41fb238610416349a53d024cc505ab7f3f6e9953cc2244abb663ec404dad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ncurses-6.1-9.20180224.el8.x86_64.rpm"
           },
-          "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm"
-          },
           "sha256:6dcdb3c2afc64822ed6945bf9607cd0406197bd9764718beef51f5332edd7c05": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glibc-gconv-extra-2.28-211.el8.x86_64.rpm"
           },
@@ -4914,9 +4769,6 @@
           "sha256:8942bd9f52f391bf7832aa81ebc8ea66f420ed5b4d35310666997567f0ea9351": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/pinfo-0.6.10-18.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a3d3e06022e15746a023ace227a8ab3737b468b651cd20f01b5959afa4de75c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/cockpit-podman-53-1.module+el8.7.0+16772+33343656.noarch.rpm"
           },
@@ -4938,9 +4790,6 @@
           "sha256:8c81bb15456e441250d2ed53b223bf85c21a9b25b6a36ab09953cc831f9e7109": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/tcsh-6.20.00-15.el8.x86_64.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8ca5dd4feea941aba58c6d6e981883bca79704dba06583f880c0bf5e0cf4efcf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/desktop-file-utils-0.23-8.el8.x86_64.rpm"
           },
@@ -5295,9 +5144,6 @@
           "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
           },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-3.79.0-10.el8_6.x86_64.rpm"
           },
@@ -5379,9 +5225,6 @@
           "sha256:b50ed1c4095445fbb87d3f3b21abad7ace7fb2cbbac8f38e19b7f1e0caf28b4d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-pexpect-4.3.1-3.el8.noarch.rpm"
           },
-          "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm"
-          },
           "sha256:b5c29663e9ffd460842551c32665c0629f634ad7453f0dc3888f4b07c6f88a71": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/podman-4.2.0-1.module+el8.7.0+16772+33343656.x86_64.rpm"
           },
@@ -5682,9 +5525,6 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ed-1.14.2-4.el8.x86_64.rpm"
           },
@@ -5697,9 +5537,6 @@
           "sha256:d67580b9b2af79f599f77c35c694714d2d39d2ea01c28e8aaca1312e6ab25184": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-libselinux-2.9-6.el8.x86_64.rpm"
           },
-          "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm"
-          },
           "sha256:d805c42ee9293a8ba35f49af63e3f7d813420d4a62ee4cff5ecd7391be851a9b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libtool-ltdl-2.4.6-25.el8.x86_64.rpm"
           },
@@ -6324,15 +6161,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -7928,15 +7756,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2",
         "epoch": 0,
@@ -8495,33 +8314,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ed-1.14.2-4.el8.x86_64.rpm",
         "checksum": "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -8693,15 +8485,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fuse3-libs-3.3.0-16.el8.x86_64.rpm",
         "checksum": "sha256:c33debf1cedf1a6c38ed7e2bc37416a3b2c26d27c0ced755fd640cb49db95987"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.8",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm",
-        "checksum": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -8900,15 +8683,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-common-2.02-142.el8.noarch.rpm",
         "checksum": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "142.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
-        "checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -9620,15 +9394,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -10097,15 +9862,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbclient-4.16.4-2.el8.x86_64.rpm",
         "checksum": "sha256:cfa953b5825141026d5e6cd951f5aca15a88e8998e297e07d537e4aae8da5b21"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -10376,15 +10132,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxml2-2.9.7-15.el8.x86_64.rpm",
         "checksum": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libxslt",
         "epoch": 0,
@@ -10601,15 +10348,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mlocate-0.26-20.el8.x86_64.rpm",
         "checksum": "sha256:48e1edacae05696360d0dd0706b2d3debb617ae15e9f7ce47e528839231a6c25"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -12068,15 +11806,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.6",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm",
-        "checksum": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-      },
       {
         "name": "slang",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_84-aarch64-ec2-boot.json b/test/data/manifests/rhel_84-aarch64-ec2-boot.json
index 21906534f..6e07856a5 100644
--- a/test/data/manifests/rhel_84-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-ec2-boot.json
@@ -2171,14 +2171,14 @@
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
-                  "size": 1024000,
+                  "size": 1048576,
                   "start": 411648,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
+                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 19535839,
-                  "start": 1435648,
+                  "size": 19511263,
+                  "start": 1460224,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2214,8 +2214,7 @@
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
-              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
+              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
             },
             "devices": {
               "device": {
@@ -2223,7 +2222,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000,
+                  "size": 1048576,
                   "lock": true
                 }
               }
@@ -2240,8 +2239,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839,
+                  "start": 1460224,
+                  "size": 19511263,
                   "lock": true
                 }
               }
@@ -2272,7 +2271,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000
+                  "size": 1048576
                 }
               },
               "boot.efi": {
@@ -2287,8 +2286,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839
+                  "start": 1460224,
+                  "size": 19511263
                 }
               }
             },
diff --git a/test/data/manifests/rhel_84-x86_64-ec2-boot.json b/test/data/manifests/rhel_84-x86_64-ec2-boot.json
index 2bcfc4fa1..8811ff4c4 100644
--- a/test/data/manifests/rhel_84-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-ec2-boot.json
@@ -120,9 +120,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:a70958925902f87c5105a79fb5858e375711c8f101e0755c093b120c6e604dd7"
                   },
@@ -636,9 +633,6 @@
                 "type": "org.osbuild.files",
                 "origin": "org.osbuild.source",
                 "references": [
-                  {
-                    "id": "sha256:94fa34d24dec1e26a9d1c1e4e7213c87d792fafaf106d09daecfa25ac928e809"
-                  },
                   {
                     "id": "sha256:31fb540e3627eb73c3df66dd46cdfcab276a612d1d0949fb2afa3ffdf69fb3ab"
                   },
@@ -678,9 +672,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:4d1be1a327a1ef7f0fa6a0005f32b962d446597febebae80b21d8f8f1355a8aa"
                   },
@@ -789,9 +780,6 @@
                   {
                     "id": "sha256:406cc8322105f3a1706feaca414609d4be582d4e2290541239077bc39a6307cd"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:a70958925902f87c5105a79fb5858e375711c8f101e0755c093b120c6e604dd7"
                   },
@@ -813,15 +801,6 @@
                   {
                     "id": "sha256:435d017c887d981b8f485f94f1efc8342f082e76c64bfb058e7f218dcc8a69dd"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:13e921e308e602b3527a93dacf0fc9bcada110e9dd3fdc1a338b3fd708b85aac"
                   },
@@ -858,9 +837,6 @@
                   {
                     "id": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
                   },
-                  {
-                    "id": "sha256:89a735c5fa600fff61f81c198f3a312a7958d3b1adb9d17af30ae5e25a690fb9"
-                  },
                   {
                     "id": "sha256:affab770e241d6c70cb271cbe5f84d02a946ad1b4d17d36f74dab74e9ca8fd7f"
                   },
@@ -918,9 +894,6 @@
                   {
                     "id": "sha256:f7b414c1fd118f998d4253a9fdad7aacad7c858f327efdd830b06604a9d65f07"
                   },
-                  {
-                    "id": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651"
-                  },
                   {
                     "id": "sha256:ac2bd89f2af4378018de5193b7f0f58c1f93e627fac256c7d5ac21950fe4df17"
                   },
@@ -1098,9 +1071,6 @@
                   {
                     "id": "sha256:eb3732b52b805b28192463682e961408db8c6449bb27e733081cff62e77194b3"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:d5d4156b88b64a7d7e86ed0a7fdb3adb7bfc815ec413a4aba74d70cf8f831aea"
                   },
@@ -1113,12 +1083,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:edb1ddaad8b4559bd271fb99b99395cedbb6290876571f2d4554684b1b8e6547"
                   },
@@ -1140,9 +1104,6 @@
                   {
                     "id": "sha256:01e2b6c30bf5eea790cc1c7a13e403e2afa4f4307b63148788820209a87e3bb8"
                   },
-                  {
-                    "id": "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a"
-                  },
                   {
                     "id": "sha256:cd7c30d21e7240f60f0861c229e17fda43e855ab4c78fab39f47f7ae2be5720e"
                   },
@@ -1194,9 +1155,6 @@
                   {
                     "id": "sha256:df169d238e43e575b61b9eb02a392d9c2c75fe6b0bb678f8d8ca27e169347372"
                   },
-                  {
-                    "id": "sha256:19c4c7dec378a3c21c8f2d4b9940fcf27f06fb1edf773eaeb185f664cb439a52"
-                  },
                   {
                     "id": "sha256:507442831068c749ba21b22bd96993a1a2a6c74dd53c55f34c7f81a21554c82d"
                   },
@@ -1233,9 +1191,6 @@
                   {
                     "id": "sha256:5e8c3337e3ed2e31bab967ae331e58f5d7e5534f10ac4677d97e35ba282ade51"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:c07cca867b98c959c67cda988ed8bf9f111f9fc61b635d39b2823513811eade4"
                   },
@@ -1311,9 +1266,6 @@
                   {
                     "id": "sha256:f6eabee17654187308fd32a13de35b2aa1ca88515c1544af88f63893cb19b048"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:018409b1eda8be48a11a5b76b95e82ff1d9002569e0644291532d8424dc31edf"
                   },
@@ -1347,18 +1299,12 @@
                   {
                     "id": "sha256:7b6856dc4dc1d88d9c3c9597fb824b5776af59f045087bdb2713d64045216a36"
                   },
-                  {
-                    "id": "sha256:4c701e1403db5d73039735e499674b1ae5dc6750080a505d542c711247f0e5b1"
-                  },
                   {
                     "id": "sha256:55a58ea1e63e2cc102d82ab4d02e04e90e2c03819b2a2dee74395905868eb5fd"
                   },
                   {
                     "id": "sha256:2c695e34267183659e95c654d6ebe2fa979e8afe52fcfb4d698d42fdca588ac5"
                   },
-                  {
-                    "id": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1680,9 +1626,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -1809,36 +1752,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:d975cde9db186a1f4b258436bf019237ca8b78ac4ae00f90eddb536689e6210d"
-                  },
-                  {
-                    "id": "sha256:5525219fbc5e4a65a7074d23b25645b930dffa96981e28971d821b62e7a30a0a"
-                  },
-                  {
-                    "id": "sha256:98afa549d41462a811cce159dc06e06840bcf24eca9d784f77e19214d149e7d7"
-                  },
-                  {
-                    "id": "sha256:cd56f00ccd7461260b174616ee0306a54cfb19c05a5637af98d4f876fb8682c9"
-                  },
-                  {
-                    "id": "sha256:9afe10fb4f998fdae77b6f04c7dc923fed6113e8989c575106b443c64e399e8b"
-                  },
-                  {
-                    "id": "sha256:b98e03599e8c2cd67910a3fcfddf42de4eecff18f79b306a7a7a58b89473d8b1"
-                  },
-                  {
-                    "id": "sha256:f65b195bd738fb4a12b7761b868cd9caecaa67a547c927cc27c0762c5da97d03"
-                  },
-                  {
-                    "id": "sha256:5b5618571dd17467bd96a18bd9c57a0b5ea52401eb21299459e6c04ec93fcf8b"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:bfe5c8ea12012936cc59981a10728e95d5fdadd3e893457af7a27c464d8cb6ba"
                   },
@@ -1848,30 +1761,9 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:fa89bdb6b367bc7bb31ff620202b787fef7efaf4f356c7c4b1f097a95060bb6d"
-                  },
                   {
                     "id": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
                   },
-                  {
-                    "id": "sha256:29902a3f54d6a29167c9111c1a10c9bd2308a198d05fc524db085beecc50f50b"
-                  },
-                  {
-                    "id": "sha256:1b76a3999023a1a118be030f6e3165a925d48399f38302afef555d5327a533e1"
-                  },
-                  {
-                    "id": "sha256:b16406b22409f7572257441e446d717447f0dbbca820249113c386a876aa6d29"
-                  },
-                  {
-                    "id": "sha256:d9e5cea8712d1093241ba300b86d4349b46e51dcecbee4a88692dd2a4027a270"
-                  },
-                  {
-                    "id": "sha256:b748e312645dd47cc314fc4523fdcf7351fe25c12a4d3369e838552bae2393c1"
-                  },
-                  {
-                    "id": "sha256:812063b70caf78ab378defe4fa4dd0215175b58a18666729e86b9ed7b0f4e62e"
-                  },
                   {
                     "id": "sha256:0e0f05c3d39f4b3eee6a5786a6aea4c7ef5f5921bc6146489d1f97aa602f7d6d"
                   },
@@ -1917,15 +1809,9 @@
                   {
                     "id": "sha256:2da4af0a0bcc46163e4d83e85b77f1ac03a15fb10647730b09f5d38b2027370d"
                   },
-                  {
-                    "id": "sha256:6161073140cd2b57627c3d98709dfbf50da251ed848768cc26027ffcacfcbce7"
-                  },
                   {
                     "id": "sha256:6a43c0a0605f6a5e3e155ca1d2e1bfdf5a8986a282b04c1c160d9e0148fb02af"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -1945,9 +1831,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2128,23 +2012,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2152,13 +2023,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-305.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2223,20 +2090,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2252,45 +2107,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2298,8 +2118,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2325,28 +2145,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2356,18 +2160,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2385,8 +2177,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -2518,9 +2310,6 @@
           "sha256:197b12db401b9a501bc92f6b000be37af4b89d874463810e074fdf6acb563f39": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libblkid-2.32.1-27.el8.x86_64.rpm"
           },
-          "sha256:19c4c7dec378a3c21c8f2d4b9940fcf27f06fb1edf773eaeb185f664cb439a52": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libqmi-1.24.0-1.el8.x86_64.rpm"
-          },
           "sha256:19dba7cb30c3cb598886326df0ec1114c6e195a57c9ce3a8b78b83555e9e8648": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/geolite2-city-20180605-1.el8.noarch.rpm"
           },
@@ -2530,9 +2319,6 @@
           "sha256:1b6fe19e2856f752a2cd8f917db539dbe9fc1b1560fff3341864b13ffb0ccae0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/xz-5.2.4-3.el8.x86_64.rpm"
           },
-          "sha256:1b76a3999023a1a118be030f6e3165a925d48399f38302afef555d5327a533e1": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nss-3.53.1-17.el8_3.x86_64.rpm"
-          },
           "sha256:1b9c2dc9be278b1a3342dc080d55eff0c2fdce806b037682e431af83c534817e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libkcapi-hmaccalc-1.2.0-2.el8.x86_64.rpm"
           },
@@ -2542,9 +2328,6 @@
           "sha256:1d47e465939bba5bcf9c37be2516e60d6c9449ccee70a54a6133df989ac8b1f5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libksba-1.3.5-7.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -2557,9 +2340,6 @@
           "sha256:206de21c82d76de550bcc1959138472640b0a950a311b753203f5dfe5b201b7b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ipcalc-0.2.4-4.el8.x86_64.rpm"
           },
-          "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libmbim-1.20.2-1.el8.x86_64.rpm"
-          },
           "sha256:20dec130e4fd0a2146443791ca7ade6e079cea691d93711813d5f483b691c55a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-ethtool-0.14-3.el8.x86_64.rpm"
           },
@@ -2605,9 +2385,6 @@
           "sha256:28ccf9ff472c824f6c5a3c2a0c076bfa221b8e48368e43de9b3c2e83d67e8b5d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mpfr-3.1.6-1.el8.x86_64.rpm"
           },
-          "sha256:29902a3f54d6a29167c9111c1a10c9bd2308a198d05fc524db085beecc50f50b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nspr-4.25.0-2.el8_2.x86_64.rpm"
-          },
           "sha256:2a65cec3eb67ba7645dd97cf3f3811cd5fb06eea2526d36a683d3fdaa0f2825e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/cronie-anacron-1.5.2-4.el8.x86_64.rpm"
           },
@@ -2641,15 +2418,6 @@
           "sha256:2f47fe4fe818d6f4eef117287aef700380aa7f1bd50931cada45efc0be05603c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/coreutils-8.30-8.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30f3eca78f87fb66d9797a252df9217ec755e7a9034edf44deec5943dde4ba54": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-tools-2.02-99.el8.x86_64.rpm"
           },
@@ -2722,9 +2490,6 @@
           "sha256:3b78a074b7f24acab538bb0dc3296dd465f796a54e32ae3b097668c8e15cfea2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/filesystem-3.8-3.el8.x86_64.rpm"
           },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3dc82857e070870d00a5d44e2ff597bdb3f7eb9784c84807c170086729c61825": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/file-libs-5.33-16.el8_3.1.x86_64.rpm"
           },
@@ -2788,9 +2553,6 @@
           "sha256:474a66a4cf3d5a00286be40c15bad69ea1ac63a9424a1ff44f20a548a7686f7a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libfastjson-0.99.8-2.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:482e8619051fd7c027e06c206a016fa53c9b7d49afdc725fd38ff0375ab89318": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/kmod-25-17.el8.x86_64.rpm"
           },
@@ -2830,9 +2592,6 @@
           "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgpg-error-1.31-1.el8.x86_64.rpm"
           },
-          "sha256:4c701e1403db5d73039735e499674b1ae5dc6750080a505d542c711247f0e5b1": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mdadm-4.1-15.el8.x86_64.rpm"
-          },
           "sha256:4d1be1a327a1ef7f0fa6a0005f32b962d446597febebae80b21d8f8f1355a8aa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/bzip2-libs-1.0.6-26.el8.x86_64.rpm"
           },
@@ -2881,9 +2640,6 @@
           "sha256:53d9bb412615966acdf9a6b1c26c5899a9c2c0b76a27f360d3d6076536d2540a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libpng-1.6.34-5.el8.x86_64.rpm"
           },
-          "sha256:5525219fbc5e4a65a7074d23b25645b930dffa96981e28971d821b62e7a30a0a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-crypto-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:5579ecdd5bd802f6aaf445eee712817d356923797f79833cbbe599e8df998bd0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/NetworkManager-cloud-setup-1.30.0-7.el8.x86_64.rpm"
           },
@@ -2905,9 +2661,6 @@
           "sha256:5b1bc2ca63d563828a3a0968d42fb75ae0917366d06df8176d917f7c477f33b4": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-libsemanage-2.9-6.el8.x86_64.rpm"
           },
-          "sha256:5b5618571dd17467bd96a18bd9c57a0b5ea52401eb21299459e6c04ec93fcf8b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-utils-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:5b861df3b533dad96725ad66609c8aedef77d38b4856aab149b7bfc90cfd9f20": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/subscription-manager-1.28.13-2.el8.x86_64.rpm"
           },
@@ -2932,9 +2685,6 @@
           "sha256:6103a6b9eb69f8b79999371c124bdc21f1bedd64c8d67a73a06daf2f6307956f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-linux-procfs-0.6.3-1.el8.noarch.rpm"
           },
-          "sha256:6161073140cd2b57627c3d98709dfbf50da251ed848768cc26027ffcacfcbce7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/udisks2-2.9.0-6.el8.x86_64.rpm"
-          },
           "sha256:616b23d84d2c4f85463c1b72cf1fcc2c99eeac38e94ade7318a195072d139641": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-setuptools-39.2.0-6.el8.noarch.rpm"
           },
@@ -2998,9 +2748,6 @@
           "sha256:703f78e932f243ccf2890039ab582176b829f4dfc302a4c9a4e48189eb3a0bd2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ca-certificates-2020.2.41-80.0.el8_2.noarch.rpm"
           },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
           "sha256:716c655cda9bbb4dc7eea0f8c80888fb9daddc1fc95d3504d4454fcb917e08f8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libuuid-2.32.1-27.el8.x86_64.rpm"
           },
@@ -3073,9 +2820,6 @@
           "sha256:802263173d9c487fc3ca584cc2a5b7b7bb49ac0d12d9026b3246d50fd0888fb1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dbus-glib-0.110-2.el8.x86_64.rpm"
           },
-          "sha256:812063b70caf78ab378defe4fa4dd0215175b58a18666729e86b9ed7b0f4e62e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nss-util-3.53.1-17.el8_3.x86_64.rpm"
-          },
           "sha256:8279fe19cca94c3817693378a7d48d420bb9c4dee0775bfb3f9c329193edc237": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/hdparm-9.54-3.el8.x86_64.rpm"
           },
@@ -3106,12 +2850,6 @@
           "sha256:887ab12f323cddd75fa61df9cf3acb0e77be27d0a0dcd5eafb99f68eb74ddbd8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dnf-4.4.2-11.el8.noarch.rpm"
           },
-          "sha256:89a735c5fa600fff61f81c198f3a312a7958d3b1adb9d17af30ae5e25a690fb9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/fwupd-1.5.5-3.el8.x86_64.rpm"
-          },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a85c0adf8b0987359c26fbfedfadba998dd807c5a00751eca768f0e13af7f48": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/iproute-5.9.0-4.el8.x86_64.rpm"
           },
@@ -3130,9 +2868,6 @@
           "sha256:8c4b5140b61fa1e491d76462c2137e81d19c5fbc7e0a91329d91c8d8427ea696": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/python3-unbound-1.7.3-15.el8.x86_64.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8d371e753071edc796d2eadb8278980290511be6279fdf46649c81b859497d6a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/prefixdevname-0.1.0-6.el8.x86_64.rpm"
           },
@@ -3172,9 +2907,6 @@
           "sha256:947b4e4eebec21501ca62e2a7ff9baae0e4e7c59584fbba4b6276a402cfbb45b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/vim-minimal-8.0.1763-15.el8.x86_64.rpm"
           },
-          "sha256:94fa34d24dec1e26a9d1c1e4e7213c87d792fafaf106d09daecfa25ac928e809": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ModemManager-glib-1.10.8-2.el8.x86_64.rpm"
-          },
           "sha256:9560ff328ff89cdea202354f17e852c69fc41de1ed008e5dd1a86ffadb89c6f1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libverto-0.3.0-5.el8.x86_64.rpm"
           },
@@ -3196,9 +2928,6 @@
           "sha256:98a589d7e1cdea9d974aa43f688e55333eed11ce7cb2037d45cc2e69bce579b3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/usermode-1.113-1.el8.x86_64.rpm"
           },
-          "sha256:98afa549d41462a811cce159dc06e06840bcf24eca9d784f77e19214d149e7d7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-fs-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:995831ad6397fbd6e91038c6889981a0b7c649c95192999dc184b98c26d48fea": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/initscripts-10.00.15-1.el8.x86_64.rpm"
           },
@@ -3214,12 +2943,6 @@
           "sha256:9a9ca6857f517f1249d2eb496fe904590d6203e4a9547a28e0b23f21c4cae24a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/polkit-pkla-compat-0.1-12.el8.x86_64.rpm"
           },
-          "sha256:9afe10fb4f998fdae77b6f04c7dc923fed6113e8989c575106b443c64e399e8b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-mdraid-2.24-5.el8.x86_64.rpm"
-          },
-          "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mokutil-0.3.0-11.el8.x86_64.rpm"
-          },
           "sha256:9c5594fcac97c0f8813d7a188e2368e3b1095025fc4a0ecbd5d17e54c0c93f97": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libmnl-1.0.4-6.el8.x86_64.rpm"
           },
@@ -3307,21 +3030,12 @@
           "sha256:ad060f60303b6764e08657436147cc24cfc4bb1ccc1431796407ba005a7bcec0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/rootfiles-8.1-22.el8.noarch.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:afb86bb3de3f8b6f8ea6be0318f95d6938749ccf91e0cabe5d95c0f197d5de1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/hardlink-1.3-6.el8.x86_64.rpm"
           },
           "sha256:affab770e241d6c70cb271cbe5f84d02a946ad1b4d17d36f74dab74e9ca8fd7f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/gawk-4.2.1-2.el8.x86_64.rpm"
           },
-          "sha256:b16406b22409f7572257441e446d717447f0dbbca820249113c386a876aa6d29": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nss-softokn-3.53.1-17.el8_3.x86_64.rpm"
-          },
           "sha256:b16b74a33e1cbbdf69ce43d869eafc87b325510de731e07d41f3325aa1645fdb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libdb-utils-5.3.28-40.el8.x86_64.rpm"
           },
@@ -3358,9 +3072,6 @@
           "sha256:b6f01f401d1c040362469c3c7601ee8c139d58703391140da55a037af5f23521": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/platform-python-3.6.8-37.el8.x86_64.rpm"
           },
-          "sha256:b748e312645dd47cc314fc4523fdcf7351fe25c12a4d3369e838552bae2393c1": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nss-sysinit-3.53.1-17.el8_3.x86_64.rpm"
-          },
           "sha256:b7a4c23277095c56526a55d7d21a06cfd5b5581f9d5afcc7822f19209599335f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/cpio-2.12-10.el8.x86_64.rpm"
           },
@@ -3373,9 +3084,6 @@
           "sha256:b9584e6823ffe9ccf79282bd57ee076a1e3a71c4c1020a20b5e1975141a50f14": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/basesystem-11-5.el8.noarch.rpm"
           },
-          "sha256:b98e03599e8c2cd67910a3fcfddf42de4eecff18f79b306a7a7a58b89473d8b1": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-part-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:b9d0a4c0e16db4c05b2d0690216d8c5da2db7d67bc765a00ce2a32c5f810c245": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/pkgconf-1.4.2-1.el8.x86_64.rpm"
           },
@@ -3430,9 +3138,6 @@
           "sha256:c4e93daa6d0f0648f4dc694400bd35b8bc01a0d98228054735a9b6bc4c35b920": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/irqbalance-1.4.0-6.el8.x86_64.rpm"
           },
-          "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm"
-          },
           "sha256:c60aede8488f68a001f3495bd6e6d894fc3a44bb488f4550b5970ab5904d0a1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/geolite2-country-20180605-1.el8.noarch.rpm"
           },
@@ -3460,9 +3165,6 @@
           "sha256:ccfdbebdf0575395a80f2fa55e49c8358ca601fdbb0685f37e8c584226264eca": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/python3-pytz-2017.2-9.el8.noarch.rpm"
           },
-          "sha256:cd56f00ccd7461260b174616ee0306a54cfb19c05a5637af98d4f876fb8682c9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-loop-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:cd7c30d21e7240f60f0861c229e17fda43e855ab4c78fab39f47f7ae2be5720e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libmetalink-0.1.3-7.el8.x86_64.rpm"
           },
@@ -3472,9 +3174,6 @@
           "sha256:ce7e129103cab9de8081b9752a9990a632b5930e371988892e671bb47d42d14e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/acl-2.2.53-1.el8.x86_64.rpm"
           },
-          "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-efi-x64-2.02-99.el8.x86_64.rpm"
-          },
           "sha256:d0006232910077e383b9b960ae54b2e6d7619e1929fe5735d04d505c5369f3fd": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsss_nss_idmap-2.4.0-9.el8.x86_64.rpm"
           },
@@ -3505,9 +3204,6 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d54be2b80512ce12631ee626114441cecc5b4fd12e96e916ae903336de5c1283": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-subscription-manager-rhsm-1.28.13-2.el8.x86_64.rpm"
           },
@@ -3535,15 +3231,9 @@
           "sha256:d94ea399f82d4f9537af1098a588c5cc9a80454ba7c1de9b26dd11cb5c730d8a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-requests-2.20.0-2.1.el8_1.noarch.rpm"
           },
-          "sha256:d975cde9db186a1f4b258436bf019237ca8b78ac4ae00f90eddb536689e6210d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:d9dcb469e4c1a90f2e0ed3332d37feb88f804c882aae21fb6dfdeb6564dccfe5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/pciutils-3.7.0-1.el8.x86_64.rpm"
           },
-          "sha256:d9e5cea8712d1093241ba300b86d4349b46e51dcecbee4a88692dd2a4027a270": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nss-softokn-freebl-3.53.1-17.el8_3.x86_64.rpm"
-          },
           "sha256:db8bc154626bdd906a1f50104031a5042bbe91db7f5a1473657795eedd4158c6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-setools-4.3.0-2.el8.x86_64.rpm"
           },
@@ -3664,9 +3354,6 @@
           "sha256:f65164e882881ea96672081f0d990f51372d3d3d8dbeb63360c5b3a28ef6e229": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-libxml2-2.9.7-9.el8.x86_64.rpm"
           },
-          "sha256:f65b195bd738fb4a12b7761b868cd9caecaa67a547c927cc27c0762c5da97d03": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-swap-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:f6eabee17654187308fd32a13de35b2aa1ca88515c1544af88f63893cb19b048": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxml2-2.9.7-9.el8.x86_64.rpm"
           },
@@ -3691,15 +3378,9 @@
           "sha256:fa38da11fac69d66c239bdd5b723d550a570861e3f8a8187f105828fbdcca4a7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/cyrus-sasl-lib-2.1.27-5.el8.x86_64.rpm"
           },
-          "sha256:fa89bdb6b367bc7bb31ff620202b787fef7efaf4f356c7c4b1f097a95060bb6d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libudisks2-2.9.0-6.el8.x86_64.rpm"
-          },
           "sha256:fbfd40e61b1951c777727c2cee2e8d3ef2ba336eeff549059d93aa26e940950b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/kexec-tools-2.0.20-46.el8.x86_64.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
           "sha256:fcf5bc2da92b16f7e8f70837873347b2ac4a4f8ac752caad45898c676c06865a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libnfsidmap-2.3.3-41.el8.x86_64.rpm"
           },
@@ -3967,15 +3648,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5418,15 +5090,6 @@
       }
     ],
     "os": [
-      {
-        "name": "ModemManager-glib",
-        "epoch": 0,
-        "version": "1.10.8",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ModemManager-glib-1.10.8-2.el8.x86_64.rpm",
-        "checksum": "sha256:94fa34d24dec1e26a9d1c1e4e7213c87d792fafaf106d09daecfa25ac928e809"
-      },
       {
         "name": "NetworkManager",
         "epoch": 1,
@@ -5544,15 +5207,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2-libs",
         "epoch": 0,
@@ -5877,15 +5531,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dnf-plugins-core-4.0.18-4.el8.noarch.rpm",
         "checksum": "sha256:406cc8322105f3a1706feaca414609d4be582d4e2290541239077bc39a6307cd"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5949,33 +5594,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/e2fsprogs-libs-1.45.6-1.el8.x86_64.rpm",
         "checksum": "sha256:435d017c887d981b8f485f94f1efc8342f082e76c64bfb058e7f218dcc8a69dd"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -6084,15 +5702,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/fuse-libs-2.9.7-12.el8.x86_64.rpm",
         "checksum": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.5.5",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/fwupd-1.5.5-3.el8.x86_64.rpm",
-        "checksum": "sha256:89a735c5fa600fff61f81c198f3a312a7958d3b1adb9d17af30ae5e25a690fb9"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -6264,15 +5873,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-common-2.02-99.el8.noarch.rpm",
         "checksum": "sha256:f7b414c1fd118f998d4253a9fdad7aacad7c858f327efdd830b06604a9d65f07"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "99.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-efi-x64-2.02-99.el8.x86_64.rpm",
-        "checksum": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -6804,15 +6404,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libffi-3.1-22.el8.x86_64.rpm",
         "checksum": "sha256:eb3732b52b805b28192463682e961408db8c6449bb27e733081cff62e77194b3"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -6849,24 +6440,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libibverbs",
         "epoch": 0,
@@ -6930,15 +6503,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libldb-2.2.0-2.el8.x86_64.rpm",
         "checksum": "sha256:01e2b6c30bf5eea790cc1c7a13e403e2afa4f4307b63148788820209a87e3bb8"
       },
-      {
-        "name": "libmbim",
-        "epoch": 0,
-        "version": "1.20.2",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libmbim-1.20.2-1.el8.x86_64.rpm",
-        "checksum": "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a"
-      },
       {
         "name": "libmetalink",
         "epoch": 0,
@@ -7092,15 +6656,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libpwquality-1.4.4-3.el8.x86_64.rpm",
         "checksum": "sha256:df169d238e43e575b61b9eb02a392d9c2c75fe6b0bb678f8d8ca27e169347372"
       },
-      {
-        "name": "libqmi",
-        "epoch": 0,
-        "version": "1.24.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libqmi-1.24.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:19c4c7dec378a3c21c8f2d4b9940fcf27f06fb1edf773eaeb185f664cb439a52"
-      },
       {
         "name": "libref_array",
         "epoch": 0,
@@ -7209,15 +6764,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsmartcols-2.32.1-27.el8.x86_64.rpm",
         "checksum": "sha256:5e8c3337e3ed2e31bab967ae331e58f5d7e5534f10ac4677d97e35ba282ade51"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -7443,15 +6989,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxml2-2.9.7-9.el8.x86_64.rpm",
         "checksum": "sha256:f6eabee17654187308fd32a13de35b2aa1ca88515c1544af88f63893cb19b048"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libyaml",
         "epoch": 0,
@@ -7551,15 +7088,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/man-db-2.7.6.1-17.el8.x86_64.rpm",
         "checksum": "sha256:7b6856dc4dc1d88d9c3c9597fb824b5776af59f045087bdb2713d64045216a36"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "15.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mdadm-4.1-15.el8.x86_64.rpm",
-        "checksum": "sha256:4c701e1403db5d73039735e499674b1ae5dc6750080a505d542c711247f0e5b1"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -7578,15 +7106,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/microcode_ctl-20210216-1.el8.x86_64.rpm",
         "checksum": "sha256:2c695e34267183659e95c654d6ebe2fa979e8afe52fcfb4d698d42fdca588ac5"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mokutil-0.3.0-11.el8.x86_64.rpm",
-        "checksum": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -8550,15 +8069,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.4",
-        "release": "2.el8_1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm",
-        "checksum": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -8937,96 +8447,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:d975cde9db186a1f4b258436bf019237ca8b78ac4ae00f90eddb536689e6210d"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-crypto-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:5525219fbc5e4a65a7074d23b25645b930dffa96981e28971d821b62e7a30a0a"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-fs-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:98afa549d41462a811cce159dc06e06840bcf24eca9d784f77e19214d149e7d7"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-loop-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:cd56f00ccd7461260b174616ee0306a54cfb19c05a5637af98d4f876fb8682c9"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-mdraid-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:9afe10fb4f998fdae77b6f04c7dc923fed6113e8989c575106b443c64e399e8b"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-part-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:b98e03599e8c2cd67910a3fcfddf42de4eecff18f79b306a7a7a58b89473d8b1"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-swap-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:f65b195bd738fb4a12b7761b868cd9caecaa67a547c927cc27c0762c5da97d03"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-utils-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:5b5618571dd17467bd96a18bd9c57a0b5ea52401eb21299459e6c04ec93fcf8b"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -9054,15 +8474,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libudisks2-2.9.0-6.el8.x86_64.rpm",
-        "checksum": "sha256:fa89bdb6b367bc7bb31ff620202b787fef7efaf4f356c7c4b1f097a95060bb6d"
-      },
       {
         "name": "libxkbcommon",
         "epoch": 0,
@@ -9072,60 +8483,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libxkbcommon-0.9.1-1.el8.x86_64.rpm",
         "checksum": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
       },
-      {
-        "name": "nspr",
-        "epoch": 0,
-        "version": "4.25.0",
-        "release": "2.el8_2",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nspr-4.25.0-2.el8_2.x86_64.rpm",
-        "checksum": "sha256:29902a3f54d6a29167c9111c1a10c9bd2308a198d05fc524db085beecc50f50b"
-      },
-      {
-        "name": "nss",
-        "epoch": 0,
-        "version": "3.53.1",
-        "release": "17.el8_3",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nss-3.53.1-17.el8_3.x86_64.rpm",
-        "checksum": "sha256:1b76a3999023a1a118be030f6e3165a925d48399f38302afef555d5327a533e1"
-      },
-      {
-        "name": "nss-softokn",
-        "epoch": 0,
-        "version": "3.53.1",
-        "release": "17.el8_3",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nss-softokn-3.53.1-17.el8_3.x86_64.rpm",
-        "checksum": "sha256:b16406b22409f7572257441e446d717447f0dbbca820249113c386a876aa6d29"
-      },
-      {
-        "name": "nss-softokn-freebl",
-        "epoch": 0,
-        "version": "3.53.1",
-        "release": "17.el8_3",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nss-softokn-freebl-3.53.1-17.el8_3.x86_64.rpm",
-        "checksum": "sha256:d9e5cea8712d1093241ba300b86d4349b46e51dcecbee4a88692dd2a4027a270"
-      },
-      {
-        "name": "nss-sysinit",
-        "epoch": 0,
-        "version": "3.53.1",
-        "release": "17.el8_3",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nss-sysinit-3.53.1-17.el8_3.x86_64.rpm",
-        "checksum": "sha256:b748e312645dd47cc314fc4523fdcf7351fe25c12a4d3369e838552bae2393c1"
-      },
-      {
-        "name": "nss-util",
-        "epoch": 0,
-        "version": "3.53.1",
-        "release": "17.el8_3",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/nss-util-3.53.1-17.el8_3.x86_64.rpm",
-        "checksum": "sha256:812063b70caf78ab378defe4fa4dd0215175b58a18666729e86b9ed7b0f4e62e"
-      },
       {
         "name": "oddjob",
         "epoch": 0,
@@ -9261,15 +8618,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/rsyslog-8.1911.0-7.el8.x86_64.rpm",
         "checksum": "sha256:2da4af0a0bcc46163e4d83e85b77f1ac03a15fb10647730b09f5d38b2027370d"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/udisks2-2.9.0-6.el8.x86_64.rpm",
-        "checksum": "sha256:6161073140cd2b57627c3d98709dfbf50da251ed848768cc26027ffcacfcbce7"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -9279,15 +8627,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/unbound-libs-1.7.3-15.el8.x86_64.rpm",
         "checksum": "sha256:6a43c0a0605f6a5e3e155ca1d2e1bfdf5a8986a282b04c1c160d9e0148fb02af"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json
index 267937203..2e432999f 100644
--- a/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-ec2_ha-boot.json
@@ -129,9 +129,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:a70958925902f87c5105a79fb5858e375711c8f101e0755c093b120c6e604dd7"
                   },
@@ -646,9 +643,6 @@
                 "type": "org.osbuild.files",
                 "origin": "org.osbuild.source",
                 "references": [
-                  {
-                    "id": "sha256:94fa34d24dec1e26a9d1c1e4e7213c87d792fafaf106d09daecfa25ac928e809"
-                  },
                   {
                     "id": "sha256:31fb540e3627eb73c3df66dd46cdfcab276a612d1d0949fb2afa3ffdf69fb3ab"
                   },
@@ -691,9 +685,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:ac5e4942921cee7c931186db79f14c54ddda3d98756e37bd6bb5b0a1024f0e82"
                   },
@@ -826,9 +817,6 @@
                   {
                     "id": "sha256:406cc8322105f3a1706feaca414609d4be582d4e2290541239077bc39a6307cd"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:a70958925902f87c5105a79fb5858e375711c8f101e0755c093b120c6e604dd7"
                   },
@@ -850,15 +838,6 @@
                   {
                     "id": "sha256:435d017c887d981b8f485f94f1efc8342f082e76c64bfb058e7f218dcc8a69dd"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:13e921e308e602b3527a93dacf0fc9bcada110e9dd3fdc1a338b3fd708b85aac"
                   },
@@ -898,9 +877,6 @@
                   {
                     "id": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
                   },
-                  {
-                    "id": "sha256:89a735c5fa600fff61f81c198f3a312a7958d3b1adb9d17af30ae5e25a690fb9"
-                  },
                   {
                     "id": "sha256:affab770e241d6c70cb271cbe5f84d02a946ad1b4d17d36f74dab74e9ca8fd7f"
                   },
@@ -958,9 +934,6 @@
                   {
                     "id": "sha256:f7b414c1fd118f998d4253a9fdad7aacad7c858f327efdd830b06604a9d65f07"
                   },
-                  {
-                    "id": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651"
-                  },
                   {
                     "id": "sha256:ac2bd89f2af4378018de5193b7f0f58c1f93e627fac256c7d5ac21950fe4df17"
                   },
@@ -1153,9 +1126,6 @@
                   {
                     "id": "sha256:eb3732b52b805b28192463682e961408db8c6449bb27e733081cff62e77194b3"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:d5d4156b88b64a7d7e86ed0a7fdb3adb7bfc815ec413a4aba74d70cf8f831aea"
                   },
@@ -1168,12 +1138,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:edb1ddaad8b4559bd271fb99b99395cedbb6290876571f2d4554684b1b8e6547"
                   },
@@ -1198,9 +1162,6 @@
                   {
                     "id": "sha256:01e2b6c30bf5eea790cc1c7a13e403e2afa4f4307b63148788820209a87e3bb8"
                   },
-                  {
-                    "id": "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a"
-                  },
                   {
                     "id": "sha256:cd7c30d21e7240f60f0861c229e17fda43e855ab4c78fab39f47f7ae2be5720e"
                   },
@@ -1255,9 +1216,6 @@
                   {
                     "id": "sha256:a506765865ee31210532f16af156f54ea9431ba1763269d3a39c9ebf0adf5163"
                   },
-                  {
-                    "id": "sha256:19c4c7dec378a3c21c8f2d4b9940fcf27f06fb1edf773eaeb185f664cb439a52"
-                  },
                   {
                     "id": "sha256:507442831068c749ba21b22bd96993a1a2a6c74dd53c55f34c7f81a21554c82d"
                   },
@@ -1294,9 +1252,6 @@
                   {
                     "id": "sha256:5e8c3337e3ed2e31bab967ae331e58f5d7e5534f10ac4677d97e35ba282ade51"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:c07cca867b98c959c67cda988ed8bf9f111f9fc61b635d39b2823513811eade4"
                   },
@@ -1378,9 +1333,6 @@
                   {
                     "id": "sha256:f6eabee17654187308fd32a13de35b2aa1ca88515c1544af88f63893cb19b048"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15"
                   },
@@ -1423,18 +1375,12 @@
                   {
                     "id": "sha256:7b6856dc4dc1d88d9c3c9597fb824b5776af59f045087bdb2713d64045216a36"
                   },
-                  {
-                    "id": "sha256:4c701e1403db5d73039735e499674b1ae5dc6750080a505d542c711247f0e5b1"
-                  },
                   {
                     "id": "sha256:55a58ea1e63e2cc102d82ab4d02e04e90e2c03819b2a2dee74395905868eb5fd"
                   },
                   {
                     "id": "sha256:2c695e34267183659e95c654d6ebe2fa979e8afe52fcfb4d698d42fdca588ac5"
                   },
-                  {
-                    "id": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1891,9 +1837,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -2149,36 +2092,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:d975cde9db186a1f4b258436bf019237ca8b78ac4ae00f90eddb536689e6210d"
-                  },
-                  {
-                    "id": "sha256:5525219fbc5e4a65a7074d23b25645b930dffa96981e28971d821b62e7a30a0a"
-                  },
-                  {
-                    "id": "sha256:98afa549d41462a811cce159dc06e06840bcf24eca9d784f77e19214d149e7d7"
-                  },
-                  {
-                    "id": "sha256:cd56f00ccd7461260b174616ee0306a54cfb19c05a5637af98d4f876fb8682c9"
-                  },
-                  {
-                    "id": "sha256:9afe10fb4f998fdae77b6f04c7dc923fed6113e8989c575106b443c64e399e8b"
-                  },
-                  {
-                    "id": "sha256:b98e03599e8c2cd67910a3fcfddf42de4eecff18f79b306a7a7a58b89473d8b1"
-                  },
-                  {
-                    "id": "sha256:f65b195bd738fb4a12b7761b868cd9caecaa67a547c927cc27c0762c5da97d03"
-                  },
-                  {
-                    "id": "sha256:5b5618571dd17467bd96a18bd9c57a0b5ea52401eb21299459e6c04ec93fcf8b"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:bfe5c8ea12012936cc59981a10728e95d5fdadd3e893457af7a27c464d8cb6ba"
                   },
@@ -2188,9 +2101,6 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:fa89bdb6b367bc7bb31ff620202b787fef7efaf4f356c7c4b1f097a95060bb6d"
-                  },
                   {
                     "id": "sha256:b1b5660d070a5cf322ecb1c0bf36a8282362f01e0fa4041e11ddbeef1524eef8"
                   },
@@ -2374,15 +2284,9 @@
                   {
                     "id": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
                   },
-                  {
-                    "id": "sha256:6161073140cd2b57627c3d98709dfbf50da251ed848768cc26027ffcacfcbce7"
-                  },
                   {
                     "id": "sha256:6a43c0a0605f6a5e3e155ca1d2e1bfdf5a8986a282b04c1c160d9e0148fb02af"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -2463,9 +2367,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2646,23 +2548,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2670,13 +2559,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-305.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2741,20 +2626,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2770,45 +2643,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2816,8 +2654,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2843,28 +2681,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2874,18 +2696,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2903,8 +2713,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -3084,9 +2894,6 @@
           "sha256:197b12db401b9a501bc92f6b000be37af4b89d874463810e074fdf6acb563f39": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libblkid-2.32.1-27.el8.x86_64.rpm"
           },
-          "sha256:19c4c7dec378a3c21c8f2d4b9940fcf27f06fb1edf773eaeb185f664cb439a52": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libqmi-1.24.0-1.el8.x86_64.rpm"
-          },
           "sha256:19dba7cb30c3cb598886326df0ec1114c6e195a57c9ce3a8b78b83555e9e8648": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/geolite2-city-20180605-1.el8.noarch.rpm"
           },
@@ -3120,9 +2927,6 @@
           "sha256:1d47e465939bba5bcf9c37be2516e60d6c9449ccee70a54a6133df989ac8b1f5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libksba-1.3.5-7.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -3135,9 +2939,6 @@
           "sha256:206de21c82d76de550bcc1959138472640b0a950a311b753203f5dfe5b201b7b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ipcalc-0.2.4-4.el8.x86_64.rpm"
           },
-          "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libmbim-1.20.2-1.el8.x86_64.rpm"
-          },
           "sha256:20dec130e4fd0a2146443791ca7ade6e079cea691d93711813d5f483b691c55a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-ethtool-0.14-3.el8.x86_64.rpm"
           },
@@ -3249,15 +3050,6 @@
           "sha256:2f47fe4fe818d6f4eef117287aef700380aa7f1bd50931cada45efc0be05603c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/coreutils-8.30-8.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30f3eca78f87fb66d9797a252df9217ec755e7a9034edf44deec5943dde4ba54": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-tools-2.02-99.el8.x86_64.rpm"
           },
@@ -3339,9 +3131,6 @@
           "sha256:3b78a074b7f24acab538bb0dc3296dd465f796a54e32ae3b097668c8e15cfea2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/filesystem-3.8-3.el8.x86_64.rpm"
           },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3dc82857e070870d00a5d44e2ff597bdb3f7eb9784c84807c170086729c61825": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/file-libs-5.33-16.el8_3.1.x86_64.rpm"
           },
@@ -3420,9 +3209,6 @@
           "sha256:4786abf2d8d6db7603e0ab29fd4746fcaf32caffda9976e3d7ee90f513957e30": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/corosynclib-3.1.0-3.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:4811ab95c1d50ef7380e2c5937ae4490f8e28f56cf787c189437d1709e4423fb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/perl-podlators-4.11-1.el8.noarch.rpm"
           },
@@ -3483,9 +3269,6 @@
           "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgpg-error-1.31-1.el8.x86_64.rpm"
           },
-          "sha256:4c701e1403db5d73039735e499674b1ae5dc6750080a505d542c711247f0e5b1": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mdadm-4.1-15.el8.x86_64.rpm"
-          },
           "sha256:4d1be1a327a1ef7f0fa6a0005f32b962d446597febebae80b21d8f8f1355a8aa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/bzip2-libs-1.0.6-26.el8.x86_64.rpm"
           },
@@ -3552,9 +3335,6 @@
           "sha256:53d9bb412615966acdf9a6b1c26c5899a9c2c0b76a27f360d3d6076536d2540a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libpng-1.6.34-5.el8.x86_64.rpm"
           },
-          "sha256:5525219fbc5e4a65a7074d23b25645b930dffa96981e28971d821b62e7a30a0a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-crypto-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:5571eef678ca33b3f9b451145c3fa1e5344c4a9b5f2c0245bcbcea4cf225b3c6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/fence-agents-rsa-4.2.1-65.el8.noarch.rpm"
           },
@@ -3591,9 +3371,6 @@
           "sha256:5b1bc2ca63d563828a3a0968d42fb75ae0917366d06df8176d917f7c477f33b4": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-libsemanage-2.9-6.el8.x86_64.rpm"
           },
-          "sha256:5b5618571dd17467bd96a18bd9c57a0b5ea52401eb21299459e6c04ec93fcf8b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-utils-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:5b861df3b533dad96725ad66609c8aedef77d38b4856aab149b7bfc90cfd9f20": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/subscription-manager-1.28.13-2.el8.x86_64.rpm"
           },
@@ -3624,9 +3401,6 @@
           "sha256:6103a6b9eb69f8b79999371c124bdc21f1bedd64c8d67a73a06daf2f6307956f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-linux-procfs-0.6.3-1.el8.noarch.rpm"
           },
-          "sha256:6161073140cd2b57627c3d98709dfbf50da251ed848768cc26027ffcacfcbce7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/udisks2-2.9.0-6.el8.x86_64.rpm"
-          },
           "sha256:616b23d84d2c4f85463c1b72cf1fcc2c99eeac38e94ade7318a195072d139641": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-setuptools-39.2.0-6.el8.noarch.rpm"
           },
@@ -3711,9 +3485,6 @@
           "sha256:703f78e932f243ccf2890039ab582176b829f4dfc302a4c9a4e48189eb3a0bd2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ca-certificates-2020.2.41-80.0.el8_2.noarch.rpm"
           },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
           "sha256:716c655cda9bbb4dc7eea0f8c80888fb9daddc1fc95d3504d4454fcb917e08f8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libuuid-2.32.1-27.el8.x86_64.rpm"
           },
@@ -3864,12 +3635,6 @@
           "sha256:887ab12f323cddd75fa61df9cf3acb0e77be27d0a0dcd5eafb99f68eb74ddbd8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dnf-4.4.2-11.el8.noarch.rpm"
           },
-          "sha256:89a735c5fa600fff61f81c198f3a312a7958d3b1adb9d17af30ae5e25a690fb9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/fwupd-1.5.5-3.el8.x86_64.rpm"
-          },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a85c0adf8b0987359c26fbfedfadba998dd807c5a00751eca768f0e13af7f48": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/iproute-5.9.0-4.el8.x86_64.rpm"
           },
@@ -3894,9 +3659,6 @@
           "sha256:8c4b5140b61fa1e491d76462c2137e81d19c5fbc7e0a91329d91c8d8427ea696": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/python3-unbound-1.7.3-15.el8.x86_64.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8d371e753071edc796d2eadb8278980290511be6279fdf46649c81b859497d6a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/prefixdevname-0.1.0-6.el8.x86_64.rpm"
           },
@@ -3942,9 +3704,6 @@
           "sha256:947b4e4eebec21501ca62e2a7ff9baae0e4e7c59584fbba4b6276a402cfbb45b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/vim-minimal-8.0.1763-15.el8.x86_64.rpm"
           },
-          "sha256:94fa34d24dec1e26a9d1c1e4e7213c87d792fafaf106d09daecfa25ac928e809": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ModemManager-glib-1.10.8-2.el8.x86_64.rpm"
-          },
           "sha256:9560ff328ff89cdea202354f17e852c69fc41de1ed008e5dd1a86ffadb89c6f1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libverto-0.3.0-5.el8.x86_64.rpm"
           },
@@ -3969,9 +3728,6 @@
           "sha256:98a589d7e1cdea9d974aa43f688e55333eed11ce7cb2037d45cc2e69bce579b3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/usermode-1.113-1.el8.x86_64.rpm"
           },
-          "sha256:98afa549d41462a811cce159dc06e06840bcf24eca9d784f77e19214d149e7d7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-fs-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:995831ad6397fbd6e91038c6889981a0b7c649c95192999dc184b98c26d48fea": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/initscripts-10.00.15-1.el8.x86_64.rpm"
           },
@@ -3987,12 +3743,6 @@
           "sha256:9a9ca6857f517f1249d2eb496fe904590d6203e4a9547a28e0b23f21c4cae24a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/polkit-pkla-compat-0.1-12.el8.x86_64.rpm"
           },
-          "sha256:9afe10fb4f998fdae77b6f04c7dc923fed6113e8989c575106b443c64e399e8b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-mdraid-2.24-5.el8.x86_64.rpm"
-          },
-          "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mokutil-0.3.0-11.el8.x86_64.rpm"
-          },
           "sha256:9c5594fcac97c0f8813d7a188e2368e3b1095025fc4a0ecbd5d17e54c0c93f97": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libmnl-1.0.4-6.el8.x86_64.rpm"
           },
@@ -4125,12 +3875,6 @@
           "sha256:ae227b724debc457222bad34884f3bc43b17a8d0449a6567d557755fa1c95398": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/fence-agents-ipmilan-4.2.1-65.el8.noarch.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:afb86bb3de3f8b6f8ea6be0318f95d6938749ccf91e0cabe5d95c0f197d5de1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/hardlink-1.3-6.el8.x86_64.rpm"
           },
@@ -4218,9 +3962,6 @@
           "sha256:b9584e6823ffe9ccf79282bd57ee076a1e3a71c4c1020a20b5e1975141a50f14": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/basesystem-11-5.el8.noarch.rpm"
           },
-          "sha256:b98e03599e8c2cd67910a3fcfddf42de4eecff18f79b306a7a7a58b89473d8b1": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-part-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:b9d0a4c0e16db4c05b2d0690216d8c5da2db7d67bc765a00ce2a32c5f810c245": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/pkgconf-1.4.2-1.el8.x86_64.rpm"
           },
@@ -4302,9 +4043,6 @@
           "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxslt-1.1.32-6.el8.x86_64.rpm"
           },
-          "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm"
-          },
           "sha256:c60aede8488f68a001f3495bd6e6d894fc3a44bb488f4550b5970ab5904d0a1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/geolite2-country-20180605-1.el8.noarch.rpm"
           },
@@ -4344,9 +4082,6 @@
           "sha256:ccfdbebdf0575395a80f2fa55e49c8358ca601fdbb0685f37e8c584226264eca": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/python3-pytz-2017.2-9.el8.noarch.rpm"
           },
-          "sha256:cd56f00ccd7461260b174616ee0306a54cfb19c05a5637af98d4f876fb8682c9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-loop-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:cd7c30d21e7240f60f0861c229e17fda43e855ab4c78fab39f47f7ae2be5720e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libmetalink-0.1.3-7.el8.x86_64.rpm"
           },
@@ -4362,9 +4097,6 @@
           "sha256:cec7c0d124dc281ef4befe001bceabbeba83c5bf05c9a4430102b490cc8bf8e8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/perl-Socket-2.027-3.el8.x86_64.rpm"
           },
-          "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-efi-x64-2.02-99.el8.x86_64.rpm"
-          },
           "sha256:d0006232910077e383b9b960ae54b2e6d7619e1929fe5735d04d505c5369f3fd": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsss_nss_idmap-2.4.0-9.el8.x86_64.rpm"
           },
@@ -4410,9 +4142,6 @@
           "sha256:d5114f76a7ee99c97c34468a1ba936ca3a3e0ab28e8f3a9011dc2ef7d08f0400": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-r8.4-20220705/Packages/libknet1-compress-plugins-all-1.18-1.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d54be2b80512ce12631ee626114441cecc5b4fd12e96e916ae903336de5c1283": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-subscription-manager-rhsm-1.28.13-2.el8.x86_64.rpm"
           },
@@ -4455,9 +4184,6 @@
           "sha256:d94ea399f82d4f9537af1098a588c5cc9a80454ba7c1de9b26dd11cb5c730d8a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-requests-2.20.0-2.1.el8_1.noarch.rpm"
           },
-          "sha256:d975cde9db186a1f4b258436bf019237ca8b78ac4ae00f90eddb536689e6210d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:d9dcb469e4c1a90f2e0ed3332d37feb88f804c882aae21fb6dfdeb6564dccfe5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/pciutils-3.7.0-1.el8.x86_64.rpm"
           },
@@ -4659,9 +4385,6 @@
           "sha256:f65164e882881ea96672081f0d990f51372d3d3d8dbeb63360c5b3a28ef6e229": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-libxml2-2.9.7-9.el8.x86_64.rpm"
           },
-          "sha256:f65b195bd738fb4a12b7761b868cd9caecaa67a547c927cc27c0762c5da97d03": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-swap-2.24-5.el8.x86_64.rpm"
-          },
           "sha256:f6eab450eba999fc1faab9875201ff07acfbed80c0f5ab361f84725193e6f87a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-r8.4-20220705/Packages/pacemaker-2.0.5-9.el8.x86_64.rpm"
           },
@@ -4695,9 +4418,6 @@
           "sha256:fa38da11fac69d66c239bdd5b723d550a570861e3f8a8187f105828fbdcca4a7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/cyrus-sasl-lib-2.1.27-5.el8.x86_64.rpm"
           },
-          "sha256:fa89bdb6b367bc7bb31ff620202b787fef7efaf4f356c7c4b1f097a95060bb6d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libudisks2-2.9.0-6.el8.x86_64.rpm"
-          },
           "sha256:fbc4b08c066f448d213ba5acbcf20a8931c419d2238bc0fe5dd39f71bdf9b30d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/perl-Scalar-List-Utils-1.49-2.el8.x86_64.rpm"
           },
@@ -4707,9 +4427,6 @@
           "sha256:fbfd606dc15511008730584a3849e251010b5abc278b1adfed72488f85b0865e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/fence-agents-ifmib-4.2.1-65.el8.noarch.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
           "sha256:fcf5bc2da92b16f7e8f70837873347b2ac4a4f8ac752caad45898c676c06865a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libnfsidmap-2.3.3-41.el8.x86_64.rpm"
           },
@@ -4983,15 +4700,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -6434,15 +6142,6 @@
       }
     ],
     "os": [
-      {
-        "name": "ModemManager-glib",
-        "epoch": 0,
-        "version": "1.10.8",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ModemManager-glib-1.10.8-2.el8.x86_64.rpm",
-        "checksum": "sha256:94fa34d24dec1e26a9d1c1e4e7213c87d792fafaf106d09daecfa25ac928e809"
-      },
       {
         "name": "NetworkManager",
         "epoch": 1,
@@ -6569,15 +6268,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2",
         "epoch": 0,
@@ -6974,15 +6664,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dnf-plugins-core-4.0.18-4.el8.noarch.rpm",
         "checksum": "sha256:406cc8322105f3a1706feaca414609d4be582d4e2290541239077bc39a6307cd"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -7046,33 +6727,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/e2fsprogs-libs-1.45.6-1.el8.x86_64.rpm",
         "checksum": "sha256:435d017c887d981b8f485f94f1efc8342f082e76c64bfb058e7f218dcc8a69dd"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -7190,15 +6844,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/fuse-libs-2.9.7-12.el8.x86_64.rpm",
         "checksum": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.5.5",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/fwupd-1.5.5-3.el8.x86_64.rpm",
-        "checksum": "sha256:89a735c5fa600fff61f81c198f3a312a7958d3b1adb9d17af30ae5e25a690fb9"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -7370,15 +7015,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-common-2.02-99.el8.noarch.rpm",
         "checksum": "sha256:f7b414c1fd118f998d4253a9fdad7aacad7c858f327efdd830b06604a9d65f07"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "99.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-efi-x64-2.02-99.el8.x86_64.rpm",
-        "checksum": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -7955,15 +7591,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libffi-3.1-22.el8.x86_64.rpm",
         "checksum": "sha256:eb3732b52b805b28192463682e961408db8c6449bb27e733081cff62e77194b3"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -8000,24 +7627,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libibverbs",
         "epoch": 0,
@@ -8090,15 +7699,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libldb-2.2.0-2.el8.x86_64.rpm",
         "checksum": "sha256:01e2b6c30bf5eea790cc1c7a13e403e2afa4f4307b63148788820209a87e3bb8"
       },
-      {
-        "name": "libmbim",
-        "epoch": 0,
-        "version": "1.20.2",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libmbim-1.20.2-1.el8.x86_64.rpm",
-        "checksum": "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a"
-      },
       {
         "name": "libmetalink",
         "epoch": 0,
@@ -8261,15 +7861,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libqb-1.0.3-12.el8.x86_64.rpm",
         "checksum": "sha256:a506765865ee31210532f16af156f54ea9431ba1763269d3a39c9ebf0adf5163"
       },
-      {
-        "name": "libqmi",
-        "epoch": 0,
-        "version": "1.24.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libqmi-1.24.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:19c4c7dec378a3c21c8f2d4b9940fcf27f06fb1edf773eaeb185f664cb439a52"
-      },
       {
         "name": "libref_array",
         "epoch": 0,
@@ -8378,15 +7969,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsmartcols-2.32.1-27.el8.x86_64.rpm",
         "checksum": "sha256:5e8c3337e3ed2e31bab967ae331e58f5d7e5534f10ac4677d97e35ba282ade51"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -8630,15 +8212,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxml2-2.9.7-9.el8.x86_64.rpm",
         "checksum": "sha256:f6eabee17654187308fd32a13de35b2aa1ca88515c1544af88f63893cb19b048"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libxslt",
         "epoch": 0,
@@ -8765,15 +8338,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/man-db-2.7.6.1-17.el8.x86_64.rpm",
         "checksum": "sha256:7b6856dc4dc1d88d9c3c9597fb824b5776af59f045087bdb2713d64045216a36"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "15.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mdadm-4.1-15.el8.x86_64.rpm",
-        "checksum": "sha256:4c701e1403db5d73039735e499674b1ae5dc6750080a505d542c711247f0e5b1"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -8792,15 +8356,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/microcode_ctl-20210216-1.el8.x86_64.rpm",
         "checksum": "sha256:2c695e34267183659e95c654d6ebe2fa979e8afe52fcfb4d698d42fdca588ac5"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mokutil-0.3.0-11.el8.x86_64.rpm",
-        "checksum": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -10169,15 +9724,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.4",
-        "release": "2.el8_1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm",
-        "checksum": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -10943,96 +10489,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:d975cde9db186a1f4b258436bf019237ca8b78ac4ae00f90eddb536689e6210d"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-crypto-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:5525219fbc5e4a65a7074d23b25645b930dffa96981e28971d821b62e7a30a0a"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-fs-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:98afa549d41462a811cce159dc06e06840bcf24eca9d784f77e19214d149e7d7"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-loop-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:cd56f00ccd7461260b174616ee0306a54cfb19c05a5637af98d4f876fb8682c9"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-mdraid-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:9afe10fb4f998fdae77b6f04c7dc923fed6113e8989c575106b443c64e399e8b"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-part-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:b98e03599e8c2cd67910a3fcfddf42de4eecff18f79b306a7a7a58b89473d8b1"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-swap-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:f65b195bd738fb4a12b7761b868cd9caecaa67a547c927cc27c0762c5da97d03"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-utils-2.24-5.el8.x86_64.rpm",
-        "checksum": "sha256:5b5618571dd17467bd96a18bd9c57a0b5ea52401eb21299459e6c04ec93fcf8b"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -11060,15 +10516,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libudisks2-2.9.0-6.el8.x86_64.rpm",
-        "checksum": "sha256:fa89bdb6b367bc7bb31ff620202b787fef7efaf4f356c7c4b1f097a95060bb6d"
-      },
       {
         "name": "libwsman1",
         "epoch": 0,
@@ -11618,15 +11065,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/telnet-0.17-76.el8.x86_64.rpm",
         "checksum": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/udisks2-2.9.0-6.el8.x86_64.rpm",
-        "checksum": "sha256:6161073140cd2b57627c3d98709dfbf50da251ed848768cc26027ffcacfcbce7"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -11636,15 +11074,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/unbound-libs-1.7.3-15.el8.x86_64.rpm",
         "checksum": "sha256:6a43c0a0605f6a5e3e155ca1d2e1bfdf5a8986a282b04c1c160d9e0148fb02af"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json
index ae6c51f1a..814826256 100644
--- a/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-ec2_sap-boot.json
@@ -155,9 +155,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:a70958925902f87c5105a79fb5858e375711c8f101e0755c093b120c6e604dd7"
                   },
@@ -675,9 +672,6 @@
                 "type": "org.osbuild.files",
                 "origin": "org.osbuild.source",
                 "references": [
-                  {
-                    "id": "sha256:94fa34d24dec1e26a9d1c1e4e7213c87d792fafaf106d09daecfa25ac928e809"
-                  },
                   {
                     "id": "sha256:31fb540e3627eb73c3df66dd46cdfcab276a612d1d0949fb2afa3ffdf69fb3ab"
                   },
@@ -753,9 +747,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:ac5e4942921cee7c931186db79f14c54ddda3d98756e37bd6bb5b0a1024f0e82"
                   },
@@ -942,15 +933,6 @@
                   {
                     "id": "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:13e921e308e602b3527a93dacf0fc9bcada110e9dd3fdc1a338b3fd708b85aac"
                   },
@@ -1008,9 +990,6 @@
                   {
                     "id": "sha256:37582049ed88df6e03737825880fee090de4be0e13859b8f055973b6e1828d86"
                   },
-                  {
-                    "id": "sha256:89a735c5fa600fff61f81c198f3a312a7958d3b1adb9d17af30ae5e25a690fb9"
-                  },
                   {
                     "id": "sha256:affab770e241d6c70cb271cbe5f84d02a946ad1b4d17d36f74dab74e9ca8fd7f"
                   },
@@ -1074,9 +1053,6 @@
                   {
                     "id": "sha256:f7b414c1fd118f998d4253a9fdad7aacad7c858f327efdd830b06604a9d65f07"
                   },
-                  {
-                    "id": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651"
-                  },
                   {
                     "id": "sha256:ac2bd89f2af4378018de5193b7f0f58c1f93e627fac256c7d5ac21950fe4df17"
                   },
@@ -1311,9 +1287,6 @@
                   {
                     "id": "sha256:eb3732b52b805b28192463682e961408db8c6449bb27e733081cff62e77194b3"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:d5d4156b88b64a7d7e86ed0a7fdb3adb7bfc815ec413a4aba74d70cf8f831aea"
                   },
@@ -1362,9 +1335,6 @@
                   {
                     "id": "sha256:01e2b6c30bf5eea790cc1c7a13e403e2afa4f4307b63148788820209a87e3bb8"
                   },
-                  {
-                    "id": "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a"
-                  },
                   {
                     "id": "sha256:cd7c30d21e7240f60f0861c229e17fda43e855ab4c78fab39f47f7ae2be5720e"
                   },
@@ -1434,9 +1404,6 @@
                   {
                     "id": "sha256:df169d238e43e575b61b9eb02a392d9c2c75fe6b0bb678f8d8ca27e169347372"
                   },
-                  {
-                    "id": "sha256:19c4c7dec378a3c21c8f2d4b9940fcf27f06fb1edf773eaeb185f664cb439a52"
-                  },
                   {
                     "id": "sha256:507442831068c749ba21b22bd96993a1a2a6c74dd53c55f34c7f81a21554c82d"
                   },
@@ -1476,9 +1443,6 @@
                   {
                     "id": "sha256:5f03649d149041787deb87574cc673d7b5fb41ab47adad76a0a5aa5f84fc697a"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:c07cca867b98c959c67cda988ed8bf9f111f9fc61b635d39b2823513811eade4"
                   },
@@ -1572,9 +1536,6 @@
                   {
                     "id": "sha256:f6eabee17654187308fd32a13de35b2aa1ca88515c1544af88f63893cb19b048"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15"
                   },
@@ -1647,9 +1608,6 @@
                   {
                     "id": "sha256:48e1edacae05696360d0dd0706b2d3debb617ae15e9f7ce47e528839231a6c25"
                   },
-                  {
-                    "id": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -2142,9 +2100,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -3065,9 +3020,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -3365,23 +3318,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -3389,13 +3329,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-305.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -3460,20 +3396,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -3489,45 +3413,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -3535,8 +3424,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -3562,28 +3451,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -3593,18 +3466,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -3622,8 +3483,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -3869,9 +3730,6 @@
           "sha256:197b12db401b9a501bc92f6b000be37af4b89d874463810e074fdf6acb563f39": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libblkid-2.32.1-27.el8.x86_64.rpm"
           },
-          "sha256:19c4c7dec378a3c21c8f2d4b9940fcf27f06fb1edf773eaeb185f664cb439a52": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libqmi-1.24.0-1.el8.x86_64.rpm"
-          },
           "sha256:19dba7cb30c3cb598886326df0ec1114c6e195a57c9ce3a8b78b83555e9e8648": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/geolite2-city-20180605-1.el8.noarch.rpm"
           },
@@ -3926,9 +3784,6 @@
           "sha256:206de21c82d76de550bcc1959138472640b0a950a311b753203f5dfe5b201b7b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ipcalc-0.2.4-4.el8.x86_64.rpm"
           },
-          "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libmbim-1.20.2-1.el8.x86_64.rpm"
-          },
           "sha256:20dec130e4fd0a2146443791ca7ade6e079cea691d93711813d5f483b691c55a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-ethtool-0.14-3.el8.x86_64.rpm"
           },
@@ -4109,15 +3964,9 @@
           "sha256:2f47fe4fe818d6f4eef117287aef700380aa7f1bd50931cada45efc0be05603c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/coreutils-8.30-8.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
           "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
           },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30f3eca78f87fb66d9797a252df9217ec755e7a9034edf44deec5943dde4ba54": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-tools-2.02-99.el8.x86_64.rpm"
           },
@@ -4337,9 +4186,6 @@
           "sha256:474a66a4cf3d5a00286be40c15bad69ea1ac63a9424a1ff44f20a548a7686f7a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libfastjson-0.99.8-2.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:4811ab95c1d50ef7380e2c5937ae4490f8e28f56cf787c189437d1709e4423fb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/perl-podlators-4.11-1.el8.noarch.rpm"
           },
@@ -4925,12 +4771,6 @@
           "sha256:8942bd9f52f391bf7832aa81ebc8ea66f420ed5b4d35310666997567f0ea9351": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/pinfo-0.6.10-18.el8.x86_64.rpm"
           },
-          "sha256:89a735c5fa600fff61f81c198f3a312a7958d3b1adb9d17af30ae5e25a690fb9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/fwupd-1.5.5-3.el8.x86_64.rpm"
-          },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a85c0adf8b0987359c26fbfedfadba998dd807c5a00751eca768f0e13af7f48": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/iproute-5.9.0-4.el8.x86_64.rpm"
           },
@@ -4952,9 +4792,6 @@
           "sha256:8c4b5140b61fa1e491d76462c2137e81d19c5fbc7e0a91329d91c8d8427ea696": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/python3-unbound-1.7.3-15.el8.x86_64.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8ca5dd4feea941aba58c6d6e981883bca79704dba06583f880c0bf5e0cf4efcf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/desktop-file-utils-0.23-8.el8.x86_64.rpm"
           },
@@ -5024,9 +4861,6 @@
           "sha256:94a62eec408c64e96f0fb85b3266b4740dbd9e5f0e33d8135e21db10a1de3d38": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/vdo-6.2.4.14-14.el8.x86_64.rpm"
           },
-          "sha256:94fa34d24dec1e26a9d1c1e4e7213c87d792fafaf106d09daecfa25ac928e809": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ModemManager-glib-1.10.8-2.el8.x86_64.rpm"
-          },
           "sha256:95065d7db6f91a57e453beede3f02c80f0b219722667c24cedeedfa44c843850": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libwayland-cursor-1.17.0-1.el8.x86_64.rpm"
           },
@@ -5099,9 +4933,6 @@
           "sha256:9afe10fb4f998fdae77b6f04c7dc923fed6113e8989c575106b443c64e399e8b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libblockdev-mdraid-2.24-5.el8.x86_64.rpm"
           },
-          "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mokutil-0.3.0-11.el8.x86_64.rpm"
-          },
           "sha256:9b079ce20a6524d8e85d139b2ec2a7dd3f4f79fa283f68208b72b8091e6bde3b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/libXft-2.3.3-1.el8.x86_64.rpm"
           },
@@ -5261,9 +5092,6 @@
           "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
           },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:af017f523bf816179c5e9de9df7dad22a277531b7741d78871530f45b8288436": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ansible-2-20220705/Packages/a/ansible-2.9.27-1.el8ae.noarch.rpm"
           },
@@ -5474,9 +5302,6 @@
           "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxslt-1.1.32-6.el8.x86_64.rpm"
           },
-          "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm"
-          },
           "sha256:c60aede8488f68a001f3495bd6e6d894fc3a44bb488f4550b5970ab5904d0a1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.4-20210921/Packages/geolite2-country-20180605-1.el8.noarch.rpm"
           },
@@ -5549,9 +5374,6 @@
           "sha256:cec7c0d124dc281ef4befe001bceabbeba83c5bf05c9a4430102b490cc8bf8e8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/perl-Socket-2.027-3.el8.x86_64.rpm"
           },
-          "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-efi-x64-2.02-99.el8.x86_64.rpm"
-          },
           "sha256:cf3b992e8f7d04c45bbcd92ba93d70350b6a8a0b920cd11f58d7b808fdb256e0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-sap-r8.4-20220705/Packages/compat-sap-c++-10-10.2.1-1.el8.x86_64.rpm"
           },
@@ -5606,9 +5428,6 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d54be2b80512ce12631ee626114441cecc5b4fd12e96e916ae903336de5c1283": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/python3-subscription-manager-rhsm-1.28.13-2.el8.x86_64.rpm"
           },
@@ -6278,15 +6097,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -7729,15 +7539,6 @@
       }
     ],
     "os": [
-      {
-        "name": "ModemManager-glib",
-        "epoch": 0,
-        "version": "1.10.8",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ModemManager-glib-1.10.8-2.el8.x86_64.rpm",
-        "checksum": "sha256:94fa34d24dec1e26a9d1c1e4e7213c87d792fafaf106d09daecfa25ac928e809"
-      },
       {
         "name": "NetworkManager",
         "epoch": 1,
@@ -7963,15 +7764,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2",
         "epoch": 0,
@@ -8530,33 +8322,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/ed-1.14.2-4.el8.x86_64.rpm",
         "checksum": "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -8728,15 +8493,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/fuse3-libs-3.2.1-12.el8.x86_64.rpm",
         "checksum": "sha256:37582049ed88df6e03737825880fee090de4be0e13859b8f055973b6e1828d86"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.5.5",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/fwupd-1.5.5-3.el8.x86_64.rpm",
-        "checksum": "sha256:89a735c5fa600fff61f81c198f3a312a7958d3b1adb9d17af30ae5e25a690fb9"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -8926,15 +8682,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-common-2.02-99.el8.noarch.rpm",
         "checksum": "sha256:f7b414c1fd118f998d4253a9fdad7aacad7c858f327efdd830b06604a9d65f07"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "99.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/grub2-efi-x64-2.02-99.el8.x86_64.rpm",
-        "checksum": "sha256:cf0fc74feaf99f8c57a9ebdc8cb4371e6bcca905fab6f44ba408443a7cfe3651"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -9637,15 +9384,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libffi-3.1-22.el8.x86_64.rpm",
         "checksum": "sha256:eb3732b52b805b28192463682e961408db8c6449bb27e733081cff62e77194b3"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -9790,15 +9528,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libldb-2.2.0-2.el8.x86_64.rpm",
         "checksum": "sha256:01e2b6c30bf5eea790cc1c7a13e403e2afa4f4307b63148788820209a87e3bb8"
       },
-      {
-        "name": "libmbim",
-        "epoch": 0,
-        "version": "1.20.2",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libmbim-1.20.2-1.el8.x86_64.rpm",
-        "checksum": "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a"
-      },
       {
         "name": "libmetalink",
         "epoch": 0,
@@ -10006,15 +9735,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libpwquality-1.4.4-3.el8.x86_64.rpm",
         "checksum": "sha256:df169d238e43e575b61b9eb02a392d9c2c75fe6b0bb678f8d8ca27e169347372"
       },
-      {
-        "name": "libqmi",
-        "epoch": 0,
-        "version": "1.24.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libqmi-1.24.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:19c4c7dec378a3c21c8f2d4b9940fcf27f06fb1edf773eaeb185f664cb439a52"
-      },
       {
         "name": "libref_array",
         "epoch": 0,
@@ -10132,15 +9852,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsmbclient-4.13.3-3.el8.x86_64.rpm",
         "checksum": "sha256:5f03649d149041787deb87574cc673d7b5fb41ab47adad76a0a5aa5f84fc697a"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -10420,15 +10131,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxml2-2.9.7-9.el8.x86_64.rpm",
         "checksum": "sha256:f6eabee17654187308fd32a13de35b2aa1ca88515c1544af88f63893cb19b048"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libxslt",
         "epoch": 0,
@@ -10645,15 +10347,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mlocate-0.26-20.el8.x86_64.rpm",
         "checksum": "sha256:48e1edacae05696360d0dd0706b2d3debb617ae15e9f7ce47e528839231a6c25"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/mokutil-0.3.0-11.el8.x86_64.rpm",
-        "checksum": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -12130,15 +11823,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.4",
-        "release": "2.el8_1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.4-20210921/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm",
-        "checksum": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-      },
       {
         "name": "slang",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_85-aarch64-ec2-boot.json b/test/data/manifests/rhel_85-aarch64-ec2-boot.json
index 0d62a0d8b..5b6ff9ba7 100644
--- a/test/data/manifests/rhel_85-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-ec2-boot.json
@@ -2135,14 +2135,14 @@
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
-                  "size": 1024000,
+                  "size": 1048576,
                   "start": 411648,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
+                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 19535839,
-                  "start": 1435648,
+                  "size": 19511263,
+                  "start": 1460224,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2178,8 +2178,7 @@
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
-              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
+              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
             },
             "devices": {
               "device": {
@@ -2187,7 +2186,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000,
+                  "size": 1048576,
                   "lock": true
                 }
               }
@@ -2204,8 +2203,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839,
+                  "start": 1460224,
+                  "size": 19511263,
                   "lock": true
                 }
               }
@@ -2236,7 +2235,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000
+                  "size": 1048576
                 }
               },
               "boot.efi": {
@@ -2251,8 +2250,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839
+                  "start": 1460224,
+                  "size": 19511263
                 }
               }
             },
diff --git a/test/data/manifests/rhel_85-x86_64-ec2-boot.json b/test/data/manifests/rhel_85-x86_64-ec2-boot.json
index 07f4634ef..ee6e721a5 100644
--- a/test/data/manifests/rhel_85-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-ec2-boot.json
@@ -119,9 +119,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:f72118d72067987ac1eeded4b04e95e709b263c27877f3eb1112859db33cb403"
                   },
@@ -608,9 +605,6 @@
                 "type": "org.osbuild.files",
                 "origin": "org.osbuild.source",
                 "references": [
-                  {
-                    "id": "sha256:ad8cc7be9847717c0cd9b7878d62558817d47c4617f8e63c1d9e0aeb374d211d"
-                  },
                   {
                     "id": "sha256:9d4cee9c7cdbf21fc4f6983ce07105f585310160e31f9a6bb94d3ce4f4ef3513"
                   },
@@ -650,9 +644,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:4d1be1a327a1ef7f0fa6a0005f32b962d446597febebae80b21d8f8f1355a8aa"
                   },
@@ -761,9 +752,6 @@
                   {
                     "id": "sha256:e74ce9c11ed27caf661d6fdd5c35234f912309c39da3c6288a017b0a6f3bccc0"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:f72118d72067987ac1eeded4b04e95e709b263c27877f3eb1112859db33cb403"
                   },
@@ -785,15 +773,6 @@
                   {
                     "id": "sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:1291973fb1c479d3d3dab62d7dbcda052ab998779a0eb2e45427d0e2257d8db4"
                   },
@@ -830,9 +809,6 @@
                   {
                     "id": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
                   },
-                  {
-                    "id": "sha256:71ccc266b2790fd64b8f94793b17dfe94f0ec16396441e5364843e25ddfd9c7a"
-                  },
                   {
                     "id": "sha256:affab770e241d6c70cb271cbe5f84d02a946ad1b4d17d36f74dab74e9ca8fd7f"
                   },
@@ -890,9 +866,6 @@
                   {
                     "id": "sha256:1136323a37c5940055c3891a260b26782b75ea986fb5fe02ad80364f60527450"
                   },
-                  {
-                    "id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
-                  },
                   {
                     "id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
                   },
@@ -1070,9 +1043,6 @@
                   {
                     "id": "sha256:eb3732b52b805b28192463682e961408db8c6449bb27e733081cff62e77194b3"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:316b614d8b97e93f56a77b035245ada4dbaa8718828f943fe43038330b47726d"
                   },
@@ -1085,12 +1055,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:4a62975251933dcaff77fdbd7704e8a12bea0ecb6eaaae5ea5e552bedd6788ec"
                   },
@@ -1109,9 +1073,6 @@
                   {
                     "id": "sha256:8548b32627ba574a7eaf108af37b0dd302049c8c4a2ff8537a5f53260ad2f07c"
                   },
-                  {
-                    "id": "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a"
-                  },
                   {
                     "id": "sha256:9c5594fcac97c0f8813d7a188e2368e3b1095025fc4a0ecbd5d17e54c0c93f97"
                   },
@@ -1157,9 +1118,6 @@
                   {
                     "id": "sha256:df169d238e43e575b61b9eb02a392d9c2c75fe6b0bb678f8d8ca27e169347372"
                   },
-                  {
-                    "id": "sha256:3ad80bb77d17e36bb6127b8552ffa93085321bca2c63e1b12db6136d5d7fee9f"
-                  },
                   {
                     "id": "sha256:507442831068c749ba21b22bd96993a1a2a6c74dd53c55f34c7f81a21554c82d"
                   },
@@ -1196,9 +1154,6 @@
                   {
                     "id": "sha256:289066d1ee27ccac6bec18d021f843c8962ead4b4c940d579bfc429d5583006e"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:66d7caeabd800bbe2f34163fc4605f5762a6ffc3af94bc275acbfac0b56d66c7"
                   },
@@ -1274,9 +1229,6 @@
                   {
                     "id": "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:018409b1eda8be48a11a5b76b95e82ff1d9002569e0644291532d8424dc31edf"
                   },
@@ -1310,18 +1262,12 @@
                   {
                     "id": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
                   },
-                  {
-                    "id": "sha256:3a040b80f585f55f86b600520949cf321c8c365158dfad55533f22f9bf366050"
-                  },
                   {
                     "id": "sha256:55a58ea1e63e2cc102d82ab4d02e04e90e2c03819b2a2dee74395905868eb5fd"
                   },
                   {
                     "id": "sha256:75027c5ff5527fe7b69e3de665aa44cca6e0ee65094600f88c1fc5e6c6a1037a"
                   },
-                  {
-                    "id": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1640,9 +1586,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -1769,36 +1712,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:c0309fbbf048d250de039aca136cc055bfa33faf2056803e18c48a3eba498c2f"
-                  },
-                  {
-                    "id": "sha256:fcaaef0ebc48422e70617c5cdcbe441580b790af9c5647c5b255b35957ec7311"
-                  },
-                  {
-                    "id": "sha256:ca2d9db71ecd56e0c406278bbed639962c27ed01e8206f144719df5c32f9aeb7"
-                  },
-                  {
-                    "id": "sha256:f114254f9dadd3dbedf108ab8d81bbb247d8eb19f9d018454a7c01d919a65c44"
-                  },
-                  {
-                    "id": "sha256:9dfef9a2900c658a3379ad843127609d4cbde7718f4f5b223f207288a978254a"
-                  },
-                  {
-                    "id": "sha256:8b05d986058c83b2041499ed8d1466073bd492319db781a50f8c5f2b9bbe447e"
-                  },
-                  {
-                    "id": "sha256:633e83df6ccdd33642cf71fb84456bb036398919ae21c36217bac19231783996"
-                  },
-                  {
-                    "id": "sha256:db515162530e2c50f9e271c33a4f3852bc92c57b2ec1aa1f7117a3d5f01dd467"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:bfe5c8ea12012936cc59981a10728e95d5fdadd3e893457af7a27c464d8cb6ba"
                   },
@@ -1808,30 +1721,9 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:2d7bb5cff7b7f741621d92e12e56d3a32143fee999ab96d4ce4b148bcb387a70"
-                  },
                   {
                     "id": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
                   },
-                  {
-                    "id": "sha256:52aed1bbd2aa4041e599a453a9c4323775b26d2b1326ffb98ac6febbcab8c230"
-                  },
-                  {
-                    "id": "sha256:17b847a40817f2d3daead8c90aa4345c81964ca599c95abf02fbf91f7cd56612"
-                  },
-                  {
-                    "id": "sha256:594828a378b02e5cc08a4928382b54ec2b909098ae5bc084118e07bda873e6a4"
-                  },
-                  {
-                    "id": "sha256:308ba0bc3f5d96ace7ec3387e5d9ed43ea3c1a3c3a5c01fce93b3cafb9d8015d"
-                  },
-                  {
-                    "id": "sha256:df17a51144931d9350a2fc41e328969ab2f88fbcf5542c0b752e63c35c7630f1"
-                  },
-                  {
-                    "id": "sha256:9649b49d9992f28fc1e4f5eb95e31e24ba2a126e3192320d36e6e779c624fc6f"
-                  },
                   {
                     "id": "sha256:0e0f05c3d39f4b3eee6a5786a6aea4c7ef5f5921bc6146489d1f97aa602f7d6d"
                   },
@@ -1877,15 +1769,9 @@
                   {
                     "id": "sha256:c7b4850fa0c575c67d7a4a90dd78045c0de7b29045e9710d0a90dc7f028336d2"
                   },
-                  {
-                    "id": "sha256:d035722edaf14562b258e0a04aa5a68cff61c23af893c270497a66d74b579b3f"
-                  },
                   {
                     "id": "sha256:e920a82cda55b110690f3c946ec2cd85f969599c71212463279763afcc33303d"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -1905,9 +1791,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2088,23 +1972,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2112,13 +1983,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2183,20 +2050,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2212,45 +2067,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2258,8 +2078,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2285,28 +2105,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2316,18 +2120,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2345,8 +2137,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -2472,9 +2264,6 @@
           "sha256:176cd5cb58307c4a89ed986dbbcb765f306c08da3fa3fe2cb7b3e80076a3d7a9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/sudo-1.8.29-7.el8.x86_64.rpm"
           },
-          "sha256:17b847a40817f2d3daead8c90aa4345c81964ca599c95abf02fbf91f7cd56612": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nss-3.67.0-6.el8_4.x86_64.rpm"
-          },
           "sha256:17bf6351961fba4a5b5df923dcc4de54b5f8059a36f0d6a9f6b446a4e9b018e4": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-libcomps-0.1.16-2.el8.x86_64.rpm"
           },
@@ -2508,9 +2297,6 @@
           "sha256:1d47e465939bba5bcf9c37be2516e60d6c9449ccee70a54a6133df989ac8b1f5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libksba-1.3.5-7.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -2535,9 +2321,6 @@
           "sha256:206de21c82d76de550bcc1959138472640b0a950a311b753203f5dfe5b201b7b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/ipcalc-0.2.4-4.el8.x86_64.rpm"
           },
-          "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libmbim-1.20.2-1.el8.x86_64.rpm"
-          },
           "sha256:20b51fff03d35f8412666717e3e715642bc0d1e32fb847fd626ad82d75d47891": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dracut-config-rescue-049-191.git20210920.el8.x86_64.rpm"
           },
@@ -2610,9 +2393,6 @@
           "sha256:2bf6a5835ee856272ad37abc4f695536a157f4c51dcf5621bfcf323d22d091bc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-librepo-1.14.0-2.el8.x86_64.rpm"
           },
-          "sha256:2d7bb5cff7b7f741621d92e12e56d3a32143fee999ab96d4ce4b148bcb387a70": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libudisks2-2.9.0-7.el8.x86_64.rpm"
-          },
           "sha256:2e175740ba876aa621422ed4971794320cde1115b01ff018de7ff8186e271e48": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/authselect-1.2.2-3.el8.x86_64.rpm"
           },
@@ -2631,18 +2411,6 @@
           "sha256:30028d0e27f207b39028942487bc15d3607db39296f294c51e43204b74bc54bf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/elfutils-libelf-0.185-1.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
-          "sha256:308ba0bc3f5d96ace7ec3387e5d9ed43ea3c1a3c3a5c01fce93b3cafb9d8015d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nss-softokn-freebl-3.67.0-6.el8_4.x86_64.rpm"
-          },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:316b614d8b97e93f56a77b035245ada4dbaa8718828f943fe43038330b47726d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgcc-8.5.0-3.el8.x86_64.rpm"
           },
@@ -2691,9 +2459,6 @@
           "sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/e2fsprogs-libs-1.45.6-2.el8.x86_64.rpm"
           },
-          "sha256:3a040b80f585f55f86b600520949cf321c8c365158dfad55533f22f9bf366050": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/mdadm-4.2-rc2.el8.x86_64.rpm"
-          },
           "sha256:3a1058c6ba468722090a74002a3239161771b0d8b444975bff891afd45bb672a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsysfs-2.1.0-24.el8.x86_64.rpm"
           },
@@ -2703,12 +2468,6 @@
           "sha256:3a9aede6732c73278d74c413ad9559c1ccf0c0bbdfd1b61734cf984e75d20367": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-configobj-5.0.6-11.el8.noarch.rpm"
           },
-          "sha256:3ad80bb77d17e36bb6127b8552ffa93085321bca2c63e1b12db6136d5d7fee9f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libqmi-1.24.0-3.el8.x86_64.rpm"
-          },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3ded289944ae1be6daded7105456bcb8508f155cc7fd2807e546b2fe32f9b002": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/python3-unbound-1.7.3-17.el8.x86_64.rpm"
           },
@@ -2754,9 +2513,6 @@
           "sha256:47a81f0a9e0c5b33095964e0591d958a0ebfaf797c6890c624affd04dff04132": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dmidecode-3.2-10.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:49b6b2a486bd32714619e81782623f126486452bbd2295a2ab1f3e997b97d327": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/crontabs-1.11-17.20190603git.el8.noarch.rpm"
           },
@@ -2829,9 +2585,6 @@
           "sha256:51eb082082e78afa70dd64591219c026d11cf7a6adf3771a36624c80be34dc3e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/nettle-3.4.1-7.el8.x86_64.rpm"
           },
-          "sha256:52aed1bbd2aa4041e599a453a9c4323775b26d2b1326ffb98ac6febbcab8c230": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nspr-4.32.0-1.el8_4.x86_64.rpm"
-          },
           "sha256:53849d779914a944acc126459911030c8ac8310ffcab354c6a7bcc4ef4af5bab": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/e2fsprogs-1.45.6-2.el8.x86_64.rpm"
           },
@@ -2862,9 +2615,6 @@
           "sha256:58d5f26daf746cf161e1be4fb6cda4e320ef2a624f0ab7913ee498b26aad8659": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-cryptography-3.2.1-5.el8.x86_64.rpm"
           },
-          "sha256:594828a378b02e5cc08a4928382b54ec2b909098ae5bc084118e07bda873e6a4": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nss-softokn-3.67.0-6.el8_4.x86_64.rpm"
-          },
           "sha256:59bf7b92f9eecb7868e960dc05c269a9df088d2dc71ce85cf77bfad68e206f0b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/python3-jsonschema-2.6.0-4.el8.noarch.rpm"
           },
@@ -2907,9 +2657,6 @@
           "sha256:633b4eb78ff5fa0e9d7ae07a21fda93786d495ba4ee0f74f937051e3521511c2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/systemd-239-51.el8.x86_64.rpm"
           },
-          "sha256:633e83df6ccdd33642cf71fb84456bb036398919ae21c36217bac19231783996": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-swap-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:645419874806713b904eed22d9e7dd2ba076452c733f47822d0c05723311a951": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/sqlite-libs-3.26.0-15.el8.x86_64.rpm"
           },
@@ -2952,12 +2699,6 @@
           "sha256:6ff975465dcff2d8b7f6f1efb8c865aff9baed1500e8f48e4a569700fb1208ea": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/p11-kit-trust-0.23.22-1.el8.x86_64.rpm"
           },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
-          "sha256:71ccc266b2790fd64b8f94793b17dfe94f0ec16396441e5364843e25ddfd9c7a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/fwupd-1.5.9-1.el8.x86_64.rpm"
-          },
           "sha256:71cd412b54e9ae8e7718fa3827d8c92be5aad32a85e65e6250e0bd4008b53f7b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libbpf-0.4.0-1.el8.x86_64.rpm"
           },
@@ -3054,12 +2795,6 @@
           "sha256:88783ea87d17ed7173aefeb0145e009220bb3050bbadda04cc00964f5d92820d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/shadow-utils-4.6-14.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
-          "sha256:8b05d986058c83b2041499ed8d1466073bd492319db781a50f8c5f2b9bbe447e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-part-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:8bc50d11af9a2696049cad3081e2efd78443640fd855ce8d4a9f2a5194c892bb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/iproute-5.12.0-4.el8.x86_64.rpm"
           },
@@ -3069,9 +2804,6 @@
           "sha256:8c6da26441750b3970fe73b6a9d2d780931da6cdea48f10d0b34c65c79a9e341": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/python3-jinja2-2.10.1-3.el8.noarch.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8d371e753071edc796d2eadb8278980290511be6279fdf46649c81b859497d6a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/prefixdevname-0.1.0-6.el8.x86_64.rpm"
           },
@@ -3132,9 +2864,6 @@
           "sha256:964666dd7642680923e1d188a807119c15bdc4b8a2d9980b6d927e0665626030": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/systemd-pam-239-51.el8.x86_64.rpm"
           },
-          "sha256:9649b49d9992f28fc1e4f5eb95e31e24ba2a126e3192320d36e6e779c624fc6f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nss-util-3.67.0-6.el8_4.x86_64.rpm"
-          },
           "sha256:9684e567554899e75aa51d3e63b04137cdb4fe84f93dbb4900b906a6dca901b5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-libdnf-0.63.0-3.el8.x86_64.rpm"
           },
@@ -3159,9 +2888,6 @@
           "sha256:9a9ca6857f517f1249d2eb496fe904590d6203e4a9547a28e0b23f21c4cae24a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/polkit-pkla-compat-0.1-12.el8.x86_64.rpm"
           },
-          "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/mokutil-0.3.0-11.el8.x86_64.rpm"
-          },
           "sha256:9c5594fcac97c0f8813d7a188e2368e3b1095025fc4a0ecbd5d17e54c0c93f97": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libmnl-1.0.4-6.el8.x86_64.rpm"
           },
@@ -3174,9 +2900,6 @@
           "sha256:9d4cee9c7cdbf21fc4f6983ce07105f585310160e31f9a6bb94d3ce4f4ef3513": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/NetworkManager-1.32.10-4.el8.x86_64.rpm"
           },
-          "sha256:9dfef9a2900c658a3379ad843127609d4cbde7718f4f5b223f207288a978254a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-mdraid-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:9ead0dee2906b44ee3b05f2e57f387af91e3cdd9ad13ac52e1a5334214691068": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dhcp-client-4.3.6-45.el8.x86_64.rpm"
           },
@@ -3228,18 +2951,9 @@
           "sha256:ad060f60303b6764e08657436147cc24cfc4bb1ccc1431796407ba005a7bcec0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/rootfiles-8.1-22.el8.noarch.rpm"
           },
-          "sha256:ad8cc7be9847717c0cd9b7878d62558817d47c4617f8e63c1d9e0aeb374d211d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/ModemManager-glib-1.10.8-4.el8.x86_64.rpm"
-          },
           "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libxml2-2.9.7-9.el8_4.2.x86_64.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:afb34faa32b75d1c9c1d9c729bd27616c0fd1965a7fca433c56c318bf061df99": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/chrony-4.1-1.el8.x86_64.rpm"
           },
@@ -3285,9 +2999,6 @@
           "sha256:b9d0a4c0e16db4c05b2d0690216d8c5da2db7d67bc765a00ce2a32c5f810c245": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/pkgconf-1.4.2-1.el8.x86_64.rpm"
           },
-          "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm"
-          },
           "sha256:ba59500c8304ec75121cc2c5f9d5917748ff8b293aca3b49c9d1d971feb606f4": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/file-5.33-20.el8.x86_64.rpm"
           },
@@ -3309,9 +3020,6 @@
           "sha256:bfe5c8ea12012936cc59981a10728e95d5fdadd3e893457af7a27c464d8cb6ba": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libestr-0.1.10-1.el8.x86_64.rpm"
           },
-          "sha256:c0309fbbf048d250de039aca136cc055bfa33faf2056803e18c48a3eba498c2f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:c09618fd3dbb6f65f043e481b6e20cae06564bf452681723cab4a2d3b8dc407a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsss_nss_idmap-2.5.2-2.el8.x86_64.rpm"
           },
@@ -3345,9 +3053,6 @@
           "sha256:c4e93daa6d0f0648f4dc694400bd35b8bc01a0d98228054735a9b6bc4c35b920": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/irqbalance-1.4.0-6.el8.x86_64.rpm"
           },
-          "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm"
-          },
           "sha256:c60aede8488f68a001f3495bd6e6d894fc3a44bb488f4550b5970ab5904d0a1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/geolite2-country-20180605-1.el8.noarch.rpm"
           },
@@ -3366,9 +3071,6 @@
           "sha256:c8ee06469228d9321b19061dc6e7f1db48858563b8994224cdcb160f8ca3cedb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/sssd-client-2.5.2-2.el8.x86_64.rpm"
           },
-          "sha256:ca2d9db71ecd56e0c406278bbed639962c27ed01e8206f144719df5c32f9aeb7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-fs-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:ca33ff1cbcd000cf8d7fb1d0e3a18dd9a2e61f321dbe1f83c7242e9684d34818": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libstdc++-8.5.0-3.el8.x86_64.rpm"
           },
@@ -3405,9 +3107,6 @@
           "sha256:d0188d22323619c9069c2de6f85ebe5302c76fde5f52ebd148988e75a75110dc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsigsegv-2.11-5.el8.x86_64.rpm"
           },
-          "sha256:d035722edaf14562b258e0a04aa5a68cff61c23af893c270497a66d74b579b3f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/udisks2-2.9.0-7.el8.x86_64.rpm"
-          },
           "sha256:d05f658981f3152e680010227c9c1e4e74857306ba883b0ddd68ac79fb0cbffe": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-tools-minimal-2.02-106.el8.x86_64.rpm"
           },
@@ -3447,9 +3146,6 @@
           "sha256:d50174632033170dfd1d8125f132962872c0042711e44ed59e91f6d2d26071c0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/polkit-libs-0.115-12.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d53449962dcd9266bab6c0af921875051ccc9fb752f3061f7bd66584824431ec": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/sssd-nfs-idmap-2.5.2-2.el8.x86_64.rpm"
           },
@@ -3483,9 +3179,6 @@
           "sha256:daa11530884eae9f2ffdb112e99c2c7817ba4802a87b35a959d50bf5774126a1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-tools-extra-2.02-106.el8.x86_64.rpm"
           },
-          "sha256:db515162530e2c50f9e271c33a4f3852bc92c57b2ec1aa1f7117a3d5f01dd467": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-utils-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:db8bc154626bdd906a1f50104031a5042bbe91db7f5a1473657795eedd4158c6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-setools-4.3.0-2.el8.x86_64.rpm"
           },
@@ -3501,9 +3194,6 @@
           "sha256:df169d238e43e575b61b9eb02a392d9c2c75fe6b0bb678f8d8ca27e169347372": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libpwquality-1.4.4-3.el8.x86_64.rpm"
           },
-          "sha256:df17a51144931d9350a2fc41e328969ab2f88fbcf5542c0b752e63c35c7630f1": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nss-sysinit-3.67.0-6.el8_4.x86_64.rpm"
-          },
           "sha256:df49ae83611b2533047732fd1975981316d88e8faf35a64914714b97f8c6a662": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/coreutils-common-8.30-12.el8.x86_64.rpm"
           },
@@ -3588,9 +3278,6 @@
           "sha256:f0e3f336e2910f8282c39a5bce21ffa35d6037842d219761ed8c58b4208077cc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/lz4-libs-1.8.3-3.el8_4.x86_64.rpm"
           },
-          "sha256:f114254f9dadd3dbedf108ab8d81bbb247d8eb19f9d018454a7c01d919a65c44": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-loop-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:f1784b0b9221581d9beac947a7a43cc9f4839ede18f38a0274461185788792a9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-ply-3.9-9.el8.noarch.rpm"
           },
@@ -3642,12 +3329,6 @@
           "sha256:fa38da11fac69d66c239bdd5b723d550a570861e3f8a8187f105828fbdcca4a7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/cyrus-sasl-lib-2.1.27-5.el8.x86_64.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
-          "sha256:fcaaef0ebc48422e70617c5cdcbe441580b790af9c5647c5b255b35957ec7311": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-crypto-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:fd1f3109bd130e2dbbb57ea2f3a6d3419f9eef7108f1485f0d1386a563437614": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/gnutls-3.6.16-4.el8.x86_64.rpm"
           },
@@ -3915,15 +3596,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5285,15 +4957,6 @@
       }
     ],
     "os": [
-      {
-        "name": "ModemManager-glib",
-        "epoch": 0,
-        "version": "1.10.8",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/ModemManager-glib-1.10.8-4.el8.x86_64.rpm",
-        "checksum": "sha256:ad8cc7be9847717c0cd9b7878d62558817d47c4617f8e63c1d9e0aeb374d211d"
-      },
       {
         "name": "NetworkManager",
         "epoch": 1,
@@ -5411,15 +5074,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2-libs",
         "epoch": 0,
@@ -5744,15 +5398,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dnf-plugins-core-4.0.21-3.el8.noarch.rpm",
         "checksum": "sha256:e74ce9c11ed27caf661d6fdd5c35234f912309c39da3c6288a017b0a6f3bccc0"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5816,33 +5461,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/e2fsprogs-libs-1.45.6-2.el8.x86_64.rpm",
         "checksum": "sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -5951,15 +5569,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/fuse-libs-2.9.7-12.el8.x86_64.rpm",
         "checksum": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.5.9",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/fwupd-1.5.9-1.el8.x86_64.rpm",
-        "checksum": "sha256:71ccc266b2790fd64b8f94793b17dfe94f0ec16396441e5364843e25ddfd9c7a"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -6131,15 +5740,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-common-2.02-106.el8.noarch.rpm",
         "checksum": "sha256:1136323a37c5940055c3891a260b26782b75ea986fb5fe02ad80364f60527450"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "106.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm",
-        "checksum": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -6671,15 +6271,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libffi-3.1-22.el8.x86_64.rpm",
         "checksum": "sha256:eb3732b52b805b28192463682e961408db8c6449bb27e733081cff62e77194b3"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -6716,24 +6307,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libidn2",
         "epoch": 0,
@@ -6788,15 +6361,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libldb-2.3.0-2.el8.x86_64.rpm",
         "checksum": "sha256:8548b32627ba574a7eaf108af37b0dd302049c8c4a2ff8537a5f53260ad2f07c"
       },
-      {
-        "name": "libmbim",
-        "epoch": 0,
-        "version": "1.20.2",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libmbim-1.20.2-1.el8.x86_64.rpm",
-        "checksum": "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a"
-      },
       {
         "name": "libmnl",
         "epoch": 0,
@@ -6932,15 +6496,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libpwquality-1.4.4-3.el8.x86_64.rpm",
         "checksum": "sha256:df169d238e43e575b61b9eb02a392d9c2c75fe6b0bb678f8d8ca27e169347372"
       },
-      {
-        "name": "libqmi",
-        "epoch": 0,
-        "version": "1.24.0",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libqmi-1.24.0-3.el8.x86_64.rpm",
-        "checksum": "sha256:3ad80bb77d17e36bb6127b8552ffa93085321bca2c63e1b12db6136d5d7fee9f"
-      },
       {
         "name": "libref_array",
         "epoch": 0,
@@ -7049,15 +6604,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsmartcols-2.32.1-28.el8.x86_64.rpm",
         "checksum": "sha256:289066d1ee27ccac6bec18d021f843c8962ead4b4c940d579bfc429d5583006e"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -7283,15 +6829,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libxml2-2.9.7-9.el8_4.2.x86_64.rpm",
         "checksum": "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libyaml",
         "epoch": 0,
@@ -7391,15 +6928,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm",
         "checksum": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.2",
-        "release": "rc2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/mdadm-4.2-rc2.el8.x86_64.rpm",
-        "checksum": "sha256:3a040b80f585f55f86b600520949cf321c8c365158dfad55533f22f9bf366050"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -7418,15 +6946,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/microcode_ctl-20210608-1.el8.x86_64.rpm",
         "checksum": "sha256:75027c5ff5527fe7b69e3de665aa44cca6e0ee65094600f88c1fc5e6c6a1037a"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/mokutil-0.3.0-11.el8.x86_64.rpm",
-        "checksum": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -8381,15 +7900,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.4",
-        "release": "2.el8_1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm",
-        "checksum": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -8768,96 +8278,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:c0309fbbf048d250de039aca136cc055bfa33faf2056803e18c48a3eba498c2f"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-crypto-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:fcaaef0ebc48422e70617c5cdcbe441580b790af9c5647c5b255b35957ec7311"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-fs-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:ca2d9db71ecd56e0c406278bbed639962c27ed01e8206f144719df5c32f9aeb7"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-loop-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:f114254f9dadd3dbedf108ab8d81bbb247d8eb19f9d018454a7c01d919a65c44"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-mdraid-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:9dfef9a2900c658a3379ad843127609d4cbde7718f4f5b223f207288a978254a"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-part-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:8b05d986058c83b2041499ed8d1466073bd492319db781a50f8c5f2b9bbe447e"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-swap-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:633e83df6ccdd33642cf71fb84456bb036398919ae21c36217bac19231783996"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-utils-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:db515162530e2c50f9e271c33a4f3852bc92c57b2ec1aa1f7117a3d5f01dd467"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -8885,15 +8305,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libudisks2-2.9.0-7.el8.x86_64.rpm",
-        "checksum": "sha256:2d7bb5cff7b7f741621d92e12e56d3a32143fee999ab96d4ce4b148bcb387a70"
-      },
       {
         "name": "libxkbcommon",
         "epoch": 0,
@@ -8903,60 +8314,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libxkbcommon-0.9.1-1.el8.x86_64.rpm",
         "checksum": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
       },
-      {
-        "name": "nspr",
-        "epoch": 0,
-        "version": "4.32.0",
-        "release": "1.el8_4",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nspr-4.32.0-1.el8_4.x86_64.rpm",
-        "checksum": "sha256:52aed1bbd2aa4041e599a453a9c4323775b26d2b1326ffb98ac6febbcab8c230"
-      },
-      {
-        "name": "nss",
-        "epoch": 0,
-        "version": "3.67.0",
-        "release": "6.el8_4",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nss-3.67.0-6.el8_4.x86_64.rpm",
-        "checksum": "sha256:17b847a40817f2d3daead8c90aa4345c81964ca599c95abf02fbf91f7cd56612"
-      },
-      {
-        "name": "nss-softokn",
-        "epoch": 0,
-        "version": "3.67.0",
-        "release": "6.el8_4",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nss-softokn-3.67.0-6.el8_4.x86_64.rpm",
-        "checksum": "sha256:594828a378b02e5cc08a4928382b54ec2b909098ae5bc084118e07bda873e6a4"
-      },
-      {
-        "name": "nss-softokn-freebl",
-        "epoch": 0,
-        "version": "3.67.0",
-        "release": "6.el8_4",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nss-softokn-freebl-3.67.0-6.el8_4.x86_64.rpm",
-        "checksum": "sha256:308ba0bc3f5d96ace7ec3387e5d9ed43ea3c1a3c3a5c01fce93b3cafb9d8015d"
-      },
-      {
-        "name": "nss-sysinit",
-        "epoch": 0,
-        "version": "3.67.0",
-        "release": "6.el8_4",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nss-sysinit-3.67.0-6.el8_4.x86_64.rpm",
-        "checksum": "sha256:df17a51144931d9350a2fc41e328969ab2f88fbcf5542c0b752e63c35c7630f1"
-      },
-      {
-        "name": "nss-util",
-        "epoch": 0,
-        "version": "3.67.0",
-        "release": "6.el8_4",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nss-util-3.67.0-6.el8_4.x86_64.rpm",
-        "checksum": "sha256:9649b49d9992f28fc1e4f5eb95e31e24ba2a126e3192320d36e6e779c624fc6f"
-      },
       {
         "name": "oddjob",
         "epoch": 0,
@@ -9092,15 +8449,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/rsyslog-8.2102.0-5.el8.x86_64.rpm",
         "checksum": "sha256:c7b4850fa0c575c67d7a4a90dd78045c0de7b29045e9710d0a90dc7f028336d2"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/udisks2-2.9.0-7.el8.x86_64.rpm",
-        "checksum": "sha256:d035722edaf14562b258e0a04aa5a68cff61c23af893c270497a66d74b579b3f"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -9110,15 +8458,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/unbound-libs-1.7.3-17.el8.x86_64.rpm",
         "checksum": "sha256:e920a82cda55b110690f3c946ec2cd85f969599c71212463279763afcc33303d"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json
index 73d0f217a..1292c0e8c 100644
--- a/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json
@@ -127,9 +127,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:f72118d72067987ac1eeded4b04e95e709b263c27877f3eb1112859db33cb403"
                   },
@@ -617,9 +614,6 @@
                 "type": "org.osbuild.files",
                 "origin": "org.osbuild.source",
                 "references": [
-                  {
-                    "id": "sha256:ad8cc7be9847717c0cd9b7878d62558817d47c4617f8e63c1d9e0aeb374d211d"
-                  },
                   {
                     "id": "sha256:9d4cee9c7cdbf21fc4f6983ce07105f585310160e31f9a6bb94d3ce4f4ef3513"
                   },
@@ -662,9 +656,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:ac5e4942921cee7c931186db79f14c54ddda3d98756e37bd6bb5b0a1024f0e82"
                   },
@@ -797,9 +788,6 @@
                   {
                     "id": "sha256:e74ce9c11ed27caf661d6fdd5c35234f912309c39da3c6288a017b0a6f3bccc0"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:f72118d72067987ac1eeded4b04e95e709b263c27877f3eb1112859db33cb403"
                   },
@@ -821,15 +809,6 @@
                   {
                     "id": "sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:1291973fb1c479d3d3dab62d7dbcda052ab998779a0eb2e45427d0e2257d8db4"
                   },
@@ -869,9 +848,6 @@
                   {
                     "id": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
                   },
-                  {
-                    "id": "sha256:71ccc266b2790fd64b8f94793b17dfe94f0ec16396441e5364843e25ddfd9c7a"
-                  },
                   {
                     "id": "sha256:affab770e241d6c70cb271cbe5f84d02a946ad1b4d17d36f74dab74e9ca8fd7f"
                   },
@@ -929,9 +905,6 @@
                   {
                     "id": "sha256:1136323a37c5940055c3891a260b26782b75ea986fb5fe02ad80364f60527450"
                   },
-                  {
-                    "id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
-                  },
                   {
                     "id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
                   },
@@ -1124,9 +1097,6 @@
                   {
                     "id": "sha256:eb3732b52b805b28192463682e961408db8c6449bb27e733081cff62e77194b3"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:316b614d8b97e93f56a77b035245ada4dbaa8718828f943fe43038330b47726d"
                   },
@@ -1139,12 +1109,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:fe37f767487e0806535a06cda4e302555c27166b6320657ae945d5217b8c36aa"
                   },
@@ -1166,9 +1130,6 @@
                   {
                     "id": "sha256:8548b32627ba574a7eaf108af37b0dd302049c8c4a2ff8537a5f53260ad2f07c"
                   },
-                  {
-                    "id": "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a"
-                  },
                   {
                     "id": "sha256:9c5594fcac97c0f8813d7a188e2368e3b1095025fc4a0ecbd5d17e54c0c93f97"
                   },
@@ -1217,9 +1178,6 @@
                   {
                     "id": "sha256:a506765865ee31210532f16af156f54ea9431ba1763269d3a39c9ebf0adf5163"
                   },
-                  {
-                    "id": "sha256:3ad80bb77d17e36bb6127b8552ffa93085321bca2c63e1b12db6136d5d7fee9f"
-                  },
                   {
                     "id": "sha256:507442831068c749ba21b22bd96993a1a2a6c74dd53c55f34c7f81a21554c82d"
                   },
@@ -1256,9 +1214,6 @@
                   {
                     "id": "sha256:289066d1ee27ccac6bec18d021f843c8962ead4b4c940d579bfc429d5583006e"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:66d7caeabd800bbe2f34163fc4605f5762a6ffc3af94bc275acbfac0b56d66c7"
                   },
@@ -1340,9 +1295,6 @@
                   {
                     "id": "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15"
                   },
@@ -1385,18 +1337,12 @@
                   {
                     "id": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
                   },
-                  {
-                    "id": "sha256:3a040b80f585f55f86b600520949cf321c8c365158dfad55533f22f9bf366050"
-                  },
                   {
                     "id": "sha256:55a58ea1e63e2cc102d82ab4d02e04e90e2c03819b2a2dee74395905868eb5fd"
                   },
                   {
                     "id": "sha256:75027c5ff5527fe7b69e3de665aa44cca6e0ee65094600f88c1fc5e6c6a1037a"
                   },
-                  {
-                    "id": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1850,9 +1796,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -2108,36 +2051,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:c0309fbbf048d250de039aca136cc055bfa33faf2056803e18c48a3eba498c2f"
-                  },
-                  {
-                    "id": "sha256:fcaaef0ebc48422e70617c5cdcbe441580b790af9c5647c5b255b35957ec7311"
-                  },
-                  {
-                    "id": "sha256:ca2d9db71ecd56e0c406278bbed639962c27ed01e8206f144719df5c32f9aeb7"
-                  },
-                  {
-                    "id": "sha256:f114254f9dadd3dbedf108ab8d81bbb247d8eb19f9d018454a7c01d919a65c44"
-                  },
-                  {
-                    "id": "sha256:9dfef9a2900c658a3379ad843127609d4cbde7718f4f5b223f207288a978254a"
-                  },
-                  {
-                    "id": "sha256:8b05d986058c83b2041499ed8d1466073bd492319db781a50f8c5f2b9bbe447e"
-                  },
-                  {
-                    "id": "sha256:633e83df6ccdd33642cf71fb84456bb036398919ae21c36217bac19231783996"
-                  },
-                  {
-                    "id": "sha256:db515162530e2c50f9e271c33a4f3852bc92c57b2ec1aa1f7117a3d5f01dd467"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:bfe5c8ea12012936cc59981a10728e95d5fdadd3e893457af7a27c464d8cb6ba"
                   },
@@ -2147,9 +2060,6 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:2d7bb5cff7b7f741621d92e12e56d3a32143fee999ab96d4ce4b148bcb387a70"
-                  },
                   {
                     "id": "sha256:b1b5660d070a5cf322ecb1c0bf36a8282362f01e0fa4041e11ddbeef1524eef8"
                   },
@@ -2330,15 +2240,9 @@
                   {
                     "id": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
                   },
-                  {
-                    "id": "sha256:d035722edaf14562b258e0a04aa5a68cff61c23af893c270497a66d74b579b3f"
-                  },
                   {
                     "id": "sha256:e920a82cda55b110690f3c946ec2cd85f969599c71212463279763afcc33303d"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -2419,9 +2323,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2602,23 +2504,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2626,13 +2515,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2697,20 +2582,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2726,45 +2599,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2772,8 +2610,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2799,28 +2637,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2830,18 +2652,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2859,8 +2669,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -3085,9 +2895,6 @@
           "sha256:1d47e465939bba5bcf9c37be2516e60d6c9449ccee70a54a6133df989ac8b1f5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libksba-1.3.5-7.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -3118,9 +2925,6 @@
           "sha256:206de21c82d76de550bcc1959138472640b0a950a311b753203f5dfe5b201b7b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/ipcalc-0.2.4-4.el8.x86_64.rpm"
           },
-          "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libmbim-1.20.2-1.el8.x86_64.rpm"
-          },
           "sha256:20b51fff03d35f8412666717e3e715642bc0d1e32fb847fd626ad82d75d47891": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dracut-config-rescue-049-191.git20210920.el8.x86_64.rpm"
           },
@@ -3214,9 +3018,6 @@
           "sha256:2bf6a5835ee856272ad37abc4f695536a157f4c51dcf5621bfcf323d22d091bc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-librepo-1.14.0-2.el8.x86_64.rpm"
           },
-          "sha256:2d7bb5cff7b7f741621d92e12e56d3a32143fee999ab96d4ce4b148bcb387a70": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libudisks2-2.9.0-7.el8.x86_64.rpm"
-          },
           "sha256:2e175740ba876aa621422ed4971794320cde1115b01ff018de7ff8186e271e48": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/authselect-1.2.2-3.el8.x86_64.rpm"
           },
@@ -3238,18 +3039,9 @@
           "sha256:30028d0e27f207b39028942487bc15d3607db39296f294c51e43204b74bc54bf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/elfutils-libelf-0.185-1.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
           "sha256:308ba0bc3f5d96ace7ec3387e5d9ed43ea3c1a3c3a5c01fce93b3cafb9d8015d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/nss-softokn-freebl-3.67.0-6.el8_4.x86_64.rpm"
           },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:316b614d8b97e93f56a77b035245ada4dbaa8718828f943fe43038330b47726d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgcc-8.5.0-3.el8.x86_64.rpm"
           },
@@ -3310,9 +3102,6 @@
           "sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/e2fsprogs-libs-1.45.6-2.el8.x86_64.rpm"
           },
-          "sha256:3a040b80f585f55f86b600520949cf321c8c365158dfad55533f22f9bf366050": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/mdadm-4.2-rc2.el8.x86_64.rpm"
-          },
           "sha256:3a1058c6ba468722090a74002a3239161771b0d8b444975bff891afd45bb672a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsysfs-2.1.0-24.el8.x86_64.rpm"
           },
@@ -3322,15 +3111,9 @@
           "sha256:3a9aede6732c73278d74c413ad9559c1ccf0c0bbdfd1b61734cf984e75d20367": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-configobj-5.0.6-11.el8.noarch.rpm"
           },
-          "sha256:3ad80bb77d17e36bb6127b8552ffa93085321bca2c63e1b12db6136d5d7fee9f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libqmi-1.24.0-3.el8.x86_64.rpm"
-          },
           "sha256:3c3c21bbf64d1a6989e0648c090339b030cd26a72cb39e4eff9f72eca12a39be": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/fence-agents-amt-ws-4.2.1-75.el8.noarch.rpm"
           },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3ded289944ae1be6daded7105456bcb8508f155cc7fd2807e546b2fe32f9b002": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/python3-unbound-1.7.3-17.el8.x86_64.rpm"
           },
@@ -3397,9 +3180,6 @@
           "sha256:47a81f0a9e0c5b33095964e0591d958a0ebfaf797c6890c624affd04dff04132": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dmidecode-3.2-10.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:4811ab95c1d50ef7380e2c5937ae4490f8e28f56cf787c189437d1709e4423fb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/perl-podlators-4.11-1.el8.noarch.rpm"
           },
@@ -3607,9 +3387,6 @@
           "sha256:633b4eb78ff5fa0e9d7ae07a21fda93786d495ba4ee0f74f937051e3521511c2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/systemd-239-51.el8.x86_64.rpm"
           },
-          "sha256:633e83df6ccdd33642cf71fb84456bb036398919ae21c36217bac19231783996": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-swap-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:645419874806713b904eed22d9e7dd2ba076452c733f47822d0c05723311a951": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/sqlite-libs-3.26.0-15.el8.x86_64.rpm"
           },
@@ -3670,15 +3447,9 @@
           "sha256:70cdde0bcaf62a95fcb059756b9c1fffc5b865bd52a8d8cf95f4703eb732397b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/corosynclib-3.1.5-1.el8.x86_64.rpm"
           },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
           "sha256:71690288b8933861b2eb37062725ad9328da431e7f9024951c43d8811ff33104": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/cups-libs-2.2.6-40.el8.x86_64.rpm"
           },
-          "sha256:71ccc266b2790fd64b8f94793b17dfe94f0ec16396441e5364843e25ddfd9c7a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/fwupd-1.5.9-1.el8.x86_64.rpm"
-          },
           "sha256:71cd412b54e9ae8e7718fa3827d8c92be5aad32a85e65e6250e0bd4008b53f7b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libbpf-0.4.0-1.el8.x86_64.rpm"
           },
@@ -3832,12 +3603,6 @@
           "sha256:88783ea87d17ed7173aefeb0145e009220bb3050bbadda04cc00964f5d92820d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/shadow-utils-4.6-14.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
-          "sha256:8b05d986058c83b2041499ed8d1466073bd492319db781a50f8c5f2b9bbe447e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-part-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:8bc50d11af9a2696049cad3081e2efd78443640fd855ce8d4a9f2a5194c892bb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/iproute-5.12.0-4.el8.x86_64.rpm"
           },
@@ -3847,9 +3612,6 @@
           "sha256:8c6da26441750b3970fe73b6a9d2d780931da6cdea48f10d0b34c65c79a9e341": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/python3-jinja2-2.10.1-3.el8.noarch.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8d371e753071edc796d2eadb8278980290511be6279fdf46649c81b859497d6a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/prefixdevname-0.1.0-6.el8.x86_64.rpm"
           },
@@ -3952,9 +3714,6 @@
           "sha256:9a9ca6857f517f1249d2eb496fe904590d6203e4a9547a28e0b23f21c4cae24a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/polkit-pkla-compat-0.1-12.el8.x86_64.rpm"
           },
-          "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/mokutil-0.3.0-11.el8.x86_64.rpm"
-          },
           "sha256:9c5594fcac97c0f8813d7a188e2368e3b1095025fc4a0ecbd5d17e54c0c93f97": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libmnl-1.0.4-6.el8.x86_64.rpm"
           },
@@ -3967,9 +3726,6 @@
           "sha256:9d4cee9c7cdbf21fc4f6983ce07105f585310160e31f9a6bb94d3ce4f4ef3513": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/NetworkManager-1.32.10-4.el8.x86_64.rpm"
           },
-          "sha256:9dfef9a2900c658a3379ad843127609d4cbde7718f4f5b223f207288a978254a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-mdraid-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:9e90e6054da06f5c8c2733c3b66987693a58ddc1f05d95b23ca0a464e26a2b22": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/perl-Digest-1.17-395.el8.noarch.rpm"
           },
@@ -4057,18 +3813,9 @@
           "sha256:ad060f60303b6764e08657436147cc24cfc4bb1ccc1431796407ba005a7bcec0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/rootfiles-8.1-22.el8.noarch.rpm"
           },
-          "sha256:ad8cc7be9847717c0cd9b7878d62558817d47c4617f8e63c1d9e0aeb374d211d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/ModemManager-glib-1.10.8-4.el8.x86_64.rpm"
-          },
           "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libxml2-2.9.7-9.el8_4.2.x86_64.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:af7cf43b6ad25abf824d7540a5bd16bac9c773ffa23d9876e3f5666385a24f02": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/fence-agents-scsi-4.2.1-75.el8.noarch.rpm"
           },
@@ -4138,9 +3885,6 @@
           "sha256:b9d0a4c0e16db4c05b2d0690216d8c5da2db7d67bc765a00ce2a32c5f810c245": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/pkgconf-1.4.2-1.el8.x86_64.rpm"
           },
-          "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm"
-          },
           "sha256:ba28d199a2b71ee55b8a78fc1f6dbc9d487690047a0a5c2d41ff121c5de46f6c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-r8.5-20220504/Packages/libknet1-compress-lzo2-plugin-1.18-2.el8_4.x86_64.rpm"
           },
@@ -4180,9 +3924,6 @@
           "sha256:bfe5c8ea12012936cc59981a10728e95d5fdadd3e893457af7a27c464d8cb6ba": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libestr-0.1.10-1.el8.x86_64.rpm"
           },
-          "sha256:c0309fbbf048d250de039aca136cc055bfa33faf2056803e18c48a3eba498c2f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:c09618fd3dbb6f65f043e481b6e20cae06564bf452681723cab4a2d3b8dc407a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsss_nss_idmap-2.5.2-2.el8.x86_64.rpm"
           },
@@ -4225,9 +3966,6 @@
           "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libxslt-1.1.32-6.el8.x86_64.rpm"
           },
-          "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm"
-          },
           "sha256:c60aede8488f68a001f3495bd6e6d894fc3a44bb488f4550b5970ab5904d0a1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/geolite2-country-20180605-1.el8.noarch.rpm"
           },
@@ -4261,9 +3999,6 @@
           "sha256:c8f68851825d14d3d10270323ae7b33ccddc447e8842f8577107c030cc0a2766": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/rubygem-openssl-2.1.2-107.module+el8.4.0+10822+fe4fffb1.x86_64.rpm"
           },
-          "sha256:ca2d9db71ecd56e0c406278bbed639962c27ed01e8206f144719df5c32f9aeb7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-fs-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:ca33ff1cbcd000cf8d7fb1d0e3a18dd9a2e61f321dbe1f83c7242e9684d34818": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libstdc++-8.5.0-3.el8.x86_64.rpm"
           },
@@ -4312,9 +4047,6 @@
           "sha256:d0188d22323619c9069c2de6f85ebe5302c76fde5f52ebd148988e75a75110dc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsigsegv-2.11-5.el8.x86_64.rpm"
           },
-          "sha256:d035722edaf14562b258e0a04aa5a68cff61c23af893c270497a66d74b579b3f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/udisks2-2.9.0-7.el8.x86_64.rpm"
-          },
           "sha256:d05f658981f3152e680010227c9c1e4e74857306ba883b0ddd68ac79fb0cbffe": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-tools-minimal-2.02-106.el8.x86_64.rpm"
           },
@@ -4360,9 +4092,6 @@
           "sha256:d50174632033170dfd1d8125f132962872c0042711e44ed59e91f6d2d26071c0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/polkit-libs-0.115-12.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d53449962dcd9266bab6c0af921875051ccc9fb752f3061f7bd66584824431ec": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/sssd-nfs-idmap-2.5.2-2.el8.x86_64.rpm"
           },
@@ -4420,9 +4149,6 @@
           "sha256:db1fad3c2d8735e69084bd4b09ea963938e4dde2f2e096dc7a4ce146f18b7ab0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/fontpackages-filesystem-1.44-22.el8.noarch.rpm"
           },
-          "sha256:db515162530e2c50f9e271c33a4f3852bc92c57b2ec1aa1f7117a3d5f01dd467": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-utils-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:db8bc154626bdd906a1f50104031a5042bbe91db7f5a1473657795eedd4158c6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-setools-4.3.0-2.el8.x86_64.rpm"
           },
@@ -4573,9 +4299,6 @@
           "sha256:f0e3f336e2910f8282c39a5bce21ffa35d6037842d219761ed8c58b4208077cc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/lz4-libs-1.8.3-3.el8_4.x86_64.rpm"
           },
-          "sha256:f114254f9dadd3dbedf108ab8d81bbb247d8eb19f9d018454a7c01d919a65c44": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-loop-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:f1784b0b9221581d9beac947a7a43cc9f4839ede18f38a0274461185788792a9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-ply-3.9-9.el8.noarch.rpm"
           },
@@ -4648,12 +4371,6 @@
           "sha256:fc3d96149a838aeea9fbd82cdbac78f83dfe5b21c1a5c0a703abb847fd7b5a2c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/fence-agents-ipdu-4.2.1-75.el8.noarch.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
-          "sha256:fcaaef0ebc48422e70617c5cdcbe441580b790af9c5647c5b255b35957ec7311": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-crypto-2.24-7.el8.x86_64.rpm"
-          },
           "sha256:fd1f3109bd130e2dbbb57ea2f3a6d3419f9eef7108f1485f0d1386a563437614": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/gnutls-3.6.16-4.el8.x86_64.rpm"
           },
@@ -4924,15 +4641,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -6294,15 +6002,6 @@
       }
     ],
     "os": [
-      {
-        "name": "ModemManager-glib",
-        "epoch": 0,
-        "version": "1.10.8",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/ModemManager-glib-1.10.8-4.el8.x86_64.rpm",
-        "checksum": "sha256:ad8cc7be9847717c0cd9b7878d62558817d47c4617f8e63c1d9e0aeb374d211d"
-      },
       {
         "name": "NetworkManager",
         "epoch": 1,
@@ -6429,15 +6128,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2",
         "epoch": 0,
@@ -6834,15 +6524,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dnf-plugins-core-4.0.21-3.el8.noarch.rpm",
         "checksum": "sha256:e74ce9c11ed27caf661d6fdd5c35234f912309c39da3c6288a017b0a6f3bccc0"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -6906,33 +6587,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/e2fsprogs-libs-1.45.6-2.el8.x86_64.rpm",
         "checksum": "sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -7050,15 +6704,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/fuse-libs-2.9.7-12.el8.x86_64.rpm",
         "checksum": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.5.9",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/fwupd-1.5.9-1.el8.x86_64.rpm",
-        "checksum": "sha256:71ccc266b2790fd64b8f94793b17dfe94f0ec16396441e5364843e25ddfd9c7a"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -7230,15 +6875,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-common-2.02-106.el8.noarch.rpm",
         "checksum": "sha256:1136323a37c5940055c3891a260b26782b75ea986fb5fe02ad80364f60527450"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "106.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm",
-        "checksum": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -7815,15 +7451,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libffi-3.1-22.el8.x86_64.rpm",
         "checksum": "sha256:eb3732b52b805b28192463682e961408db8c6449bb27e733081cff62e77194b3"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -7860,24 +7487,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libicu",
         "epoch": 0,
@@ -7941,15 +7550,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libldb-2.3.0-2.el8.x86_64.rpm",
         "checksum": "sha256:8548b32627ba574a7eaf108af37b0dd302049c8c4a2ff8537a5f53260ad2f07c"
       },
-      {
-        "name": "libmbim",
-        "epoch": 0,
-        "version": "1.20.2",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libmbim-1.20.2-1.el8.x86_64.rpm",
-        "checksum": "sha256:208dcd6b67c5d9569f64bcc259b365db3abdd0e786494a50a556dbf65355cd9a"
-      },
       {
         "name": "libmnl",
         "epoch": 0,
@@ -8094,15 +7694,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libqb-1.0.3-12.el8.x86_64.rpm",
         "checksum": "sha256:a506765865ee31210532f16af156f54ea9431ba1763269d3a39c9ebf0adf5163"
       },
-      {
-        "name": "libqmi",
-        "epoch": 0,
-        "version": "1.24.0",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libqmi-1.24.0-3.el8.x86_64.rpm",
-        "checksum": "sha256:3ad80bb77d17e36bb6127b8552ffa93085321bca2c63e1b12db6136d5d7fee9f"
-      },
       {
         "name": "libref_array",
         "epoch": 0,
@@ -8211,15 +7802,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsmartcols-2.32.1-28.el8.x86_64.rpm",
         "checksum": "sha256:289066d1ee27ccac6bec18d021f843c8962ead4b4c940d579bfc429d5583006e"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -8463,15 +8045,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libxml2-2.9.7-9.el8_4.2.x86_64.rpm",
         "checksum": "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libxslt",
         "epoch": 0,
@@ -8598,15 +8171,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm",
         "checksum": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.2",
-        "release": "rc2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/mdadm-4.2-rc2.el8.x86_64.rpm",
-        "checksum": "sha256:3a040b80f585f55f86b600520949cf321c8c365158dfad55533f22f9bf366050"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -8625,15 +8189,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/microcode_ctl-20210608-1.el8.x86_64.rpm",
         "checksum": "sha256:75027c5ff5527fe7b69e3de665aa44cca6e0ee65094600f88c1fc5e6c6a1037a"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/mokutil-0.3.0-11.el8.x86_64.rpm",
-        "checksum": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -9993,15 +9548,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.4",
-        "release": "2.el8_1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm",
-        "checksum": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -10767,96 +10313,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:c0309fbbf048d250de039aca136cc055bfa33faf2056803e18c48a3eba498c2f"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-crypto-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:fcaaef0ebc48422e70617c5cdcbe441580b790af9c5647c5b255b35957ec7311"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-fs-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:ca2d9db71ecd56e0c406278bbed639962c27ed01e8206f144719df5c32f9aeb7"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-loop-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:f114254f9dadd3dbedf108ab8d81bbb247d8eb19f9d018454a7c01d919a65c44"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-mdraid-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:9dfef9a2900c658a3379ad843127609d4cbde7718f4f5b223f207288a978254a"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-part-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:8b05d986058c83b2041499ed8d1466073bd492319db781a50f8c5f2b9bbe447e"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-swap-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:633e83df6ccdd33642cf71fb84456bb036398919ae21c36217bac19231783996"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libblockdev-utils-2.24-7.el8.x86_64.rpm",
-        "checksum": "sha256:db515162530e2c50f9e271c33a4f3852bc92c57b2ec1aa1f7117a3d5f01dd467"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -10884,15 +10340,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/libudisks2-2.9.0-7.el8.x86_64.rpm",
-        "checksum": "sha256:2d7bb5cff7b7f741621d92e12e56d3a32143fee999ab96d4ce4b148bcb387a70"
-      },
       {
         "name": "libwsman1",
         "epoch": 0,
@@ -11433,15 +10880,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/telnet-0.17-76.el8.x86_64.rpm",
         "checksum": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "7.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/udisks2-2.9.0-7.el8.x86_64.rpm",
-        "checksum": "sha256:d035722edaf14562b258e0a04aa5a68cff61c23af893c270497a66d74b579b3f"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -11451,15 +10889,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/unbound-libs-1.7.3-17.el8.x86_64.rpm",
         "checksum": "sha256:e920a82cda55b110690f3c946ec2cd85f969599c71212463279763afcc33303d"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_86-aarch64-ec2-boot.json b/test/data/manifests/rhel_86-aarch64-ec2-boot.json
index f42583bc0..44751f932 100644
--- a/test/data/manifests/rhel_86-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-ec2-boot.json
@@ -2138,14 +2138,14 @@
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
-                  "size": 1024000,
+                  "size": 1048576,
                   "start": 411648,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
+                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 19535839,
-                  "start": 1435648,
+                  "size": 19511263,
+                  "start": 1460224,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2181,8 +2181,7 @@
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
-              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
+              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
             },
             "devices": {
               "device": {
@@ -2190,7 +2189,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000,
+                  "size": 1048576,
                   "lock": true
                 }
               }
@@ -2207,8 +2206,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839,
+                  "start": 1460224,
+                  "size": 19511263,
                   "lock": true
                 }
               }
@@ -2239,7 +2238,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000
+                  "size": 1048576
                 }
               },
               "boot.efi": {
@@ -2254,8 +2253,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839
+                  "start": 1460224,
+                  "size": 19511263
                 }
               }
             },
diff --git a/test/data/manifests/rhel_86-x86_64-ec2-boot.json b/test/data/manifests/rhel_86-x86_64-ec2-boot.json
index d3acd047a..13d4cb2b5 100644
--- a/test/data/manifests/rhel_86-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-ec2-boot.json
@@ -120,9 +120,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:f72118d72067987ac1eeded4b04e95e709b263c27877f3eb1112859db33cb403"
                   },
@@ -651,9 +648,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:4d1be1a327a1ef7f0fa6a0005f32b962d446597febebae80b21d8f8f1355a8aa"
                   },
@@ -762,9 +756,6 @@
                   {
                     "id": "sha256:6670032db2178dacda1bcd490e45a5e69df6f9f39933c4968694ca61229b9255"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:f72118d72067987ac1eeded4b04e95e709b263c27877f3eb1112859db33cb403"
                   },
@@ -786,15 +777,6 @@
                   {
                     "id": "sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:d51fac44d322890f636097d85a8fd0bec3af5cc22d83440a13308b7b7ea5723b"
                   },
@@ -831,9 +813,6 @@
                   {
                     "id": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
                   },
-                  {
-                    "id": "sha256:26e654b600b832d80eb184c0e17846f67e24c220ee5c850176d8ac91f7b08b6d"
-                  },
                   {
                     "id": "sha256:affab770e241d6c70cb271cbe5f84d02a946ad1b4d17d36f74dab74e9ca8fd7f"
                   },
@@ -891,9 +870,6 @@
                   {
                     "id": "sha256:1136323a37c5940055c3891a260b26782b75ea986fb5fe02ad80364f60527450"
                   },
-                  {
-                    "id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
-                  },
                   {
                     "id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
                   },
@@ -1071,9 +1047,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:1f8f65210aeb7df3b8ebeaebab89ce4c9a6d01c8566d7c482ac833f9a5ffc3e2"
                   },
@@ -1086,12 +1059,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:4a62975251933dcaff77fdbd7704e8a12bea0ecb6eaaae5ea5e552bedd6788ec"
                   },
@@ -1191,9 +1158,6 @@
                   {
                     "id": "sha256:ce810948b525e851c88a7c5ba71f8c070d91b84c8531a50dc8ea6650f115b3b5"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:9f9feb77c731a460cba4720ca92e8cbc266c4c2c7ffa22a53b90c2d1ad23dc6c"
                   },
@@ -1269,9 +1233,6 @@
                   {
                     "id": "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:018409b1eda8be48a11a5b76b95e82ff1d9002569e0644291532d8424dc31edf"
                   },
@@ -1305,18 +1266,12 @@
                   {
                     "id": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
                   },
-                  {
-                    "id": "sha256:b6050db00772299f827781e272f3b93f17687d164ded25cf795128567b539032"
-                  },
                   {
                     "id": "sha256:55a58ea1e63e2cc102d82ab4d02e04e90e2c03819b2a2dee74395905868eb5fd"
                   },
                   {
                     "id": "sha256:75027c5ff5527fe7b69e3de665aa44cca6e0ee65094600f88c1fc5e6c6a1037a"
                   },
-                  {
-                    "id": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1437,9 +1392,6 @@
                   {
                     "id": "sha256:49f89e7b459eaa297e518c0e55d81d1b0d8181959346673babb158103422652d"
                   },
-                  {
-                    "id": "sha256:9891bce6c368d49fd189fb184c8a96489ed0d15e8bc58039768854425d8cc6a4"
-                  },
                   {
                     "id": "sha256:e22840ee14aa1993e75fd690749c01dbb7d4419c2b210fef173ff99a76f61ff6"
                   },
@@ -1638,9 +1590,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -1770,36 +1719,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:70e42cbbd3b21cf9e670a3aaadf55105e45ef0a4aa9d4fc021930f441a87d396"
-                  },
-                  {
-                    "id": "sha256:f63ad13c6fc281b01c48fb1e516dfb9540034899aac1aacd81a569016d28940a"
-                  },
-                  {
-                    "id": "sha256:c8192b0eb0496d79d1a3925c1d7eb95abde0d4a4a2c44a86a9a78f8de6dab2d9"
-                  },
-                  {
-                    "id": "sha256:dc28397f174b147917ff788379672663ebe4c89eff4bae329c32c88272d59c45"
-                  },
-                  {
-                    "id": "sha256:0af9f72ce36d8b1c779691db1edc2cbb82ca84e86a2df0608cf753e5f5ee5893"
-                  },
-                  {
-                    "id": "sha256:6907ac56fe2c2e7228077544308620b97ef7a71e9068173eff94c2df84b322ae"
-                  },
-                  {
-                    "id": "sha256:4969e01de0186db1dd8523e81ba82b6a4f43a3b31d253f4cf1b82803bc16699f"
-                  },
-                  {
-                    "id": "sha256:15e42b06b36f9c09a3983aa03eb9f7f7f2b94f7e588eeb8cb943a17a9578ea38"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:bfe5c8ea12012936cc59981a10728e95d5fdadd3e893457af7a27c464d8cb6ba"
                   },
@@ -1809,30 +1728,9 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:1edca93bf9c19054d98f90ed292b8856d88df415a437bef8c29dda787a0a53f8"
-                  },
                   {
                     "id": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
                   },
-                  {
-                    "id": "sha256:52aed1bbd2aa4041e599a453a9c4323775b26d2b1326ffb98ac6febbcab8c230"
-                  },
-                  {
-                    "id": "sha256:83bbe96f5585514ea848a8d33605d52da1c7f32b229a1f6f9fd05f088aa897d2"
-                  },
-                  {
-                    "id": "sha256:1c138f1fa051cad977a6933da79f226f12970c25913d37af69bb86f3fece2850"
-                  },
-                  {
-                    "id": "sha256:84b775933e1b27597d1f12fd5370734f34ba54e97743bf32d7d5e10c922a0bfe"
-                  },
-                  {
-                    "id": "sha256:7ebd6b189663e2ec911e153f2246221737e25978ef88d6b0595a486ca58a31a5"
-                  },
-                  {
-                    "id": "sha256:584b98ef37799bd7395a09a4aa5e046613fef0e9a46bcde32926ba94031ad2cc"
-                  },
                   {
                     "id": "sha256:0e0f05c3d39f4b3eee6a5786a6aea4c7ef5f5921bc6146489d1f97aa602f7d6d"
                   },
@@ -1881,15 +1779,9 @@
                   {
                     "id": "sha256:455427f911eabe523f4b9403bc9da03d916c9615c8367c64efa893bff7548260"
                   },
-                  {
-                    "id": "sha256:0a63475f53acf618c0ef3a35300277923486d778f42edc360f0a4a7824086222"
-                  },
                   {
                     "id": "sha256:e920a82cda55b110690f3c946ec2cd85f969599c71212463279763afcc33303d"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -1909,9 +1801,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2092,23 +1982,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2116,13 +1993,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-361.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2187,20 +2060,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2216,45 +2077,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2262,8 +2088,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2289,28 +2115,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2320,18 +2130,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2349,8 +2147,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -2419,9 +2217,6 @@
           "sha256:0a59c5a145344642e54dd11689ae7dcc76a4229f3e4cbca0c2a17e0b9d5f9606": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-dnf-plugins-core-4.0.21-8.el8.noarch.rpm"
           },
-          "sha256:0a63475f53acf618c0ef3a35300277923486d778f42edc360f0a4a7824086222": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/udisks2-2.9.0-8.el8.x86_64.rpm"
-          },
           "sha256:0a8f049e1b9df452e0fd9977310c53d905dcb84f060ceefd970f7e31e67dee20": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/kernel-modules-4.18.0-361.el8.x86_64.rpm"
           },
@@ -2434,9 +2229,6 @@
           "sha256:0adfa1170d0d43b67de3ca02e7acbd46b811e4efc1aa6da58bb6c6f081d20d50": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dnf-data-4.7.0-5.el8.noarch.rpm"
           },
-          "sha256:0af9f72ce36d8b1c779691db1edc2cbb82ca84e86a2df0608cf753e5f5ee5893": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-mdraid-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:0b4118e4f4aec595982dbb9f4b48999284e9e51dfd45d251d930f1541d8a8020": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/expat-2.2.5-4.el8.x86_64.rpm"
           },
@@ -2488,9 +2280,6 @@
           "sha256:150e9dbb5a19483c85c25c722ff63a08d9411023c40faf88f42843fdf68ea275": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/popt-1.18-1.el8.x86_64.rpm"
           },
-          "sha256:15e42b06b36f9c09a3983aa03eb9f7f7f2b94f7e588eeb8cb943a17a9578ea38": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-utils-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:17c1fcfda1c7367e5bddeafa29193379ce8712958d4b735e2227e7a07950e858": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/iproute-5.15.0-2.el8.x86_64.rpm"
           },
@@ -2518,18 +2307,12 @@
           "sha256:1c040f943aba945547ebd7a060f1df910dca5d65cb353d6c7e7edbb51243d4c0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/lua-libs-5.3.4-12.el8.x86_64.rpm"
           },
-          "sha256:1c138f1fa051cad977a6933da79f226f12970c25913d37af69bb86f3fece2850": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nss-softokn-3.67.0-7.el8_5.x86_64.rpm"
-          },
           "sha256:1c4a8674eafc31d36030f3fd0c081326d4301570d4e35b59d6f6ef1e163f655b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/pkgconf-pkg-config-1.4.2-1.el8.x86_64.rpm"
           },
           "sha256:1d47e465939bba5bcf9c37be2516e60d6c9449ccee70a54a6133df989ac8b1f5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libksba-1.3.5-7.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -2539,9 +2322,6 @@
           "sha256:1ed3940c0466986fa38fe9d3bd5fc6370b5e62edba51f7a8359eab786b4b81ec": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-setuptools-wheel-39.2.0-6.el8.noarch.rpm"
           },
-          "sha256:1edca93bf9c19054d98f90ed292b8856d88df415a437bef8c29dda787a0a53f8": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libudisks2-2.9.0-8.el8.x86_64.rpm"
-          },
           "sha256:1eec9822d1dee41a2e3faae10258858687a63dd6af921937f469399e5e15edd2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/redhat-release-eula-8.6-0.0.el8.x86_64.rpm"
           },
@@ -2596,9 +2376,6 @@
           "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/brotli-1.0.6-3.el8.x86_64.rpm"
           },
-          "sha256:26e654b600b832d80eb184c0e17846f67e24c220ee5c850176d8ac91f7b08b6d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/fwupd-1.7.1-1.el8.x86_64.rpm"
-          },
           "sha256:27067f9c284cd9da72436cc6598e405796e28ace5ed99d22e6b0641c9e711050": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/systemd-239-56.el8.x86_64.rpm"
           },
@@ -2644,15 +2421,6 @@
           "sha256:2f465049e10abac1680ed833f15b565ecdb5f3775a4e3c41510ccfbf4324d44a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-tools-2.02-106.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:32fdd4d597a1b36c710420682f5de6d4c7975f0fab00004460d7e2894916b4cf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/tuned-2.16.0-1.el8.noarch.rpm"
           },
@@ -2704,9 +2472,6 @@
           "sha256:3a9aede6732c73278d74c413ad9559c1ccf0c0bbdfd1b61734cf984e75d20367": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-configobj-5.0.6-11.el8.noarch.rpm"
           },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3ded289944ae1be6daded7105456bcb8508f155cc7fd2807e546b2fe32f9b002": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/python3-unbound-1.7.3-17.el8.x86_64.rpm"
           },
@@ -2764,15 +2529,9 @@
           "sha256:45cc50a8b02f9bbbbe2c8c056f34622d15d383f695916ac07821d688fcab1c25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libzstd-1.4.4-1.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:48e0e5143bf28f7220fc3c31db376c1ef0ed129fd3d2f82e3ce8531528924fd6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dnf-plugin-subscription-manager-1.28.25-1.el8.x86_64.rpm"
           },
-          "sha256:4969e01de0186db1dd8523e81ba82b6a4f43a3b31d253f4cf1b82803bc16699f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-swap-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:49b6b2a486bd32714619e81782623f126486452bbd2295a2ab1f3e997b97d327": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/crontabs-1.11-17.20190603git.el8.noarch.rpm"
           },
@@ -2845,9 +2604,6 @@
           "sha256:51eb082082e78afa70dd64591219c026d11cf7a6adf3771a36624c80be34dc3e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/nettle-3.4.1-7.el8.x86_64.rpm"
           },
-          "sha256:52aed1bbd2aa4041e599a453a9c4323775b26d2b1326ffb98ac6febbcab8c230": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nspr-4.32.0-1.el8_4.x86_64.rpm"
-          },
           "sha256:53849d779914a944acc126459911030c8ac8310ffcab354c6a7bcc4ef4af5bab": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/e2fsprogs-1.45.6-2.el8.x86_64.rpm"
           },
@@ -2869,9 +2625,6 @@
           "sha256:57ec379830cbfb310ae02166b02768a042fb06c888d56bfc89736298187c5ae3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libcurl-7.61.1-22.el8.x86_64.rpm"
           },
-          "sha256:584b98ef37799bd7395a09a4aa5e046613fef0e9a46bcde32926ba94031ad2cc": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nss-util-3.67.0-7.el8_5.x86_64.rpm"
-          },
           "sha256:589fa333c866d9a59bc607ec6c45b7df30c8602c80c16b2aac2c0f916ebed6e7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-decorator-4.2.1-2.el8.noarch.rpm"
           },
@@ -2947,9 +2700,6 @@
           "sha256:689d17a67a9010b48cf8f22ccb14e0723602c0f215b0c3bc5adc25d77619d54b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/selinux-policy-targeted-3.14.3-89.el8.noarch.rpm"
           },
-          "sha256:6907ac56fe2c2e7228077544308620b97ef7a71e9068173eff94c2df84b322ae": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-part-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:6ac86e716545bfde2c56ca9632aa35d211386a94251aecd44749f3998dbe4732": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-magic-5.33-20.el8.noarch.rpm"
           },
@@ -2980,12 +2730,6 @@
           "sha256:70d76d9f1ed43efa346f634d5237c8a533b7e6209c36a9c6f0754afd1ddfc539": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dhcp-common-4.3.6-47.el8.noarch.rpm"
           },
-          "sha256:70e42cbbd3b21cf9e670a3aaadf55105e45ef0a4aa9d4fc021930f441a87d396": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-2.24-8.el8.x86_64.rpm"
-          },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
           "sha256:723963983258ad5c85fc708c519361f4668db7703f8dbfeae6901c1459bd1010": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/bind-export-libs-9.11.36-2.el8.x86_64.rpm"
           },
@@ -3055,9 +2799,6 @@
           "sha256:7eb899e531b473af1148fe749aca852e85667a5ba0ca06e01047cfbb3bb9ae2a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libmount-2.32.1-32.el8.x86_64.rpm"
           },
-          "sha256:7ebd6b189663e2ec911e153f2246221737e25978ef88d6b0595a486ca58a31a5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nss-sysinit-3.67.0-7.el8_5.x86_64.rpm"
-          },
           "sha256:7f6127ebd8edf8e588a29a990eae291eae3dcab05286a29cf224f0fe597b9b1d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libfdisk-2.32.1-32.el8.x86_64.rpm"
           },
@@ -3070,15 +2811,9 @@
           "sha256:82228fd3ceae25d76cf1b9d9aa1e7151120885bbacd1c910a7dc9d628e0e027d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/librepo-1.14.2-1.el8.x86_64.rpm"
           },
-          "sha256:83bbe96f5585514ea848a8d33605d52da1c7f32b229a1f6f9fd05f088aa897d2": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nss-3.67.0-7.el8_5.x86_64.rpm"
-          },
           "sha256:83e568e3bb4f68f552f26dd517df374eaef0b2204205ba78a855607525a96b92": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rhui-3-20220201/Packages/rh-amazon-rhui-client-3.0.45-1.el8.noarch.rpm"
           },
-          "sha256:84b775933e1b27597d1f12fd5370734f34ba54e97743bf32d7d5e10c922a0bfe": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nss-softokn-freebl-3.67.0-7.el8_5.x86_64.rpm"
-          },
           "sha256:862e75a1cf6aa5be750a530c8ce8b999d0b2efe9737e20f37f9f9153a82e56fa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libassuan-2.5.1-3.el8.x86_64.rpm"
           },
@@ -3094,9 +2829,6 @@
           "sha256:88590efc37e205ae9b2048fcfea719157c5a3c7a9b7a650d0b7afb131e479a8b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsemanage-2.9-6.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8b04c8eb33a3af6b22e143b11fc887db47ff188eac5f0a1d80fb99f8a9bf3d44": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libstdc++-8.5.0-10.el8.x86_64.rpm"
           },
@@ -3106,9 +2838,6 @@
           "sha256:8c6da26441750b3970fe73b6a9d2d780931da6cdea48f10d0b34c65c79a9e341": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/python3-jinja2-2.10.1-3.el8.noarch.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8d145155b38c4c12869b95f24bbb0ee49f3ea09978362a4bc9aba2972144c16d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/glibc-gconv-extra-2.28-184.el8.x86_64.rpm"
           },
@@ -3157,9 +2886,6 @@
           "sha256:98030945b250d0149887dacc87655f1d8d01861c1a752236674e588785b78246": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/python3-pip-9.0.3-22.el8.noarch.rpm"
           },
-          "sha256:9891bce6c368d49fd189fb184c8a96489ed0d15e8bc58039768854425d8cc6a4": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/protobuf-c-1.3.0-6.el8.x86_64.rpm"
-          },
           "sha256:98daaa0ba7c4c91b8f0fe4d2e1117d23495f7ec5899dddbc2117f76b7e7550dd": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-hawkey-0.63.0-5.el8.x86_64.rpm"
           },
@@ -3181,9 +2907,6 @@
           "sha256:9a9ca6857f517f1249d2eb496fe904590d6203e4a9547a28e0b23f21c4cae24a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/polkit-pkla-compat-0.1-12.el8.x86_64.rpm"
           },
-          "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/mokutil-0.3.0-11.el8.x86_64.rpm"
-          },
           "sha256:9b1251422cfd498da3569583dea926198827e6e5fcf2a3d3d9c5521401ad0fc9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/redhat-release-8.6-0.0.el8.x86_64.rpm"
           },
@@ -3259,12 +2982,6 @@
           "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxml2-2.9.7-9.el8_4.2.x86_64.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:afb34faa32b75d1c9c1d9c729bd27616c0fd1965a7fca433c56c318bf061df99": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/chrony-4.1-1.el8.x86_64.rpm"
           },
@@ -3301,9 +3018,6 @@
           "sha256:b4babe48d93eccce4f0249ba34d592bfc306c3b14b40df7a5cc9eaec2eaae20f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/numactl-libs-2.0.12-13.el8.x86_64.rpm"
           },
-          "sha256:b6050db00772299f827781e272f3b93f17687d164ded25cf795128567b539032": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/mdadm-4.2-rc3.el8.x86_64.rpm"
-          },
           "sha256:b76f0d3effc681142bb33052acb44a406b9af4ff524658b0ef9b475dbd587975": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/insights-client-3.1.7-1.el8.noarch.rpm"
           },
@@ -3325,9 +3039,6 @@
           "sha256:b9d0a4c0e16db4c05b2d0690216d8c5da2db7d67bc765a00ce2a32c5f810c245": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/pkgconf-1.4.2-1.el8.x86_64.rpm"
           },
-          "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm"
-          },
           "sha256:ba59500c8304ec75121cc2c5f9d5917748ff8b293aca3b49c9d1d971feb606f4": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/file-5.33-20.el8.x86_64.rpm"
           },
@@ -3391,9 +3102,6 @@
           "sha256:c4e93daa6d0f0648f4dc694400bd35b8bc01a0d98228054735a9b6bc4c35b920": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/irqbalance-1.4.0-6.el8.x86_64.rpm"
           },
-          "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm"
-          },
           "sha256:c60aede8488f68a001f3495bd6e6d894fc3a44bb488f4550b5970ab5904d0a1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/geolite2-country-20180605-1.el8.noarch.rpm"
           },
@@ -3403,9 +3111,6 @@
           "sha256:c6c7aa6efa4b965ce11fd74268378a02918b970611d5621e4a1b05af128b3f86": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/platform-python-3.6.8-45.el8.x86_64.rpm"
           },
-          "sha256:c8192b0eb0496d79d1a3925c1d7eb95abde0d4a4a2c44a86a9a78f8de6dab2d9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-fs-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:c8653e199fdea0852a124ed24df2f7b3aa7e0aa6a1258147d89c39692a420c84": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-linux-procfs-0.7.0-1.el8.noarch.rpm"
           },
@@ -3487,9 +3192,6 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d51fac44d322890f636097d85a8fd0bec3af5cc22d83440a13308b7b7ea5723b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/elfutils-debuginfod-client-0.186-1.el8.x86_64.rpm"
           },
@@ -3517,9 +3219,6 @@
           "sha256:dc0e2e71435cc36ddb20b9c5c0a32566d3aad2f18efca3614efc9dd56cf5ed80": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libcomps-0.1.18-1.el8.x86_64.rpm"
           },
-          "sha256:dc28397f174b147917ff788379672663ebe4c89eff4bae329c32c88272d59c45": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-loop-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:dd1590cec04ac5a59f21caf17aa3990aa582cc68a03c2909021a0960244cc0b7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/openssh-clients-8.0p1-13.el8.x86_64.rpm"
           },
@@ -3619,9 +3318,6 @@
           "sha256:f52434c2edd4de318b4dde9eb47941de86f805d096145277eb9a2f31e1ebe315": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/squashfs-tools-4.3-20.el8.x86_64.rpm"
           },
-          "sha256:f63ad13c6fc281b01c48fb1e516dfb9540034899aac1aacd81a569016d28940a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-crypto-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:f72118d72067987ac1eeded4b04e95e709b263c27877f3eb1112859db33cb403": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dracut-049-191.git20210920.el8.x86_64.rpm"
           },
@@ -3649,9 +3345,6 @@
           "sha256:fc13e92624ab175be13398d4501cf5e810e8a4a89983fa59083640689f78d5b1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsss_idmap-2.6.2-3.el8.x86_64.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
           "sha256:fd1f3109bd130e2dbbb57ea2f3a6d3419f9eef7108f1485f0d1386a563437614": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/gnutls-3.6.16-4.el8.x86_64.rpm"
           },
@@ -3919,15 +3612,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5415,15 +5099,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2-libs",
         "epoch": 0,
@@ -5748,15 +5423,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dnf-plugins-core-4.0.21-8.el8.noarch.rpm",
         "checksum": "sha256:6670032db2178dacda1bcd490e45a5e69df6f9f39933c4968694ca61229b9255"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5820,33 +5486,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/e2fsprogs-libs-1.45.6-2.el8.x86_64.rpm",
         "checksum": "sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -5955,15 +5594,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/fuse-libs-2.9.7-12.el8.x86_64.rpm",
         "checksum": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/fwupd-1.7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:26e654b600b832d80eb184c0e17846f67e24c220ee5c850176d8ac91f7b08b6d"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -6135,15 +5765,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-common-2.02-106.el8.noarch.rpm",
         "checksum": "sha256:1136323a37c5940055c3891a260b26782b75ea986fb5fe02ad80364f60527450"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "106.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm",
-        "checksum": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -6675,15 +6296,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -6720,24 +6332,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libidn2",
         "epoch": 0,
@@ -7035,15 +6629,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsmartcols-2.32.1-32.el8.x86_64.rpm",
         "checksum": "sha256:ce810948b525e851c88a7c5ba71f8c070d91b84c8531a50dc8ea6650f115b3b5"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -7269,15 +6854,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxml2-2.9.7-9.el8_4.2.x86_64.rpm",
         "checksum": "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libyaml",
         "epoch": 0,
@@ -7377,15 +6953,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm",
         "checksum": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.2",
-        "release": "rc3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/mdadm-4.2-rc3.el8.x86_64.rpm",
-        "checksum": "sha256:b6050db00772299f827781e272f3b93f17687d164ded25cf795128567b539032"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -7404,15 +6971,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/microcode_ctl-20210608-1.el8.x86_64.rpm",
         "checksum": "sha256:75027c5ff5527fe7b69e3de665aa44cca6e0ee65094600f88c1fc5e6c6a1037a"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/mokutil-0.3.0-11.el8.x86_64.rpm",
-        "checksum": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -7773,15 +7331,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/procps-ng-3.3.15-6.el8.x86_64.rpm",
         "checksum": "sha256:49f89e7b459eaa297e518c0e55d81d1b0d8181959346673babb158103422652d"
       },
-      {
-        "name": "protobuf-c",
-        "epoch": 0,
-        "version": "1.3.0",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/protobuf-c-1.3.0-6.el8.x86_64.rpm",
-        "checksum": "sha256:9891bce6c368d49fd189fb184c8a96489ed0d15e8bc58039768854425d8cc6a4"
-      },
       {
         "name": "psmisc",
         "epoch": 0,
@@ -8376,15 +7925,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.4",
-        "release": "2.el8_1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm",
-        "checksum": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -8772,96 +8312,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:70e42cbbd3b21cf9e670a3aaadf55105e45ef0a4aa9d4fc021930f441a87d396"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-crypto-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:f63ad13c6fc281b01c48fb1e516dfb9540034899aac1aacd81a569016d28940a"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-fs-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:c8192b0eb0496d79d1a3925c1d7eb95abde0d4a4a2c44a86a9a78f8de6dab2d9"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-loop-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:dc28397f174b147917ff788379672663ebe4c89eff4bae329c32c88272d59c45"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-mdraid-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:0af9f72ce36d8b1c779691db1edc2cbb82ca84e86a2df0608cf753e5f5ee5893"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-part-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:6907ac56fe2c2e7228077544308620b97ef7a71e9068173eff94c2df84b322ae"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-swap-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:4969e01de0186db1dd8523e81ba82b6a4f43a3b31d253f4cf1b82803bc16699f"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-utils-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:15e42b06b36f9c09a3983aa03eb9f7f7f2b94f7e588eeb8cb943a17a9578ea38"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -8889,15 +8339,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libudisks2-2.9.0-8.el8.x86_64.rpm",
-        "checksum": "sha256:1edca93bf9c19054d98f90ed292b8856d88df415a437bef8c29dda787a0a53f8"
-      },
       {
         "name": "libxkbcommon",
         "epoch": 0,
@@ -8907,60 +8348,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libxkbcommon-0.9.1-1.el8.x86_64.rpm",
         "checksum": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
       },
-      {
-        "name": "nspr",
-        "epoch": 0,
-        "version": "4.32.0",
-        "release": "1.el8_4",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nspr-4.32.0-1.el8_4.x86_64.rpm",
-        "checksum": "sha256:52aed1bbd2aa4041e599a453a9c4323775b26d2b1326ffb98ac6febbcab8c230"
-      },
-      {
-        "name": "nss",
-        "epoch": 0,
-        "version": "3.67.0",
-        "release": "7.el8_5",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nss-3.67.0-7.el8_5.x86_64.rpm",
-        "checksum": "sha256:83bbe96f5585514ea848a8d33605d52da1c7f32b229a1f6f9fd05f088aa897d2"
-      },
-      {
-        "name": "nss-softokn",
-        "epoch": 0,
-        "version": "3.67.0",
-        "release": "7.el8_5",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nss-softokn-3.67.0-7.el8_5.x86_64.rpm",
-        "checksum": "sha256:1c138f1fa051cad977a6933da79f226f12970c25913d37af69bb86f3fece2850"
-      },
-      {
-        "name": "nss-softokn-freebl",
-        "epoch": 0,
-        "version": "3.67.0",
-        "release": "7.el8_5",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nss-softokn-freebl-3.67.0-7.el8_5.x86_64.rpm",
-        "checksum": "sha256:84b775933e1b27597d1f12fd5370734f34ba54e97743bf32d7d5e10c922a0bfe"
-      },
-      {
-        "name": "nss-sysinit",
-        "epoch": 0,
-        "version": "3.67.0",
-        "release": "7.el8_5",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nss-sysinit-3.67.0-7.el8_5.x86_64.rpm",
-        "checksum": "sha256:7ebd6b189663e2ec911e153f2246221737e25978ef88d6b0595a486ca58a31a5"
-      },
-      {
-        "name": "nss-util",
-        "epoch": 0,
-        "version": "3.67.0",
-        "release": "7.el8_5",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nss-util-3.67.0-7.el8_5.x86_64.rpm",
-        "checksum": "sha256:584b98ef37799bd7395a09a4aa5e046613fef0e9a46bcde32926ba94031ad2cc"
-      },
       {
         "name": "oddjob",
         "epoch": 0,
@@ -9105,15 +8492,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/rsyslog-8.2102.0-7.el8.x86_64.rpm",
         "checksum": "sha256:455427f911eabe523f4b9403bc9da03d916c9615c8367c64efa893bff7548260"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/udisks2-2.9.0-8.el8.x86_64.rpm",
-        "checksum": "sha256:0a63475f53acf618c0ef3a35300277923486d778f42edc360f0a4a7824086222"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -9123,15 +8501,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/unbound-libs-1.7.3-17.el8.x86_64.rpm",
         "checksum": "sha256:e920a82cda55b110690f3c946ec2cd85f969599c71212463279763afcc33303d"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json
index 69edd93f6..9aee7a5a6 100644
--- a/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-ec2_ha-boot.json
@@ -129,9 +129,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:f72118d72067987ac1eeded4b04e95e709b263c27877f3eb1112859db33cb403"
                   },
@@ -664,9 +661,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:ac5e4942921cee7c931186db79f14c54ddda3d98756e37bd6bb5b0a1024f0e82"
                   },
@@ -799,9 +793,6 @@
                   {
                     "id": "sha256:6670032db2178dacda1bcd490e45a5e69df6f9f39933c4968694ca61229b9255"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:f72118d72067987ac1eeded4b04e95e709b263c27877f3eb1112859db33cb403"
                   },
@@ -823,15 +814,6 @@
                   {
                     "id": "sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:d51fac44d322890f636097d85a8fd0bec3af5cc22d83440a13308b7b7ea5723b"
                   },
@@ -871,9 +853,6 @@
                   {
                     "id": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
                   },
-                  {
-                    "id": "sha256:26e654b600b832d80eb184c0e17846f67e24c220ee5c850176d8ac91f7b08b6d"
-                  },
                   {
                     "id": "sha256:affab770e241d6c70cb271cbe5f84d02a946ad1b4d17d36f74dab74e9ca8fd7f"
                   },
@@ -931,9 +910,6 @@
                   {
                     "id": "sha256:1136323a37c5940055c3891a260b26782b75ea986fb5fe02ad80364f60527450"
                   },
-                  {
-                    "id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
-                  },
                   {
                     "id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
                   },
@@ -1126,9 +1102,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:1f8f65210aeb7df3b8ebeaebab89ce4c9a6d01c8566d7c482ac833f9a5ffc3e2"
                   },
@@ -1141,12 +1114,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:fe37f767487e0806535a06cda4e302555c27166b6320657ae945d5217b8c36aa"
                   },
@@ -1252,9 +1219,6 @@
                   {
                     "id": "sha256:ce810948b525e851c88a7c5ba71f8c070d91b84c8531a50dc8ea6650f115b3b5"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:9f9feb77c731a460cba4720ca92e8cbc266c4c2c7ffa22a53b90c2d1ad23dc6c"
                   },
@@ -1336,9 +1300,6 @@
                   {
                     "id": "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15"
                   },
@@ -1381,18 +1342,12 @@
                   {
                     "id": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
                   },
-                  {
-                    "id": "sha256:b6050db00772299f827781e272f3b93f17687d164ded25cf795128567b539032"
-                  },
                   {
                     "id": "sha256:55a58ea1e63e2cc102d82ab4d02e04e90e2c03819b2a2dee74395905868eb5fd"
                   },
                   {
                     "id": "sha256:75027c5ff5527fe7b69e3de665aa44cca6e0ee65094600f88c1fc5e6c6a1037a"
                   },
-                  {
-                    "id": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1621,9 +1576,6 @@
                   {
                     "id": "sha256:49f89e7b459eaa297e518c0e55d81d1b0d8181959346673babb158103422652d"
                   },
-                  {
-                    "id": "sha256:9891bce6c368d49fd189fb184c8a96489ed0d15e8bc58039768854425d8cc6a4"
-                  },
                   {
                     "id": "sha256:e22840ee14aa1993e75fd690749c01dbb7d4419c2b210fef173ff99a76f61ff6"
                   },
@@ -1849,9 +1801,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -2110,36 +2059,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:70e42cbbd3b21cf9e670a3aaadf55105e45ef0a4aa9d4fc021930f441a87d396"
-                  },
-                  {
-                    "id": "sha256:f63ad13c6fc281b01c48fb1e516dfb9540034899aac1aacd81a569016d28940a"
-                  },
-                  {
-                    "id": "sha256:c8192b0eb0496d79d1a3925c1d7eb95abde0d4a4a2c44a86a9a78f8de6dab2d9"
-                  },
-                  {
-                    "id": "sha256:dc28397f174b147917ff788379672663ebe4c89eff4bae329c32c88272d59c45"
-                  },
-                  {
-                    "id": "sha256:0af9f72ce36d8b1c779691db1edc2cbb82ca84e86a2df0608cf753e5f5ee5893"
-                  },
-                  {
-                    "id": "sha256:6907ac56fe2c2e7228077544308620b97ef7a71e9068173eff94c2df84b322ae"
-                  },
-                  {
-                    "id": "sha256:4969e01de0186db1dd8523e81ba82b6a4f43a3b31d253f4cf1b82803bc16699f"
-                  },
-                  {
-                    "id": "sha256:15e42b06b36f9c09a3983aa03eb9f7f7f2b94f7e588eeb8cb943a17a9578ea38"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:bfe5c8ea12012936cc59981a10728e95d5fdadd3e893457af7a27c464d8cb6ba"
                   },
@@ -2149,9 +2068,6 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:1edca93bf9c19054d98f90ed292b8856d88df415a437bef8c29dda787a0a53f8"
-                  },
                   {
                     "id": "sha256:b1b5660d070a5cf322ecb1c0bf36a8282362f01e0fa4041e11ddbeef1524eef8"
                   },
@@ -2335,15 +2251,9 @@
                   {
                     "id": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
                   },
-                  {
-                    "id": "sha256:0a63475f53acf618c0ef3a35300277923486d778f42edc360f0a4a7824086222"
-                  },
                   {
                     "id": "sha256:e920a82cda55b110690f3c946ec2cd85f969599c71212463279763afcc33303d"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -2424,9 +2334,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2607,23 +2515,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2631,13 +2526,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-361.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2702,20 +2593,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2731,45 +2610,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2777,8 +2621,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2804,28 +2648,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2835,18 +2663,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2864,8 +2680,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -2946,9 +2762,6 @@
           "sha256:0a59c5a145344642e54dd11689ae7dcc76a4229f3e4cbca0c2a17e0b9d5f9606": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-dnf-plugins-core-4.0.21-8.el8.noarch.rpm"
           },
-          "sha256:0a63475f53acf618c0ef3a35300277923486d778f42edc360f0a4a7824086222": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/udisks2-2.9.0-8.el8.x86_64.rpm"
-          },
           "sha256:0a7e46bae339a5926877f16306a6d4ee106cafa08f54b3eaf0dfa593516ccda3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/fence-agents-vmware-soap-4.2.1-85.el8.noarch.rpm"
           },
@@ -2964,9 +2777,6 @@
           "sha256:0adfa1170d0d43b67de3ca02e7acbd46b811e4efc1aa6da58bb6c6f081d20d50": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dnf-data-4.7.0-5.el8.noarch.rpm"
           },
-          "sha256:0af9f72ce36d8b1c779691db1edc2cbb82ca84e86a2df0608cf753e5f5ee5893": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-mdraid-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:0b4118e4f4aec595982dbb9f4b48999284e9e51dfd45d251d930f1541d8a8020": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/expat-2.2.5-4.el8.x86_64.rpm"
           },
@@ -3042,9 +2852,6 @@
           "sha256:1586c9ed66080454a3664ec618544e4c655d299e76178dd4a8c916e6fe29f93b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/samba-common-4.15.4-0.el8.noarch.rpm"
           },
-          "sha256:15e42b06b36f9c09a3983aa03eb9f7f7f2b94f7e588eeb8cb943a17a9578ea38": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-utils-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:16405e1b13143205cd548df708bdae05683c56e2bef89484317b40112a46f42c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/pacemaker-schemas-2.1.2-4.el8.noarch.rpm"
           },
@@ -3105,9 +2912,6 @@
           "sha256:1d47e465939bba5bcf9c37be2516e60d6c9449ccee70a54a6133df989ac8b1f5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libksba-1.3.5-7.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -3120,9 +2924,6 @@
           "sha256:1ed3940c0466986fa38fe9d3bd5fc6370b5e62edba51f7a8359eab786b4b81ec": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-setuptools-wheel-39.2.0-6.el8.noarch.rpm"
           },
-          "sha256:1edca93bf9c19054d98f90ed292b8856d88df415a437bef8c29dda787a0a53f8": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libudisks2-2.9.0-8.el8.x86_64.rpm"
-          },
           "sha256:1eec9822d1dee41a2e3faae10258858687a63dd6af921937f469399e5e15edd2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/redhat-release-eula-8.6-0.0.el8.x86_64.rpm"
           },
@@ -3198,9 +2999,6 @@
           "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/brotli-1.0.6-3.el8.x86_64.rpm"
           },
-          "sha256:26e654b600b832d80eb184c0e17846f67e24c220ee5c850176d8ac91f7b08b6d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/fwupd-1.7.1-1.el8.x86_64.rpm"
-          },
           "sha256:27067f9c284cd9da72436cc6598e405796e28ace5ed99d22e6b0641c9e711050": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/systemd-239-56.el8.x86_64.rpm"
           },
@@ -3264,15 +3062,6 @@
           "sha256:2f465049e10abac1680ed833f15b565ecdb5f3775a4e3c41510ccfbf4324d44a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-tools-2.02-106.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:32d14d3243c148eb665139c737607f28eb1eea80f0478439a6e09b44dc222562": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/fence-agents-amt-ws-4.2.1-85.el8.noarch.rpm"
           },
@@ -3339,9 +3128,6 @@
           "sha256:3b03c4955dd9cfa1b1aec1378ebb174f9fc93ec587a33b5ab0950fd5fb6b8f8e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/lvm2-libs-2.03.14-3.el8.x86_64.rpm"
           },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3d60bc4a8b2910d391ba3dad97051839ab0219c9a1aaeb114f272d6642edb5c5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-n8.6-20220201/Packages/libknet1-plugins-all-1.22-1.el8.x86_64.rpm"
           },
@@ -3411,9 +3197,6 @@
           "sha256:45cc50a8b02f9bbbbe2c8c056f34622d15d383f695916ac07821d688fcab1c25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libzstd-1.4.4-1.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:4811ab95c1d50ef7380e2c5937ae4490f8e28f56cf787c189437d1709e4423fb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/perl-podlators-4.11-1.el8.noarch.rpm"
           },
@@ -3423,9 +3206,6 @@
           "sha256:48e0e5143bf28f7220fc3c31db376c1ef0ed129fd3d2f82e3ce8531528924fd6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dnf-plugin-subscription-manager-1.28.25-1.el8.x86_64.rpm"
           },
-          "sha256:4969e01de0186db1dd8523e81ba82b6a4f43a3b31d253f4cf1b82803bc16699f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-swap-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:49b6b2a486bd32714619e81782623f126486452bbd2295a2ab1f3e997b97d327": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/crontabs-1.11-17.20190603git.el8.noarch.rpm"
           },
@@ -3645,9 +3425,6 @@
           "sha256:689d17a67a9010b48cf8f22ccb14e0723602c0f215b0c3bc5adc25d77619d54b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/selinux-policy-targeted-3.14.3-89.el8.noarch.rpm"
           },
-          "sha256:6907ac56fe2c2e7228077544308620b97ef7a71e9068173eff94c2df84b322ae": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-part-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:6a1e0d10b570d901d96addafb4bc57d42c44f1989387b7cf44015b0375b7c2c6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/ipmitool-1.8.18-18.el8.x86_64.rpm"
           },
@@ -3693,12 +3470,6 @@
           "sha256:70d76d9f1ed43efa346f634d5237c8a533b7e6209c36a9c6f0754afd1ddfc539": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dhcp-common-4.3.6-47.el8.noarch.rpm"
           },
-          "sha256:70e42cbbd3b21cf9e670a3aaadf55105e45ef0a4aa9d4fc021930f441a87d396": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-2.24-8.el8.x86_64.rpm"
-          },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
           "sha256:723963983258ad5c85fc708c519361f4668db7703f8dbfeae6901c1459bd1010": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/bind-export-libs-9.11.36-2.el8.x86_64.rpm"
           },
@@ -3864,9 +3635,6 @@
           "sha256:89a36dc42a2597af0d3031bba6bc950e2c6c7bc23940249a226c73c63120d4ca": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/rubygem-psych-3.0.2-107.module+el8.5.0+13840+ec418553.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a77b0b6d35a1b0407570e6890b7961d5ed1ce88b3bfd2d5032d66432b4275d9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-n8.6-20220201/Packages/libknet1-crypto-nss-plugin-1.22-1.el8.x86_64.rpm"
           },
@@ -3885,9 +3653,6 @@
           "sha256:8c6da26441750b3970fe73b6a9d2d780931da6cdea48f10d0b34c65c79a9e341": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/python3-jinja2-2.10.1-3.el8.noarch.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8cc4f1625500336caa392a818b7ead0688e98d63f000e0da7274b27b652f78a5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-n8.6-20220201/Packages/libknet1-compress-lz4-plugin-1.22-1.el8.x86_64.rpm"
           },
@@ -3957,9 +3722,6 @@
           "sha256:98030945b250d0149887dacc87655f1d8d01861c1a752236674e588785b78246": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/python3-pip-9.0.3-22.el8.noarch.rpm"
           },
-          "sha256:9891bce6c368d49fd189fb184c8a96489ed0d15e8bc58039768854425d8cc6a4": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/protobuf-c-1.3.0-6.el8.x86_64.rpm"
-          },
           "sha256:98daaa0ba7c4c91b8f0fe4d2e1117d23495f7ec5899dddbc2117f76b7e7550dd": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-hawkey-0.63.0-5.el8.x86_64.rpm"
           },
@@ -3990,9 +3752,6 @@
           "sha256:9aaf89fd8b11bd756d0bc4869f3a07d43755da5c31470f554224949256ffe289": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/fence-agents-mpath-4.2.1-85.el8.noarch.rpm"
           },
-          "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/mokutil-0.3.0-11.el8.x86_64.rpm"
-          },
           "sha256:9b1251422cfd498da3569583dea926198827e6e5fcf2a3d3d9c5521401ad0fc9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/redhat-release-8.6-0.0.el8.x86_64.rpm"
           },
@@ -4107,12 +3866,6 @@
           "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxml2-2.9.7-9.el8_4.2.x86_64.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:afb34faa32b75d1c9c1d9c729bd27616c0fd1965a7fca433c56c318bf061df99": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/chrony-4.1-1.el8.x86_64.rpm"
           },
@@ -4167,9 +3920,6 @@
           "sha256:b50ed1c4095445fbb87d3f3b21abad7ace7fb2cbbac8f38e19b7f1e0caf28b4d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/python3-pexpect-4.3.1-3.el8.noarch.rpm"
           },
-          "sha256:b6050db00772299f827781e272f3b93f17687d164ded25cf795128567b539032": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/mdadm-4.2-rc3.el8.x86_64.rpm"
-          },
           "sha256:b76f0d3effc681142bb33052acb44a406b9af4ff524658b0ef9b475dbd587975": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/insights-client-3.1.7-1.el8.noarch.rpm"
           },
@@ -4194,9 +3944,6 @@
           "sha256:b9d0a4c0e16db4c05b2d0690216d8c5da2db7d67bc765a00ce2a32c5f810c245": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/pkgconf-1.4.2-1.el8.x86_64.rpm"
           },
-          "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm"
-          },
           "sha256:ba59500c8304ec75121cc2c5f9d5917748ff8b293aca3b49c9d1d971feb606f4": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/file-5.33-20.el8.x86_64.rpm"
           },
@@ -4278,9 +4025,6 @@
           "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxslt-1.1.32-6.el8.x86_64.rpm"
           },
-          "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm"
-          },
           "sha256:c60aede8488f68a001f3495bd6e6d894fc3a44bb488f4550b5970ab5904d0a1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/geolite2-country-20180605-1.el8.noarch.rpm"
           },
@@ -4290,9 +4034,6 @@
           "sha256:c6c7aa6efa4b965ce11fd74268378a02918b970611d5621e4a1b05af128b3f86": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/platform-python-3.6.8-45.el8.x86_64.rpm"
           },
-          "sha256:c8192b0eb0496d79d1a3925c1d7eb95abde0d4a4a2c44a86a9a78f8de6dab2d9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-fs-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:c8653e199fdea0852a124ed24df2f7b3aa7e0aa6a1258147d89c39692a420c84": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-linux-procfs-0.7.0-1.el8.noarch.rpm"
           },
@@ -4395,9 +4136,6 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d51fac44d322890f636097d85a8fd0bec3af5cc22d83440a13308b7b7ea5723b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/elfutils-debuginfod-client-0.186-1.el8.x86_64.rpm"
           },
@@ -4455,9 +4193,6 @@
           "sha256:dc1ae7a1011705164487dae39f656665a6b18d8c36cd402bd9328825ba473c2b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/python3-ptyprocess-0.5.2-4.el8.noarch.rpm"
           },
-          "sha256:dc28397f174b147917ff788379672663ebe4c89eff4bae329c32c88272d59c45": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-loop-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:dd1590cec04ac5a59f21caf17aa3990aa582cc68a03c2909021a0960244cc0b7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/openssh-clients-8.0p1-13.el8.x86_64.rpm"
           },
@@ -4602,9 +4337,6 @@
           "sha256:f57fced1d7f6ccbad04c15cb2cc66615a560327eb7b086c0d544e3df4ab79d34": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/rubygem-rdoc-6.0.1.1-107.module+el8.5.0+13840+ec418553.noarch.rpm"
           },
-          "sha256:f63ad13c6fc281b01c48fb1e516dfb9540034899aac1aacd81a569016d28940a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-crypto-2.24-8.el8.x86_64.rpm"
-          },
           "sha256:f69231742cabcba835a55dcfe91b6458ac14531d6afd24ad14fe3c0b2d856c85": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/fence-agents-common-4.2.1-85.el8.noarch.rpm"
           },
@@ -4644,9 +4376,6 @@
           "sha256:fc13e92624ab175be13398d4501cf5e810e8a4a89983fa59083640689f78d5b1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsss_idmap-2.6.2-3.el8.x86_64.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
           "sha256:fccc3b9ebbf072a573ad786070f33dc06d408d435d7c62781bbdb67cd8713ca0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/fence-agents-scsi-4.2.1-85.el8.noarch.rpm"
           },
@@ -4929,15 +4658,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -6434,15 +6154,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2",
         "epoch": 0,
@@ -6839,15 +6550,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dnf-plugins-core-4.0.21-8.el8.noarch.rpm",
         "checksum": "sha256:6670032db2178dacda1bcd490e45a5e69df6f9f39933c4968694ca61229b9255"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -6911,33 +6613,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/e2fsprogs-libs-1.45.6-2.el8.x86_64.rpm",
         "checksum": "sha256:39f86feba904fc4c4a9a04a54576d6d3b4e9af344155aee9e4321c27b4742f0a"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -7055,15 +6730,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/fuse-libs-2.9.7-12.el8.x86_64.rpm",
         "checksum": "sha256:90406300b99022d9a28db65bb1dd9c0e14654e8a2dd5c02f35426b3714a1d042"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/fwupd-1.7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:26e654b600b832d80eb184c0e17846f67e24c220ee5c850176d8ac91f7b08b6d"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -7235,15 +6901,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-common-2.02-106.el8.noarch.rpm",
         "checksum": "sha256:1136323a37c5940055c3891a260b26782b75ea986fb5fe02ad80364f60527450"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "106.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm",
-        "checksum": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -7820,15 +7477,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -7865,24 +7513,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libicu",
         "epoch": 0,
@@ -8198,15 +7828,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsmartcols-2.32.1-32.el8.x86_64.rpm",
         "checksum": "sha256:ce810948b525e851c88a7c5ba71f8c070d91b84c8531a50dc8ea6650f115b3b5"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -8450,15 +8071,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxml2-2.9.7-9.el8_4.2.x86_64.rpm",
         "checksum": "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libxslt",
         "epoch": 0,
@@ -8585,15 +8197,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm",
         "checksum": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.2",
-        "release": "rc3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/mdadm-4.2-rc3.el8.x86_64.rpm",
-        "checksum": "sha256:b6050db00772299f827781e272f3b93f17687d164ded25cf795128567b539032"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -8612,15 +8215,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/microcode_ctl-20210608-1.el8.x86_64.rpm",
         "checksum": "sha256:75027c5ff5527fe7b69e3de665aa44cca6e0ee65094600f88c1fc5e6c6a1037a"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/mokutil-0.3.0-11.el8.x86_64.rpm",
-        "checksum": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -9305,15 +8899,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/procps-ng-3.3.15-6.el8.x86_64.rpm",
         "checksum": "sha256:49f89e7b459eaa297e518c0e55d81d1b0d8181959346673babb158103422652d"
       },
-      {
-        "name": "protobuf-c",
-        "epoch": 0,
-        "version": "1.3.0",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/protobuf-c-1.3.0-6.el8.x86_64.rpm",
-        "checksum": "sha256:9891bce6c368d49fd189fb184c8a96489ed0d15e8bc58039768854425d8cc6a4"
-      },
       {
         "name": "psmisc",
         "epoch": 0,
@@ -9989,15 +9574,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.4",
-        "release": "2.el8_1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm",
-        "checksum": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -10772,96 +10348,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:70e42cbbd3b21cf9e670a3aaadf55105e45ef0a4aa9d4fc021930f441a87d396"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-crypto-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:f63ad13c6fc281b01c48fb1e516dfb9540034899aac1aacd81a569016d28940a"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-fs-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:c8192b0eb0496d79d1a3925c1d7eb95abde0d4a4a2c44a86a9a78f8de6dab2d9"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-loop-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:dc28397f174b147917ff788379672663ebe4c89eff4bae329c32c88272d59c45"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-mdraid-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:0af9f72ce36d8b1c779691db1edc2cbb82ca84e86a2df0608cf753e5f5ee5893"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-part-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:6907ac56fe2c2e7228077544308620b97ef7a71e9068173eff94c2df84b322ae"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-swap-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:4969e01de0186db1dd8523e81ba82b6a4f43a3b31d253f4cf1b82803bc16699f"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libblockdev-utils-2.24-8.el8.x86_64.rpm",
-        "checksum": "sha256:15e42b06b36f9c09a3983aa03eb9f7f7f2b94f7e588eeb8cb943a17a9578ea38"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -10889,15 +10375,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libudisks2-2.9.0-8.el8.x86_64.rpm",
-        "checksum": "sha256:1edca93bf9c19054d98f90ed292b8856d88df415a437bef8c29dda787a0a53f8"
-      },
       {
         "name": "libwsman1",
         "epoch": 0,
@@ -11447,15 +10924,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/telnet-0.17-76.el8.x86_64.rpm",
         "checksum": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "8.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/udisks2-2.9.0-8.el8.x86_64.rpm",
-        "checksum": "sha256:0a63475f53acf618c0ef3a35300277923486d778f42edc360f0a4a7824086222"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -11465,15 +10933,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/unbound-libs-1.7.3-17.el8.x86_64.rpm",
         "checksum": "sha256:e920a82cda55b110690f3c946ec2cd85f969599c71212463279763afcc33303d"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json
index 5a9a7282a..103518080 100644
--- a/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json
@@ -155,9 +155,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:f72118d72067987ac1eeded4b04e95e709b263c27877f3eb1112859db33cb403"
                   },
@@ -726,9 +723,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:ac5e4942921cee7c931186db79f14c54ddda3d98756e37bd6bb5b0a1024f0e82"
                   },
@@ -915,15 +909,6 @@
                   {
                     "id": "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:d51fac44d322890f636097d85a8fd0bec3af5cc22d83440a13308b7b7ea5723b"
                   },
@@ -981,9 +966,6 @@
                   {
                     "id": "sha256:37582049ed88df6e03737825880fee090de4be0e13859b8f055973b6e1828d86"
                   },
-                  {
-                    "id": "sha256:26e654b600b832d80eb184c0e17846f67e24c220ee5c850176d8ac91f7b08b6d"
-                  },
                   {
                     "id": "sha256:affab770e241d6c70cb271cbe5f84d02a946ad1b4d17d36f74dab74e9ca8fd7f"
                   },
@@ -1047,9 +1029,6 @@
                   {
                     "id": "sha256:1136323a37c5940055c3891a260b26782b75ea986fb5fe02ad80364f60527450"
                   },
-                  {
-                    "id": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
-                  },
                   {
                     "id": "sha256:06f6a82e268aa006507fb1f82f01893f996fd47ad1cfa5f839c7861e8fd317cf"
                   },
@@ -1287,9 +1266,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:1f8f65210aeb7df3b8ebeaebab89ce4c9a6d01c8566d7c482ac833f9a5ffc3e2"
                   },
@@ -1446,9 +1422,6 @@
                   {
                     "id": "sha256:0fecd6b03e12a176d1d3508d3cf2ceb5a2c25185bec31d69b294363807478045"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:9f9feb77c731a460cba4720ca92e8cbc266c4c2c7ffa22a53b90c2d1ad23dc6c"
                   },
@@ -1542,9 +1515,6 @@
                   {
                     "id": "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15"
                   },
@@ -1617,9 +1587,6 @@
                   {
                     "id": "sha256:48e1edacae05696360d0dd0706b2d3debb617ae15e9f7ce47e528839231a6c25"
                   },
-                  {
-                    "id": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -2109,9 +2076,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -3110,9 +3074,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -3410,23 +3372,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -3434,13 +3383,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-361.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -3505,20 +3450,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -3534,45 +3467,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -3580,8 +3478,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -3607,28 +3505,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -3638,18 +3520,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -3667,8 +3537,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -4076,9 +3946,6 @@
           "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/brotli-1.0.6-3.el8.x86_64.rpm"
           },
-          "sha256:26e654b600b832d80eb184c0e17846f67e24c220ee5c850176d8ac91f7b08b6d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/fwupd-1.7.1-1.el8.x86_64.rpm"
-          },
           "sha256:27067f9c284cd9da72436cc6598e405796e28ace5ed99d22e6b0641c9e711050": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/systemd-239-56.el8.x86_64.rpm"
           },
@@ -4184,15 +4051,9 @@
           "sha256:2f465049e10abac1680ed833f15b565ecdb5f3775a4e3c41510ccfbf4324d44a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-tools-2.02-106.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
           "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
           },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:3245158fd6bdfeba1ef9f402b5ea509e99e909bddb79e9a283fefa59d6392c67": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/iptables-1.8.4-22.el8.x86_64.rpm"
           },
@@ -4394,9 +4255,6 @@
           "sha256:468b540f98263d7b274c722a7b8f18ac1ab9d88783cfca6561c85e56b36afeee": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/PackageKit-glib-1.1.12-6.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:47d5786c78a2a50f5ce67af5a6fd73665c446ca6c66c75e80d0ad79188753d18": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libibverbs-37.2-1.el8.x86_64.rpm"
           },
@@ -4979,9 +4837,6 @@
           "sha256:89bac8488569b012c198f87a3589b0147bd220ec5e37b7e22b27ef8dbafe1b2a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/setroubleshoot-server-3.3.26-1.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a994138b4d4bbcc5663ba464b85c9a9a0112bf9bad7e1ac3302559b69e7fa55": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/gtk2-2.24.32-5.el8.x86_64.rpm"
           },
@@ -4997,9 +4852,6 @@
           "sha256:8c81bb15456e441250d2ed53b223bf85c21a9b25b6a36ab09953cc831f9e7109": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/tcsh-6.20.00-15.el8.x86_64.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8ca5dd4feea941aba58c6d6e981883bca79704dba06583f880c0bf5e0cf4efcf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/desktop-file-utils-0.23-8.el8.x86_64.rpm"
           },
@@ -5156,9 +5008,6 @@
           "sha256:9a9ca6857f517f1249d2eb496fe904590d6203e4a9547a28e0b23f21c4cae24a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/polkit-pkla-compat-0.1-12.el8.x86_64.rpm"
           },
-          "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/mokutil-0.3.0-11.el8.x86_64.rpm"
-          },
           "sha256:9b079ce20a6524d8e85d139b2ec2a7dd3f4f79fa283f68208b72b8091e6bde3b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libXft-2.3.3-1.el8.x86_64.rpm"
           },
@@ -5336,9 +5185,6 @@
           "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
           },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:af2aab47c6624608df3d8eb9721c78573377a8bfc5843f93a8ff4d9952a41b3c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/ledmon-0.95-1.el8.x86_64.rpm"
           },
@@ -5459,9 +5305,6 @@
           "sha256:b9d0a4c0e16db4c05b2d0690216d8c5da2db7d67bc765a00ce2a32c5f810c245": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/pkgconf-1.4.2-1.el8.x86_64.rpm"
           },
-          "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm"
-          },
           "sha256:ba59500c8304ec75121cc2c5f9d5917748ff8b293aca3b49c9d1d971feb606f4": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/file-5.33-20.el8.x86_64.rpm"
           },
@@ -5573,9 +5416,6 @@
           "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxslt-1.1.32-6.el8.x86_64.rpm"
           },
-          "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm"
-          },
           "sha256:c60aede8488f68a001f3495bd6e6d894fc3a44bb488f4550b5970ab5904d0a1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/geolite2-country-20180605-1.el8.noarch.rpm"
           },
@@ -5735,9 +5575,6 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d51fac44d322890f636097d85a8fd0bec3af5cc22d83440a13308b7b7ea5723b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/elfutils-debuginfod-client-0.186-1.el8.x86_64.rpm"
           },
@@ -6392,15 +6229,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -7996,15 +7824,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2",
         "epoch": 0,
@@ -8563,33 +8382,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/ed-1.14.2-4.el8.x86_64.rpm",
         "checksum": "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -8761,15 +8553,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/fuse3-libs-3.2.1-12.el8.x86_64.rpm",
         "checksum": "sha256:37582049ed88df6e03737825880fee090de4be0e13859b8f055973b6e1828d86"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/fwupd-1.7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:26e654b600b832d80eb184c0e17846f67e24c220ee5c850176d8ac91f7b08b6d"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -8959,15 +8742,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-common-2.02-106.el8.noarch.rpm",
         "checksum": "sha256:1136323a37c5940055c3891a260b26782b75ea986fb5fe02ad80364f60527450"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "106.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/grub2-efi-x64-2.02-106.el8.x86_64.rpm",
-        "checksum": "sha256:b9d57c8cf9df7601855f5e6fbb3f9d7de96721edc8270bedcd32768e4e774aa7"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -9679,15 +9453,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -10156,15 +9921,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsmbclient-4.15.4-0.el8.x86_64.rpm",
         "checksum": "sha256:0fecd6b03e12a176d1d3508d3cf2ceb5a2c25185bec31d69b294363807478045"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -10444,15 +10200,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxml2-2.9.7-9.el8_4.2.x86_64.rpm",
         "checksum": "sha256:aeb381f969689e8b9a07fdf6133cefe69cb46e28a58849682bccd2961da7f90e"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libxslt",
         "epoch": 0,
@@ -10669,15 +10416,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/mlocate-0.26-20.el8.x86_64.rpm",
         "checksum": "sha256:48e1edacae05696360d0dd0706b2d3debb617ae15e9f7ce47e528839231a6c25"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/mokutil-0.3.0-11.el8.x86_64.rpm",
-        "checksum": "sha256:9b0634c2c2cedbd9072b0bc3a05f57b22bf3c7fe25fb414c0d140996ab3a2f59"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -12145,15 +11883,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.4",
-        "release": "2.el8_1",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/shim-x64-15.4-2.el8_1.x86_64.rpm",
-        "checksum": "sha256:c5fb6e950b077770f207e29bb31e408739272058892ba8bf0066a9483575d306"
-      },
       {
         "name": "slang",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_87-aarch64-ec2-boot.json b/test/data/manifests/rhel_87-aarch64-ec2-boot.json
index aa8a8fa6e..b7655d47e 100644
--- a/test/data/manifests/rhel_87-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-ec2-boot.json
@@ -2119,14 +2119,14 @@
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
-                  "size": 1024000,
+                  "size": 1048576,
                   "start": 411648,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
+                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 19535839,
-                  "start": 1435648,
+                  "size": 19511263,
+                  "start": 1460224,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2162,8 +2162,7 @@
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
-              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
+              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
             },
             "devices": {
               "device": {
@@ -2171,7 +2170,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000,
+                  "size": 1048576,
                   "lock": true
                 }
               }
@@ -2188,8 +2187,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839,
+                  "start": 1460224,
+                  "size": 19511263,
                   "lock": true
                 }
               }
@@ -2220,7 +2219,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000
+                  "size": 1048576
                 }
               },
               "boot.efi": {
@@ -2235,8 +2234,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839
+                  "start": 1460224,
+                  "size": 19511263
                 }
               }
             },
diff --git a/test/data/manifests/rhel_87-x86_64-ec2-boot.json b/test/data/manifests/rhel_87-x86_64-ec2-boot.json
index 2a35c9dc0..afa4a341e 100644
--- a/test/data/manifests/rhel_87-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-ec2-boot.json
@@ -120,9 +120,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -645,9 +642,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:4d1be1a327a1ef7f0fa6a0005f32b962d446597febebae80b21d8f8f1355a8aa"
                   },
@@ -756,9 +750,6 @@
                   {
                     "id": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -780,15 +771,6 @@
                   {
                     "id": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:45c47f5146e39f50ca18d1561821607bc582c5fd4de0bf05bc06a5e0eb33df34"
                   },
@@ -825,9 +807,6 @@
                   {
                     "id": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
                   },
-                  {
-                    "id": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-                  },
                   {
                     "id": "sha256:59b3cff57ffbea4c4c011e6a81341a1203c18b91569fff019c93b756331300f8"
                   },
@@ -888,9 +867,6 @@
                   {
                     "id": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
                   },
-                  {
-                    "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-                  },
                   {
                     "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
                   },
@@ -1068,9 +1044,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:7145b8d179b6c72e61de2b822551b343209adb63b76023fe26e7162d4ff6c107"
                   },
@@ -1083,12 +1056,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:4a62975251933dcaff77fdbd7704e8a12bea0ecb6eaaae5ea5e552bedd6788ec"
                   },
@@ -1188,9 +1155,6 @@
                   {
                     "id": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8"
                   },
@@ -1266,9 +1230,6 @@
                   {
                     "id": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:018409b1eda8be48a11a5b76b95e82ff1d9002569e0644291532d8424dc31edf"
                   },
@@ -1302,18 +1263,12 @@
                   {
                     "id": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
                   },
-                  {
-                    "id": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-                  },
                   {
                     "id": "sha256:ca6208d771fbbfc703217b0f4314d214a866da86b105f222753a6efeb12d6f69"
                   },
                   {
                     "id": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
                   },
-                  {
-                    "id": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1632,9 +1587,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -1761,36 +1713,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3"
-                  },
-                  {
-                    "id": "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6"
-                  },
-                  {
-                    "id": "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9"
-                  },
-                  {
-                    "id": "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756"
-                  },
-                  {
-                    "id": "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44"
-                  },
-                  {
-                    "id": "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d"
-                  },
-                  {
-                    "id": "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd"
-                  },
-                  {
-                    "id": "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:d16252dcb91c3e581ecb29234180fb99ac3199a052a89d0e23603cb6054bee16"
                   },
@@ -1800,30 +1722,9 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce"
-                  },
                   {
                     "id": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
                   },
-                  {
-                    "id": "sha256:82cd233003b87e6b810070eead73ec44073050aabccec9a619309074a1868fe9"
-                  },
-                  {
-                    "id": "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a"
-                  },
-                  {
-                    "id": "sha256:319d3d51dfc09875cdbb61518410fe2963887228089d4a9de8f673acc7a2ff82"
-                  },
-                  {
-                    "id": "sha256:4bcbfd3229e3fd2d6e1adfe46bc233872c4184838de40b2e61a9ba84fcb81512"
-                  },
-                  {
-                    "id": "sha256:507c1a196520e4263a0581e70b669c352097d6bdc7a5409ae748ee3942e71f5c"
-                  },
-                  {
-                    "id": "sha256:94d5c3946873b079aa5af985e31501981fef1cb3065024e9f41f70c40fc9b975"
-                  },
                   {
                     "id": "sha256:4f542ac06b9101e66033210648ba4bcc86c23f508a194d3a6ccba2966e4ade73"
                   },
@@ -1875,15 +1776,9 @@
                   {
                     "id": "sha256:37ca74f003d06ada0528d353bdc0df49193a058cece3c51173dc8b9c80f410e5"
                   },
-                  {
-                    "id": "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f"
-                  },
                   {
                     "id": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -1903,9 +1798,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2073,23 +1966,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2097,13 +1977,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-425.3.1.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2168,20 +2044,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2197,45 +2061,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2243,8 +2072,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2270,28 +2099,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2301,18 +2114,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2330,8 +2131,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -2490,9 +2291,6 @@
           "sha256:1d47e465939bba5bcf9c37be2516e60d6c9449ccee70a54a6133df989ac8b1f5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libksba-1.3.5-7.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -2541,9 +2339,6 @@
           "sha256:2733570f8ea94551f3381538f9c8642c88532c800b384c07b4db02f6b8896c3f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libattr-2.4.48-3.el8.x86_64.rpm"
           },
-          "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm"
-          },
           "sha256:283285b4c414c5d0614849e64971730af9d0037e62e535adb538166051e52e1d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libdhash-0.5.0-40.el8.x86_64.rpm"
           },
@@ -2580,24 +2375,12 @@
           "sha256:2ff643bfe17476a8dfa94ea900ddf9d89ed0e5f56839f18209f8304a0e31bb2f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dmidecode-3.3-4.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30c6dbc7d2dd8024a16fe2d00b01fa71f4a1ea9d4af5519dc092695d4fa735cf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libss-1.45.6-5.el8.x86_64.rpm"
           },
           "sha256:30e0334ada8f6453cd8c2335ac40417f636cdae7d7dc744b6d2bff78785013de": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glibc-all-langpacks-2.28-211.el8.x86_64.rpm"
           },
-          "sha256:319d3d51dfc09875cdbb61518410fe2963887228089d4a9de8f673acc7a2ff82": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-softokn-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:3267605bdad55274cd02ce3e656edb83048c740fa709452b3fe6ed98f5f5bbbe": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/rpm-4.14.3-24.el8_6.x86_64.rpm"
           },
@@ -2670,9 +2453,6 @@
           "sha256:3a9aede6732c73278d74c413ad9559c1ccf0c0bbdfd1b61734cf984e75d20367": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-configobj-5.0.6-11.el8.noarch.rpm"
           },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3d6a5eeb0da36ce36cd6ddc5e3c2d2bc36cd5962d1450077c5c5754b8f5ac02c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glib2-2.56.4-159.el8.x86_64.rpm"
           },
@@ -2706,9 +2486,6 @@
           "sha256:4658cf807723123b513587887bf226d0b3daf69049c13951c5f88f6196acbb7d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsss_sudo-2.7.3-4.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-2.02-142.el8.x86_64.rpm"
           },
@@ -2751,9 +2528,6 @@
           "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm"
           },
-          "sha256:4bcbfd3229e3fd2d6e1adfe46bc233872c4184838de40b2e61a9ba84fcb81512": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-softokn-freebl-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:4bdac8b052ea5031f85f17e8f8499d491cc2ea8d5110467c5a0e4ec7b7763c2d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/authselect-compat-1.2.5-1.el8.x86_64.rpm"
           },
@@ -2787,9 +2561,6 @@
           "sha256:50603f9a5c2a643252949c922d656c83194047469116a33c3c265871bfd0a531": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dnf-data-4.7.0-11.el8.noarch.rpm"
           },
-          "sha256:507c1a196520e4263a0581e70b669c352097d6bdc7a5409ae748ee3942e71f5c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-sysinit-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:51eb082082e78afa70dd64591219c026d11cf7a6adf3771a36624c80be34dc3e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/nettle-3.4.1-7.el8.x86_64.rpm"
           },
@@ -2844,9 +2615,6 @@
           "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-modules-2.02-142.el8.noarch.rpm"
           },
-          "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-mdraid-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:5d9c5b3341e9b10091a5bc66c08455ce7d9c62911fac6b759b847a46749a1adf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-jsonpointer-1.10-11.el8.noarch.rpm"
           },
@@ -2880,9 +2648,6 @@
           "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsolv-0.7.20-3.el8.x86_64.rpm"
           },
-          "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libudisks2-2.9.0-9.el8.x86_64.rpm"
-          },
           "sha256:6950a3136327480137b0c3ed7555bd36d107ebb39b687354d2d34c5542e19d2d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dbus-1.12.8-23.el8.x86_64.rpm"
           },
@@ -2901,9 +2666,6 @@
           "sha256:6d7a41fb238610416349a53d024cc505ab7f3f6e9953cc2244abb663ec404dad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ncurses-6.1-9.20180224.el8.x86_64.rpm"
           },
-          "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm"
-          },
           "sha256:6dcdb3c2afc64822ed6945bf9607cd0406197bd9764718beef51f5332edd7c05": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glibc-gconv-extra-2.28-211.el8.x86_64.rpm"
           },
@@ -2925,9 +2687,6 @@
           "sha256:709fb09876846df58d761b2ddb973bbf2b870d995452648ef929a2cdf3ea8216": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libarchive-3.3.3-4.el8.x86_64.rpm"
           },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
           "sha256:7145b8d179b6c72e61de2b822551b343209adb63b76023fe26e7162d4ff6c107": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcc-8.5.0-15.el8.x86_64.rpm"
           },
@@ -2940,9 +2699,6 @@
           "sha256:73c29baa2cd94f1ae6a1d1333818969a281b16dd4262f413ad284c5333719a4d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/groff-base-1.22.3-18.el8.x86_64.rpm"
           },
-          "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-part-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:74cdb3a60d777eb0de980bfc902005757fc16ef0af7db01c1ade1cc56c3852c9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/elfutils-libs-0.187-4.el8.x86_64.rpm"
           },
@@ -3009,18 +2765,12 @@
           "sha256:821923c32f6cd4c764ea7e97bee3335993d405694aa81b923cf1ef46c9e03cf9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/rhc-0.2.1-9.el8.x86_64.rpm"
           },
-          "sha256:82cd233003b87e6b810070eead73ec44073050aabccec9a619309074a1868fe9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nspr-4.34.0-3.el8_6.x86_64.rpm"
-          },
           "sha256:830940ac1860e506f78be51323f21144a40e6244eff2331c1648da06baee9ea6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dhcp-libs-4.3.6-48.el8.x86_64.rpm"
           },
           "sha256:84c4a7d89325e5d405712dff6db06ef55996a09faf7490c1693d032171730777": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/procps-ng-3.3.15-9.el8.x86_64.rpm"
           },
-          "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-swap-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:862e75a1cf6aa5be750a530c8ce8b999d0b2efe9737e20f37f9f9153a82e56fa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libassuan-2.5.1-3.el8.x86_64.rpm"
           },
@@ -3039,9 +2789,6 @@
           "sha256:88f6945f8c7875f85a8f6befdfee8f3460f6f929fc6fb64eba1411bf8c2c6361": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-audit-3.0.7-4.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a631d059089724f11aed2114ddaf7511c9771f415f638ed5b3a135bb90f2a31": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/coreutils-8.30-13.el8.x86_64.rpm"
           },
@@ -3054,9 +2801,6 @@
           "sha256:8c6da26441750b3970fe73b6a9d2d780931da6cdea48f10d0b34c65c79a9e341": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-jinja2-2.10.1-3.el8.noarch.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8d371e753071edc796d2eadb8278980290511be6279fdf46649c81b859497d6a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/prefixdevname-0.1.0-6.el8.x86_64.rpm"
           },
@@ -3072,9 +2816,6 @@
           "sha256:8e838f5065490d117f247f55047de7e46ea36193432ff17eab9e4e7724c8c8e1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/snappy-1.1.8-3.el8.x86_64.rpm"
           },
-          "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-loop-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:8efc0d874bbba80e64c99732956704826ce93ddd1476809c43b4d0b240f1e401": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/authselect-1.2.5-1.el8.x86_64.rpm"
           },
@@ -3087,9 +2828,6 @@
           "sha256:912ff00d4f533a0fc8342910586ecc83f566e43f53e150c5cb7c1a6274dd1ba7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/tzdata-2022d-1.el8.noarch.rpm"
           },
-          "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:9137a707b7793567b38e7d8dba78fcf3f70c39320e68a9ee0b745b3a77f182ee": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/teamd-1.31-2.el8.x86_64.rpm"
           },
@@ -3114,12 +2852,6 @@
           "sha256:9461fa7a5e74bfd8d9e9961af9d3003d9d2b496830c2fd6b0641ae8b8bc8e178": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libacl-2.2.53-1.el8.x86_64.rpm"
           },
-          "sha256:94d5c3946873b079aa5af985e31501981fef1cb3065024e9f41f70c40fc9b975": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-util-3.79.0-10.el8_6.x86_64.rpm"
-          },
-          "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-fs-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/unbound-libs-1.16.2-2.el8.x86_64.rpm"
           },
@@ -3234,15 +2966,6 @@
           "sha256:ae6dd4ea3852d1ce30a0988bde8d35e91a8b0709615e3ac64c65a5e24e68fefa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/device-mapper-libs-1.02.181-6.el8.x86_64.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
-          "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:afb86bb3de3f8b6f8ea6be0318f95d6938749ccf91e0cabe5d95c0f197d5de1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/hardlink-1.3-6.el8.x86_64.rpm"
           },
@@ -3279,9 +3002,6 @@
           "sha256:b4babe48d93eccce4f0249ba34d592bfc306c3b14b40df7a5cc9eaec2eaae20f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/numactl-libs-2.0.12-13.el8.x86_64.rpm"
           },
-          "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm"
-          },
           "sha256:b76a180508132aaceb8dcebc5de9cec87d3459a39e4749f9af342d242c410dab": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/oddjob-mkhomedir-0.34.7-2.el8.x86_64.rpm"
           },
@@ -3351,9 +3071,6 @@
           "sha256:c637ccd812d6458885af67910db0e6698917abd8c397a34ebaf7b66052914433": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glibc-langpack-en-2.28-211.el8.x86_64.rpm"
           },
-          "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/udisks2-2.9.0-9.el8.x86_64.rpm"
-          },
           "sha256:c759f74a96a42a539568a16805461352f84c7e1766f41faccb519ac14a8825d3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/pam-1.3.1-22.el8.x86_64.rpm"
           },
@@ -3372,9 +3089,6 @@
           "sha256:cb849487fb29d658b714045a4afe4886324e4add7d47a7296ae0ee89e3477014": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libini_config-1.3.1-40.el8.x86_64.rpm"
           },
-          "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-crypto-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:cccb98acc0ead0737b2f7406c48a2039165276a129de1c7c840e412078437f1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libbasicobjects-0.1.1-40.el8.x86_64.rpm"
           },
@@ -3456,18 +3170,12 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d570af0578f5b2c6225f1f2354404f65bccf91c3974e98dcbc0c7b55a61b9b46": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grep-3.1-6.el8.x86_64.rpm"
           },
           "sha256:d67580b9b2af79f599f77c35c694714d2d39d2ea01c28e8aaca1312e6ab25184": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-libselinux-2.9-6.el8.x86_64.rpm"
           },
-          "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm"
-          },
           "sha256:d94ea399f82d4f9537af1098a588c5cc9a80454ba7c1de9b26dd11cb5c730d8a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-requests-2.20.0-2.1.el8_1.noarch.rpm"
           },
@@ -3504,9 +3212,6 @@
           "sha256:e29131b502b6a199003ed61e27eb3e5cb3d46f4b4a3f8ca1034945a406dcfe80": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsemanage-2.9-9.el8.x86_64.rpm"
           },
-          "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mdadm-4.2-5.el8.x86_64.rpm"
-          },
           "sha256:e4f799b634299835dc1a8e79adcfb223d13b369bd033cbdb14170f845c9464ad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ethtool-5.13-2.el8.x86_64.rpm"
           },
@@ -3630,9 +3335,6 @@
           "sha256:fc46ac94289cd660db8452aa7093c446b0f087cda089b3c3aeeb988286d80ee2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/systemd-239-68.el8.x86_64.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
           "sha256:fd60066d9141529ea385fa8fc3af88d0f6ac0cb7a8515af0abe9b65498707f6f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-urllib3-1.24.2-5.el8.noarch.rpm"
           },
@@ -3645,9 +3347,6 @@
           "sha256:fe1a3e821eab7aafd11152c5d5b9f6cf57de36d8ef3b517e0e2f2315b062742c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-jwt-1.6.1-2.el8.noarch.rpm"
           },
-          "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-utils-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:fec32d37b2f34c891a64a8c5e2faf3d08de25d144289b6f2b7f5fafdd5eec4d2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/parted-3.2-39.el8.x86_64.rpm"
           },
@@ -3900,15 +3599,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5378,15 +5068,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2-libs",
         "epoch": 0,
@@ -5711,15 +5392,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dnf-plugins-core-4.0.21-14.1.el8.noarch.rpm",
         "checksum": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5783,33 +5455,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/e2fsprogs-libs-1.45.6-5.el8.x86_64.rpm",
         "checksum": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -5918,15 +5563,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fuse-libs-2.9.7-16.el8.x86_64.rpm",
         "checksum": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.8",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm",
-        "checksum": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -6107,15 +5743,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-common-2.02-142.el8.noarch.rpm",
         "checksum": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "142.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
-        "checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -6647,15 +6274,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -6692,24 +6310,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libidn2",
         "epoch": 0,
@@ -7007,15 +6607,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmartcols-2.32.1-38.el8.x86_64.rpm",
         "checksum": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -7241,15 +6832,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxml2-2.9.7-15.el8.x86_64.rpm",
         "checksum": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libyaml",
         "epoch": 0,
@@ -7349,15 +6931,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm",
         "checksum": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.2",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mdadm-4.2-5.el8.x86_64.rpm",
-        "checksum": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -7376,15 +6949,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/microcode_ctl-20220809-1.el8.x86_64.rpm",
         "checksum": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -8339,15 +7903,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.6",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm",
-        "checksum": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -8726,96 +8281,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-crypto-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-fs-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-loop-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-mdraid-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-part-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-swap-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-utils-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -8843,15 +8308,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "9.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libudisks2-2.9.0-9.el8.x86_64.rpm",
-        "checksum": "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce"
-      },
       {
         "name": "libxkbcommon",
         "epoch": 0,
@@ -8861,60 +8317,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libxkbcommon-0.9.1-1.el8.x86_64.rpm",
         "checksum": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
       },
-      {
-        "name": "nspr",
-        "epoch": 0,
-        "version": "4.34.0",
-        "release": "3.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nspr-4.34.0-3.el8_6.x86_64.rpm",
-        "checksum": "sha256:82cd233003b87e6b810070eead73ec44073050aabccec9a619309074a1868fe9"
-      },
-      {
-        "name": "nss",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a"
-      },
-      {
-        "name": "nss-softokn",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-softokn-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:319d3d51dfc09875cdbb61518410fe2963887228089d4a9de8f673acc7a2ff82"
-      },
-      {
-        "name": "nss-softokn-freebl",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-softokn-freebl-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:4bcbfd3229e3fd2d6e1adfe46bc233872c4184838de40b2e61a9ba84fcb81512"
-      },
-      {
-        "name": "nss-sysinit",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-sysinit-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:507c1a196520e4263a0581e70b669c352097d6bdc7a5409ae748ee3942e71f5c"
-      },
-      {
-        "name": "nss-util",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-util-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:94d5c3946873b079aa5af985e31501981fef1cb3065024e9f41f70c40fc9b975"
-      },
       {
         "name": "oddjob",
         "epoch": 0,
@@ -9068,15 +8470,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/rsyslog-8.2102.0-10.el8.x86_64.rpm",
         "checksum": "sha256:37ca74f003d06ada0528d353bdc0df49193a058cece3c51173dc8b9c80f410e5"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "9.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/udisks2-2.9.0-9.el8.x86_64.rpm",
-        "checksum": "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -9086,15 +8479,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/unbound-libs-1.16.2-2.el8.x86_64.rpm",
         "checksum": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json
index d8aa17027..dbecf9063 100644
--- a/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-ec2_ha-boot.json
@@ -129,9 +129,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -658,9 +655,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:ac5e4942921cee7c931186db79f14c54ddda3d98756e37bd6bb5b0a1024f0e82"
                   },
@@ -790,9 +784,6 @@
                   {
                     "id": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -814,15 +805,6 @@
                   {
                     "id": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:45c47f5146e39f50ca18d1561821607bc582c5fd4de0bf05bc06a5e0eb33df34"
                   },
@@ -862,9 +844,6 @@
                   {
                     "id": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
                   },
-                  {
-                    "id": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-                  },
                   {
                     "id": "sha256:59b3cff57ffbea4c4c011e6a81341a1203c18b91569fff019c93b756331300f8"
                   },
@@ -925,9 +904,6 @@
                   {
                     "id": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
                   },
-                  {
-                    "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-                  },
                   {
                     "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
                   },
@@ -1120,9 +1096,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:7145b8d179b6c72e61de2b822551b343209adb63b76023fe26e7162d4ff6c107"
                   },
@@ -1135,12 +1108,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:fe37f767487e0806535a06cda4e302555c27166b6320657ae945d5217b8c36aa"
                   },
@@ -1246,9 +1213,6 @@
                   {
                     "id": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8"
                   },
@@ -1327,9 +1291,6 @@
                   {
                     "id": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15"
                   },
@@ -1372,18 +1333,12 @@
                   {
                     "id": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
                   },
-                  {
-                    "id": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-                  },
                   {
                     "id": "sha256:ca6208d771fbbfc703217b0f4314d214a866da86b105f222753a6efeb12d6f69"
                   },
                   {
                     "id": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
                   },
-                  {
-                    "id": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1837,9 +1792,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -2095,36 +2047,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3"
-                  },
-                  {
-                    "id": "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6"
-                  },
-                  {
-                    "id": "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9"
-                  },
-                  {
-                    "id": "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756"
-                  },
-                  {
-                    "id": "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44"
-                  },
-                  {
-                    "id": "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d"
-                  },
-                  {
-                    "id": "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd"
-                  },
-                  {
-                    "id": "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:d16252dcb91c3e581ecb29234180fb99ac3199a052a89d0e23603cb6054bee16"
                   },
@@ -2137,9 +2059,6 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce"
-                  },
                   {
                     "id": "sha256:34001e2596b82803f289adefe1a263b61917e8a67ff8e45d9ff5fc1ca150eb57"
                   },
@@ -2329,15 +2248,9 @@
                   {
                     "id": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
                   },
-                  {
-                    "id": "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f"
-                  },
                   {
                     "id": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -2418,9 +2331,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2588,23 +2499,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2612,13 +2510,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-425.3.1.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2683,20 +2577,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2712,45 +2594,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2758,8 +2605,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2785,28 +2632,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2816,18 +2647,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2845,8 +2664,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -3065,9 +2884,6 @@
           "sha256:1d47e465939bba5bcf9c37be2516e60d6c9449ccee70a54a6133df989ac8b1f5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libksba-1.3.5-7.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -3134,9 +2950,6 @@
           "sha256:2733570f8ea94551f3381538f9c8642c88532c800b384c07b4db02f6b8896c3f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libattr-2.4.48-3.el8.x86_64.rpm"
           },
-          "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm"
-          },
           "sha256:27efba5e62430987380ca7f2e4185e1d27c517a6f8d22958dd3fd0bc2591d3fe": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/rubygem-io-console-0.4.6-110.module+el8.6.0+15956+aa803fc1.x86_64.rpm"
           },
@@ -3197,15 +3010,6 @@
           "sha256:2ff643bfe17476a8dfa94ea900ddf9d89ed0e5f56839f18209f8304a0e31bb2f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dmidecode-3.3-4.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30c6dbc7d2dd8024a16fe2d00b01fa71f4a1ea9d4af5519dc092695d4fa735cf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libss-1.45.6-5.el8.x86_64.rpm"
           },
@@ -3296,9 +3100,6 @@
           "sha256:3a9aede6732c73278d74c413ad9559c1ccf0c0bbdfd1b61734cf984e75d20367": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-configobj-5.0.6-11.el8.noarch.rpm"
           },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3d6a5eeb0da36ce36cd6ddc5e3c2d2bc36cd5962d1450077c5c5754b8f5ac02c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glib2-2.56.4-159.el8.x86_64.rpm"
           },
@@ -3359,9 +3160,6 @@
           "sha256:46ed1904100326d5ded33a027840de37cf90d3dffe8d1fa88a8f01654539a322": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/fence-agents-hpblade-4.2.1-103.el8.noarch.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-2.02-142.el8.x86_64.rpm"
           },
@@ -3536,9 +3334,6 @@
           "sha256:5baf694f0ba6606307a449ca22cc62e85d38cd8ae870fac133e3f5df3d710dfc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-modules-2.02-142.el8.noarch.rpm"
           },
-          "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-mdraid-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:5d9c5b3341e9b10091a5bc66c08455ce7d9c62911fac6b759b847a46749a1adf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-jsonpointer-1.10-11.el8.noarch.rpm"
           },
@@ -3578,9 +3373,6 @@
           "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsolv-0.7.20-3.el8.x86_64.rpm"
           },
-          "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libudisks2-2.9.0-9.el8.x86_64.rpm"
-          },
           "sha256:6950a3136327480137b0c3ed7555bd36d107ebb39b687354d2d34c5542e19d2d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dbus-1.12.8-23.el8.x86_64.rpm"
           },
@@ -3605,9 +3397,6 @@
           "sha256:6d7a41fb238610416349a53d024cc505ab7f3f6e9953cc2244abb663ec404dad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ncurses-6.1-9.20180224.el8.x86_64.rpm"
           },
-          "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm"
-          },
           "sha256:6dcdb3c2afc64822ed6945bf9607cd0406197bd9764718beef51f5332edd7c05": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glibc-gconv-extra-2.28-211.el8.x86_64.rpm"
           },
@@ -3629,9 +3418,6 @@
           "sha256:709fb09876846df58d761b2ddb973bbf2b870d995452648ef929a2cdf3ea8216": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libarchive-3.3.3-4.el8.x86_64.rpm"
           },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
           "sha256:7145b8d179b6c72e61de2b822551b343209adb63b76023fe26e7162d4ff6c107": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcc-8.5.0-15.el8.x86_64.rpm"
           },
@@ -3656,9 +3442,6 @@
           "sha256:746243a941d8d8299e220e75bed360debcb7f27df661a5f7637deb21cdd67976": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-n8.7-20221015/Packages/libknet1-crypto-nss-plugin-1.24-2.el8.x86_64.rpm"
           },
-          "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-part-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:74c60aed4f76cf297ec7fc218763d5b8b87c03280ed94d216f1a71100441ed3f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-n8.7-20221015/Packages/libknet1-compress-lz4-plugin-1.24-2.el8.x86_64.rpm"
           },
@@ -3770,9 +3553,6 @@
           "sha256:84c4a7d89325e5d405712dff6db06ef55996a09faf7490c1693d032171730777": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/procps-ng-3.3.15-9.el8.x86_64.rpm"
           },
-          "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-swap-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:862e75a1cf6aa5be750a530c8ce8b999d0b2efe9737e20f37f9f9153a82e56fa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libassuan-2.5.1-3.el8.x86_64.rpm"
           },
@@ -3794,9 +3574,6 @@
           "sha256:891b4ffa90ef5369b7a846fabe4ce87e0d7e604fa31a43104b93c7f5654bbb7c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libwbclient-4.16.4-2.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a631d059089724f11aed2114ddaf7511c9771f415f638ed5b3a135bb90f2a31": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/coreutils-8.30-13.el8.x86_64.rpm"
           },
@@ -3809,9 +3586,6 @@
           "sha256:8c6da26441750b3970fe73b6a9d2d780931da6cdea48f10d0b34c65c79a9e341": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-jinja2-2.10.1-3.el8.noarch.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8d371e753071edc796d2eadb8278980290511be6279fdf46649c81b859497d6a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/prefixdevname-0.1.0-6.el8.x86_64.rpm"
           },
@@ -3827,9 +3601,6 @@
           "sha256:8e838f5065490d117f247f55047de7e46ea36193432ff17eab9e4e7724c8c8e1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/snappy-1.1.8-3.el8.x86_64.rpm"
           },
-          "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-loop-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:8efc0d874bbba80e64c99732956704826ce93ddd1476809c43b4d0b240f1e401": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/authselect-1.2.5-1.el8.x86_64.rpm"
           },
@@ -3845,9 +3616,6 @@
           "sha256:912ff00d4f533a0fc8342910586ecc83f566e43f53e150c5cb7c1a6274dd1ba7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/tzdata-2022d-1.el8.noarch.rpm"
           },
-          "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:9137a707b7793567b38e7d8dba78fcf3f70c39320e68a9ee0b745b3a77f182ee": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/teamd-1.31-2.el8.x86_64.rpm"
           },
@@ -3878,9 +3646,6 @@
           "sha256:94d5c3946873b079aa5af985e31501981fef1cb3065024e9f41f70c40fc9b975": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-util-3.79.0-10.el8_6.x86_64.rpm"
           },
-          "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-fs-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/unbound-libs-1.16.2-2.el8.x86_64.rpm"
           },
@@ -4049,12 +3814,6 @@
           "sha256:ae6dd4ea3852d1ce30a0988bde8d35e91a8b0709615e3ac64c65a5e24e68fefa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/device-mapper-libs-1.02.181-6.el8.x86_64.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-3.79.0-10.el8_6.x86_64.rpm"
           },
@@ -4109,9 +3868,6 @@
           "sha256:b516896f3b3a83a1a5c9d0d6e84b025ecdb8d3676cbb195751b44224ad720078": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-n8.7-20221015/Packages/pacemaker-cli-2.1.4-5.el8.x86_64.rpm"
           },
-          "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm"
-          },
           "sha256:b5ceaedb078fd24f7b1c8c739c2492ba3c187ac139ee751578b6bae1564c8ca5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/device-mapper-multipath-0.8.4-28.el8.x86_64.rpm"
           },
@@ -4217,9 +3973,6 @@
           "sha256:c65f150b84982102e17a772d66b2db460f74caaa4f56086322efc31ad7121fa7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/device-mapper-event-1.02.181-6.el8.x86_64.rpm"
           },
-          "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/udisks2-2.9.0-9.el8.x86_64.rpm"
-          },
           "sha256:c759f74a96a42a539568a16805461352f84c7e1766f41faccb519ac14a8825d3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/pam-1.3.1-22.el8.x86_64.rpm"
           },
@@ -4256,9 +4009,6 @@
           "sha256:cbc9960daa473a381ebac94367a9f4acb633e603fba4683010c4a040ef7f9f57": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/fence-agents-heuristics-ping-4.2.1-103.el8.noarch.rpm"
           },
-          "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-crypto-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:cccb98acc0ead0737b2f7406c48a2039165276a129de1c7c840e412078437f1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libbasicobjects-0.1.1-40.el8.x86_64.rpm"
           },
@@ -4358,18 +4108,12 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d570af0578f5b2c6225f1f2354404f65bccf91c3974e98dcbc0c7b55a61b9b46": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grep-3.1-6.el8.x86_64.rpm"
           },
           "sha256:d67580b9b2af79f599f77c35c694714d2d39d2ea01c28e8aaca1312e6ab25184": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-libselinux-2.9-6.el8.x86_64.rpm"
           },
-          "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm"
-          },
           "sha256:d8f93540a6a7329a5158d3e543f77110104f30494f4d6f187427e5010d8df379": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libaio-0.3.112-1.el8.x86_64.rpm"
           },
@@ -4445,9 +4189,6 @@
           "sha256:e33a380e981f44fb1e1987142e4a41bf3dbeb452490f2030876d221640c52e14": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/samba-client-libs-4.16.4-2.el8.x86_64.rpm"
           },
-          "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mdadm-4.2-5.el8.x86_64.rpm"
-          },
           "sha256:e4f799b634299835dc1a8e79adcfb223d13b369bd033cbdb14170f845c9464ad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ethtool-5.13-2.el8.x86_64.rpm"
           },
@@ -4631,9 +4372,6 @@
           "sha256:fc46ac94289cd660db8452aa7093c446b0f087cda089b3c3aeeb988286d80ee2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/systemd-239-68.el8.x86_64.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
           "sha256:fd60066d9141529ea385fa8fc3af88d0f6ac0cb7a8515af0abe9b65498707f6f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-urllib3-1.24.2-5.el8.noarch.rpm"
           },
@@ -4649,9 +4387,6 @@
           "sha256:fe37f767487e0806535a06cda4e302555c27166b6320657ae945d5217b8c36aa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libicu-60.3-2.el8_1.x86_64.rpm"
           },
-          "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-utils-2.24-11.el8.x86_64.rpm"
-          },
           "sha256:fe7cfd8d7281295cbc16dd06dcb79f80c1d18679b4eafe8bb22f61bffec2ca25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/fence-agents-ipmilan-4.2.1-103.el8.noarch.rpm"
           },
@@ -4910,15 +4645,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -6397,15 +6123,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2",
         "epoch": 0,
@@ -6793,15 +6510,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dnf-plugins-core-4.0.21-14.1.el8.noarch.rpm",
         "checksum": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -6865,33 +6573,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/e2fsprogs-libs-1.45.6-5.el8.x86_64.rpm",
         "checksum": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -7009,15 +6690,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fuse-libs-2.9.7-16.el8.x86_64.rpm",
         "checksum": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.8",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm",
-        "checksum": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -7198,15 +6870,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-common-2.02-142.el8.noarch.rpm",
         "checksum": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "142.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
-        "checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -7783,15 +7446,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -7828,24 +7482,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libicu",
         "epoch": 0,
@@ -8161,15 +7797,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmartcols-2.32.1-38.el8.x86_64.rpm",
         "checksum": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -8404,15 +8031,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxml2-2.9.7-15.el8.x86_64.rpm",
         "checksum": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libxslt",
         "epoch": 0,
@@ -8539,15 +8157,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm",
         "checksum": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.2",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mdadm-4.2-5.el8.x86_64.rpm",
-        "checksum": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -8566,15 +8175,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/microcode_ctl-20220809-1.el8.x86_64.rpm",
         "checksum": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -9934,15 +9534,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.6",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm",
-        "checksum": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -10708,96 +10299,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:91303cb921c3727203c4a25c12524356a2afb2e3fd594bdd12301a7b5edabaa3"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-crypto-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:cbca89c39db7fd80dc71deefdcfb15262e2aed69117e66a15632ac581c82b8b6"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-fs-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:95a340a62ae433f5a5cb30e8929b9b4167d2d204bef99beea487ad65e451c2b9"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-loop-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:8ed24bf92f4a389d82399a2dfcdcd2b8812b354d32e50807ddf557b978532756"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-mdraid-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:5bea1ad0a4491ab6ae8607f741388c983dc471747176a3e82302e94addba6d44"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-part-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:74789339d67c8fd8545def02ae4a0f5dbbb9c0ee71aee54ee166b633563fe85d"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-swap-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:859c0fe81e8a3e297664c62d725d3224ec6f35bf5078a2993484b35328c16fdd"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.24",
-        "release": "11.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libblockdev-utils-2.24-11.el8.x86_64.rpm",
-        "checksum": "sha256:fe6788ebe68e3bc8d6e9784c569c3bc5916e5c445a88fb0247ee1243018cfc8c"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -10834,15 +10335,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "9.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/libudisks2-2.9.0-9.el8.x86_64.rpm",
-        "checksum": "sha256:68e0dfe4bc893170e61539b648f41ef10aa8174a884de6ff91dcb87abc7d03ce"
-      },
       {
         "name": "libverto-libev",
         "epoch": 0,
@@ -11410,15 +10902,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/telnet-0.17-76.el8.x86_64.rpm",
         "checksum": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "9.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/udisks2-2.9.0-9.el8.x86_64.rpm",
-        "checksum": "sha256:c72fcb71cb08b0e21e56c9b3238cac42bfa90fa43b2e5bfb218e4b22b957f12f"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -11428,15 +10911,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/unbound-libs-1.16.2-2.el8.x86_64.rpm",
         "checksum": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json
index 848774b72..321e3b5a8 100644
--- a/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-ec2_sap-boot.json
@@ -154,9 +154,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -725,9 +722,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:ac5e4942921cee7c931186db79f14c54ddda3d98756e37bd6bb5b0a1024f0e82"
                   },
@@ -914,15 +908,6 @@
                   {
                     "id": "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:45c47f5146e39f50ca18d1561821607bc582c5fd4de0bf05bc06a5e0eb33df34"
                   },
@@ -980,9 +965,6 @@
                   {
                     "id": "sha256:c33debf1cedf1a6c38ed7e2bc37416a3b2c26d27c0ced755fd640cb49db95987"
                   },
-                  {
-                    "id": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-                  },
                   {
                     "id": "sha256:59b3cff57ffbea4c4c011e6a81341a1203c18b91569fff019c93b756331300f8"
                   },
@@ -1049,9 +1031,6 @@
                   {
                     "id": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
                   },
-                  {
-                    "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-                  },
                   {
                     "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
                   },
@@ -1289,9 +1268,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:7145b8d179b6c72e61de2b822551b343209adb63b76023fe26e7162d4ff6c107"
                   },
@@ -1448,9 +1424,6 @@
                   {
                     "id": "sha256:cfa953b5825141026d5e6cd951f5aca15a88e8998e297e07d537e4aae8da5b21"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8"
                   },
@@ -1541,9 +1514,6 @@
                   {
                     "id": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15"
                   },
@@ -1616,9 +1586,6 @@
                   {
                     "id": "sha256:48e1edacae05696360d0dd0706b2d3debb617ae15e9f7ce47e528839231a6c25"
                   },
-                  {
-                    "id": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -2105,9 +2072,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -3082,9 +3046,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -3369,23 +3331,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -3393,13 +3342,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-425.3.1.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -3464,20 +3409,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -3493,45 +3426,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -3539,8 +3437,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -3566,28 +3464,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -3597,18 +3479,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -3626,8 +3496,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -3993,9 +3863,6 @@
           "sha256:273c756dce0c543a12e1a6c3ccf745235397430ab9258bb13cb34d3a79e215e7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python39-libs-3.9.13-1.module+el8.7.0+15656+ffd4a257.x86_64.rpm"
           },
-          "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm"
-          },
           "sha256:27d04a9a33eb9300a55a8ec7623c02da13d19185278e367b60422c8fe70279e7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/sssd-common-pac-2.7.3-4.el8.x86_64.rpm"
           },
@@ -4086,18 +3953,12 @@
           "sha256:2ff643bfe17476a8dfa94ea900ddf9d89ed0e5f56839f18209f8304a0e31bb2f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dmidecode-3.3-4.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
           "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
           },
           "sha256:308c79a13fac07e1884dbbe056ce39bdd68348b8e4dd3c1914f4c0038e898434": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/sos-4.3-5.el8.noarch.rpm"
           },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30c6dbc7d2dd8024a16fe2d00b01fa71f4a1ea9d4af5519dc092695d4fa735cf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libss-1.45.6-5.el8.x86_64.rpm"
           },
@@ -4296,9 +4157,6 @@
           "sha256:471930ec9d0e115809eaae8aa5c888bc07104c600ff49b55ab746701691c7c0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/iptables-libs-1.8.4-23.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-pc-2.02-142.el8.x86_64.rpm"
           },
@@ -4638,9 +4496,6 @@
           "sha256:6d7a41fb238610416349a53d024cc505ab7f3f6e9953cc2244abb663ec404dad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ncurses-6.1-9.20180224.el8.x86_64.rpm"
           },
-          "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm"
-          },
           "sha256:6dcdb3c2afc64822ed6945bf9607cd0406197bd9764718beef51f5332edd7c05": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glibc-gconv-extra-2.28-211.el8.x86_64.rpm"
           },
@@ -4914,9 +4769,6 @@
           "sha256:8942bd9f52f391bf7832aa81ebc8ea66f420ed5b4d35310666997567f0ea9351": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/pinfo-0.6.10-18.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a3d3e06022e15746a023ace227a8ab3737b468b651cd20f01b5959afa4de75c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/cockpit-podman-53-1.module+el8.7.0+16772+33343656.noarch.rpm"
           },
@@ -4938,9 +4790,6 @@
           "sha256:8c81bb15456e441250d2ed53b223bf85c21a9b25b6a36ab09953cc831f9e7109": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/tcsh-6.20.00-15.el8.x86_64.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8ca5dd4feea941aba58c6d6e981883bca79704dba06583f880c0bf5e0cf4efcf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/desktop-file-utils-0.23-8.el8.x86_64.rpm"
           },
@@ -5295,9 +5144,6 @@
           "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
           },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/nss-3.79.0-10.el8_6.x86_64.rpm"
           },
@@ -5379,9 +5225,6 @@
           "sha256:b50ed1c4095445fbb87d3f3b21abad7ace7fb2cbbac8f38e19b7f1e0caf28b4d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-pexpect-4.3.1-3.el8.noarch.rpm"
           },
-          "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm"
-          },
           "sha256:b5c29663e9ffd460842551c32665c0629f634ad7453f0dc3888f4b07c6f88a71": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/podman-4.2.0-1.module+el8.7.0+16772+33343656.x86_64.rpm"
           },
@@ -5682,9 +5525,6 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ed-1.14.2-4.el8.x86_64.rpm"
           },
@@ -5697,9 +5537,6 @@
           "sha256:d67580b9b2af79f599f77c35c694714d2d39d2ea01c28e8aaca1312e6ab25184": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-libselinux-2.9-6.el8.x86_64.rpm"
           },
-          "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm"
-          },
           "sha256:d805c42ee9293a8ba35f49af63e3f7d813420d4a62ee4cff5ecd7391be851a9b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libtool-ltdl-2.4.6-25.el8.x86_64.rpm"
           },
@@ -6324,15 +6161,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -7928,15 +7756,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2",
         "epoch": 0,
@@ -8495,33 +8314,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ed-1.14.2-4.el8.x86_64.rpm",
         "checksum": "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -8693,15 +8485,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fuse3-libs-3.3.0-16.el8.x86_64.rpm",
         "checksum": "sha256:c33debf1cedf1a6c38ed7e2bc37416a3b2c26d27c0ced755fd640cb49db95987"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.8",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/fwupd-1.7.8-1.el8.x86_64.rpm",
-        "checksum": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -8900,15 +8683,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-common-2.02-142.el8.noarch.rpm",
         "checksum": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "142.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
-        "checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -9620,15 +9394,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -10097,15 +9862,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbclient-4.16.4-2.el8.x86_64.rpm",
         "checksum": "sha256:cfa953b5825141026d5e6cd951f5aca15a88e8998e297e07d537e4aae8da5b21"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -10376,15 +10132,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxml2-2.9.7-15.el8.x86_64.rpm",
         "checksum": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libxslt",
         "epoch": 0,
@@ -10601,15 +10348,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mlocate-0.26-20.el8.x86_64.rpm",
         "checksum": "sha256:48e1edacae05696360d0dd0706b2d3debb617ae15e9f7ce47e528839231a6c25"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/mokutil-0.3.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -12068,15 +11806,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.6",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/shim-x64-15.6-1.el8.x86_64.rpm",
-        "checksum": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-      },
       {
         "name": "slang",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_88-aarch64-ec2-boot.json b/test/data/manifests/rhel_88-aarch64-ec2-boot.json
index 2d6fe885c..9c729ef93 100644
--- a/test/data/manifests/rhel_88-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-ec2-boot.json
@@ -2119,14 +2119,14 @@
                   "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
                 },
                 {
-                  "size": 1024000,
+                  "size": 1048576,
                   "start": 411648,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
+                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
-                  "size": 19535839,
-                  "start": 1435648,
+                  "size": 19511263,
+                  "start": 1460224,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2162,8 +2162,7 @@
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
-              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
+              "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
             },
             "devices": {
               "device": {
@@ -2171,7 +2170,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000,
+                  "size": 1048576,
                   "lock": true
                 }
               }
@@ -2188,8 +2187,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839,
+                  "start": 1460224,
+                  "size": 19511263,
                   "lock": true
                 }
               }
@@ -2220,7 +2219,7 @@
                 "options": {
                   "filename": "disk.img",
                   "start": 411648,
-                  "size": 1024000
+                  "size": 1048576
                 }
               },
               "boot.efi": {
@@ -2235,8 +2234,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1435648,
-                  "size": 19535839
+                  "start": 1460224,
+                  "size": 19511263
                 }
               }
             },
diff --git a/test/data/manifests/rhel_88-x86_64-ec2-boot.json b/test/data/manifests/rhel_88-x86_64-ec2-boot.json
index 0d8ef5592..62cf74d73 100644
--- a/test/data/manifests/rhel_88-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-ec2-boot.json
@@ -120,9 +120,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -645,9 +642,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:4d1be1a327a1ef7f0fa6a0005f32b962d446597febebae80b21d8f8f1355a8aa"
                   },
@@ -756,9 +750,6 @@
                   {
                     "id": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -780,15 +771,6 @@
                   {
                     "id": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:45c47f5146e39f50ca18d1561821607bc582c5fd4de0bf05bc06a5e0eb33df34"
                   },
@@ -825,9 +807,6 @@
                   {
                     "id": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
                   },
-                  {
-                    "id": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-                  },
                   {
                     "id": "sha256:59b3cff57ffbea4c4c011e6a81341a1203c18b91569fff019c93b756331300f8"
                   },
@@ -888,9 +867,6 @@
                   {
                     "id": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
                   },
-                  {
-                    "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-                  },
                   {
                     "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
                   },
@@ -1068,9 +1044,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:2cd7f54b726250042483f37e513645c240beec147cbfa959cd689b306d36d103"
                   },
@@ -1083,12 +1056,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:4a62975251933dcaff77fdbd7704e8a12bea0ecb6eaaae5ea5e552bedd6788ec"
                   },
@@ -1188,9 +1155,6 @@
                   {
                     "id": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8"
                   },
@@ -1266,9 +1230,6 @@
                   {
                     "id": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:018409b1eda8be48a11a5b76b95e82ff1d9002569e0644291532d8424dc31edf"
                   },
@@ -1302,18 +1263,12 @@
                   {
                     "id": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
                   },
-                  {
-                    "id": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-                  },
                   {
                     "id": "sha256:ca6208d771fbbfc703217b0f4314d214a866da86b105f222753a6efeb12d6f69"
                   },
                   {
                     "id": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
                   },
-                  {
-                    "id": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1632,9 +1587,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -1761,36 +1713,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:694ba7edf36a3cf125b914dd638de18fa4d0928f046da1bda32f78c8f94439e2"
-                  },
-                  {
-                    "id": "sha256:2c3eeba223c5b9742d31138aa4adc585bd65a89bc9ccc723bbe721d997d9c11c"
-                  },
-                  {
-                    "id": "sha256:44447cbfdf0236f20f68d31e1541d43ffcc878da80b7a74691ea71819181fcef"
-                  },
-                  {
-                    "id": "sha256:0cb4318603418836dbbb30db39430ea5d89f4fac40f641bc91d6515fc4ef08cd"
-                  },
-                  {
-                    "id": "sha256:85d03de6ce794c8ce61c85ba84a79df6d49559cccc1b1deb572aa3c8e52f7c1b"
-                  },
-                  {
-                    "id": "sha256:144fb6ba0e48ba305d5654d849671c24ac82f3661557f0991f6c548e54086a32"
-                  },
-                  {
-                    "id": "sha256:00ecb47f6d186624b15d7064eacd55e9ad5c9f9e7fba7275d0659d3f228b826b"
-                  },
-                  {
-                    "id": "sha256:0a466ad35225cbf85b0c942450b2dd4ce942d6e5111624708ff90542d051acdc"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:d16252dcb91c3e581ecb29234180fb99ac3199a052a89d0e23603cb6054bee16"
                   },
@@ -1800,30 +1722,9 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:2350cfe649d5156bbba7fd3be4f13dd3945243facebc8bad01db1707fd276145"
-                  },
                   {
                     "id": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
                   },
-                  {
-                    "id": "sha256:82cd233003b87e6b810070eead73ec44073050aabccec9a619309074a1868fe9"
-                  },
-                  {
-                    "id": "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a"
-                  },
-                  {
-                    "id": "sha256:319d3d51dfc09875cdbb61518410fe2963887228089d4a9de8f673acc7a2ff82"
-                  },
-                  {
-                    "id": "sha256:4bcbfd3229e3fd2d6e1adfe46bc233872c4184838de40b2e61a9ba84fcb81512"
-                  },
-                  {
-                    "id": "sha256:507c1a196520e4263a0581e70b669c352097d6bdc7a5409ae748ee3942e71f5c"
-                  },
-                  {
-                    "id": "sha256:94d5c3946873b079aa5af985e31501981fef1cb3065024e9f41f70c40fc9b975"
-                  },
                   {
                     "id": "sha256:4f542ac06b9101e66033210648ba4bcc86c23f508a194d3a6ccba2966e4ade73"
                   },
@@ -1875,15 +1776,9 @@
                   {
                     "id": "sha256:37ca74f003d06ada0528d353bdc0df49193a058cece3c51173dc8b9c80f410e5"
                   },
-                  {
-                    "id": "sha256:608502ce18d504a5c666f3779ff8b7106db7171664c3816458fe65c1680f19ee"
-                  },
                   {
                     "id": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -1903,9 +1798,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2073,23 +1966,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2097,13 +1977,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-431.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2168,20 +2044,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2197,45 +2061,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2243,8 +2072,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2270,28 +2099,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2301,18 +2114,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2330,8 +2131,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -2364,9 +2165,6 @@
     "sources": {
       "org.osbuild.curl": {
         "items": {
-          "sha256:00ecb47f6d186624b15d7064eacd55e9ad5c9f9e7fba7275d0659d3f228b826b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-swap-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:017b2cf6bf46ca560b4ff8878bfa37f882c7f2589235c1f5ed20e38e69657a30": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libndp-1.7-6.el8.x86_64.rpm"
           },
@@ -2421,9 +2219,6 @@
           "sha256:09b3f89134b71bc6ed65d92628cb8161a4f3d34a16475ab3c5bbb32b33a7029b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/pam-1.3.1-24.el8.x86_64.rpm"
           },
-          "sha256:0a466ad35225cbf85b0c942450b2dd4ce942d6e5111624708ff90542d051acdc": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-utils-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:0aa18121749a7e7056ebaf2a7f588127e2af309ed127b95be75a66b8f2ecc5c5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/trousers-lib-0.3.15-1.el8.x86_64.rpm"
           },
@@ -2433,9 +2228,6 @@
           "sha256:0c0fca928fce9b38762624ef06e6672189a386dbb15b28ddbfdb51492357b09c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libmodulemd-2.13.0-1.el8.x86_64.rpm"
           },
-          "sha256:0cb4318603418836dbbb30db39430ea5d89f4fac40f641bc91d6515fc4ef08cd": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-loop-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:0d710c1d1c2b63cdc54993c268441a420f3311a2f84a30e77c7431268ea5bdcb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/audit-3.0.7-4.el8.x86_64.rpm"
           },
@@ -2466,9 +2258,6 @@
           "sha256:14175dab807188a8261298dc3ba7b7cd19a9fbf36d0ee5b5c6cacc7e424998e4": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libssh-config-0.9.6-3.el8.noarch.rpm"
           },
-          "sha256:144fb6ba0e48ba305d5654d849671c24ac82f3661557f0991f6c548e54086a32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-part-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:150e9dbb5a19483c85c25c722ff63a08d9411023c40faf88f42843fdf68ea275": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/popt-1.18-1.el8.x86_64.rpm"
           },
@@ -2508,9 +2297,6 @@
           "sha256:1cfdaa7f1de88dfb1a409b1930e2bb2fe74375d0fbfe00938a2371f81d88c56f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/NetworkManager-tui-1.40.2-1.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -2529,9 +2315,6 @@
           "sha256:226b4efe6fb8e19d17cf4ffed266a413dac4801ad804887e5e00f7fb8e6c2ef9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/platform-python-setuptools-39.2.0-6.el8.noarch.rpm"
           },
-          "sha256:2350cfe649d5156bbba7fd3be4f13dd3945243facebc8bad01db1707fd276145": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libudisks2-2.9.0-12.el8.x86_64.rpm"
-          },
           "sha256:240b40a71d01005c0c8f780e5589e3999e3d6aa34e2a5e4eaf6f845fd21c7b5b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/keyutils-libs-1.5.10-9.el8.x86_64.rpm"
           },
@@ -2565,9 +2348,6 @@
           "sha256:2733570f8ea94551f3381538f9c8642c88532c800b384c07b4db02f6b8896c3f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libattr-2.4.48-3.el8.x86_64.rpm"
           },
-          "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/fwupd-1.7.8-1.el8.x86_64.rpm"
-          },
           "sha256:283285b4c414c5d0614849e64971730af9d0037e62e535adb538166051e52e1d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libdhash-0.5.0-40.el8.x86_64.rpm"
           },
@@ -2589,9 +2369,6 @@
           "sha256:2bfb6eaf479f97a61db16efa6e6828468d3b5c6086358d88a46491a4ff6c78f8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dbus-common-1.12.8-23.el8.noarch.rpm"
           },
-          "sha256:2c3eeba223c5b9742d31138aa4adc585bd65a89bc9ccc723bbe721d997d9c11c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-crypto-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dnf-plugins-core-4.0.21-14.1.el8.noarch.rpm"
           },
@@ -2607,27 +2384,15 @@
           "sha256:2ff643bfe17476a8dfa94ea900ddf9d89ed0e5f56839f18209f8304a0e31bb2f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dmidecode-3.3-4.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
           "sha256:304d7d8d6a590a1afcd651cccd6158da0af801b5c22aa5c63e692df622b22bc0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/redhat-release-eula-8.8-0.1.el8.x86_64.rpm"
           },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
           "sha256:306bd571a6c8617903bc4cc5b89b65abaab50be1f98f69b860eee77e31c9b05d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-perf-4.18.0-431.el8.x86_64.rpm"
           },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30c6dbc7d2dd8024a16fe2d00b01fa71f4a1ea9d4af5519dc092695d4fa735cf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libss-1.45.6-5.el8.x86_64.rpm"
           },
-          "sha256:319d3d51dfc09875cdbb61518410fe2963887228089d4a9de8f673acc7a2ff82": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-softokn-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:321ab15562ad78bd1d9a87c9bda23b8a2f530ad1d09aa937e24d5ecb366fe6f4": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/NetworkManager-cloud-setup-1.40.2-1.el8.x86_64.rpm"
           },
@@ -2700,9 +2465,6 @@
           "sha256:3a9aede6732c73278d74c413ad9559c1ccf0c0bbdfd1b61734cf984e75d20367": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-configobj-5.0.6-11.el8.noarch.rpm"
           },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3d6a5eeb0da36ce36cd6ddc5e3c2d2bc36cd5962d1450077c5c5754b8f5ac02c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/glib2-2.56.4-159.el8.x86_64.rpm"
           },
@@ -2718,9 +2480,6 @@
           "sha256:4177e933095bfb14489e60f93134ba827f285a1235b60e07d6823f81a0a2091d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dbus-libs-1.12.8-23.el8.x86_64.rpm"
           },
-          "sha256:44447cbfdf0236f20f68d31e1541d43ffcc878da80b7a74691ea71819181fcef": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-fs-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:44f0d32c5f8ddf64ec80f8881272908601282dbad0642a087058e1b1ec24d669": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-libcomps-0.1.18-1.el8.x86_64.rpm"
           },
@@ -2733,9 +2492,6 @@
           "sha256:4658cf807723123b513587887bf226d0b3daf69049c13951c5f88f6196acbb7d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsss_sudo-2.7.3-4.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-pc-2.02-142.el8.x86_64.rpm"
           },
@@ -2778,9 +2534,6 @@
           "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm"
           },
-          "sha256:4bcbfd3229e3fd2d6e1adfe46bc233872c4184838de40b2e61a9ba84fcb81512": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-softokn-freebl-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:4bdac8b052ea5031f85f17e8f8499d491cc2ea8d5110467c5a0e4ec7b7763c2d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/authselect-compat-1.2.5-1.el8.x86_64.rpm"
           },
@@ -2814,9 +2567,6 @@
           "sha256:50603f9a5c2a643252949c922d656c83194047469116a33c3c265871bfd0a531": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dnf-data-4.7.0-11.el8.noarch.rpm"
           },
-          "sha256:507c1a196520e4263a0581e70b669c352097d6bdc7a5409ae748ee3942e71f5c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-sysinit-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:51eb082082e78afa70dd64591219c026d11cf7a6adf3771a36624c80be34dc3e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/nettle-3.4.1-7.el8.x86_64.rpm"
           },
@@ -2877,9 +2627,6 @@
           "sha256:5ffaf4869bdd844266a156b9f1fda9d64e4f79db592384a145bf064aaca47b41": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/lshw-B.02.19.2-6.el8.x86_64.rpm"
           },
-          "sha256:608502ce18d504a5c666f3779ff8b7106db7171664c3816458fe65c1680f19ee": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/udisks2-2.9.0-12.el8.x86_64.rpm"
-          },
           "sha256:60fe236d60faf42f2685db44f40508f7bf036d3ff5624e2727d5c50436a87c56": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgomp-8.5.0-17.el8.x86_64.rpm"
           },
@@ -2916,9 +2663,6 @@
           "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsolv-0.7.20-3.el8.x86_64.rpm"
           },
-          "sha256:694ba7edf36a3cf125b914dd638de18fa4d0928f046da1bda32f78c8f94439e2": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:6950a3136327480137b0c3ed7555bd36d107ebb39b687354d2d34c5542e19d2d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dbus-1.12.8-23.el8.x86_64.rpm"
           },
@@ -2937,9 +2681,6 @@
           "sha256:6d7a41fb238610416349a53d024cc505ab7f3f6e9953cc2244abb663ec404dad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/ncurses-6.1-9.20180224.el8.x86_64.rpm"
           },
-          "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm"
-          },
           "sha256:6dec9fcb8adb571e5de0e5c0c7bcc71a1142fcf2466394304102cf17b349513f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libdnf-0.63.0-11.1.el8.x86_64.rpm"
           },
@@ -2958,9 +2699,6 @@
           "sha256:709fb09876846df58d761b2ddb973bbf2b870d995452648ef929a2cdf3ea8216": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libarchive-3.3.3-4.el8.x86_64.rpm"
           },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
           "sha256:71676aca45858e9e25878e4153d08e31beef91a916b85547105c8f911e4c29ca": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-policycoreutils-2.9-20.el8.noarch.rpm"
           },
@@ -3048,18 +2786,12 @@
           "sha256:821923c32f6cd4c764ea7e97bee3335993d405694aa81b923cf1ef46c9e03cf9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/rhc-0.2.1-9.el8.x86_64.rpm"
           },
-          "sha256:82cd233003b87e6b810070eead73ec44073050aabccec9a619309074a1868fe9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nspr-4.34.0-3.el8_6.x86_64.rpm"
-          },
           "sha256:830940ac1860e506f78be51323f21144a40e6244eff2331c1648da06baee9ea6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dhcp-libs-4.3.6-48.el8.x86_64.rpm"
           },
           "sha256:84c4a7d89325e5d405712dff6db06ef55996a09faf7490c1693d032171730777": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/procps-ng-3.3.15-9.el8.x86_64.rpm"
           },
-          "sha256:85d03de6ce794c8ce61c85ba84a79df6d49559cccc1b1deb572aa3c8e52f7c1b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-mdraid-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:862e75a1cf6aa5be750a530c8ce8b999d0b2efe9737e20f37f9f9153a82e56fa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libassuan-2.5.1-3.el8.x86_64.rpm"
           },
@@ -3081,9 +2813,6 @@
           "sha256:88f6945f8c7875f85a8f6befdfee8f3460f6f929fc6fb64eba1411bf8c2c6361": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-audit-3.0.7-4.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8af1caa726c0b3b398eed421511ff26222f3ddfa131b90fedaa4fe464216338c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgcrypt-1.8.5-7.el8_6.x86_64.rpm"
           },
@@ -3093,9 +2822,6 @@
           "sha256:8c6da26441750b3970fe73b6a9d2d780931da6cdea48f10d0b34c65c79a9e341": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/python3-jinja2-2.10.1-3.el8.noarch.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8d371e753071edc796d2eadb8278980290511be6279fdf46649c81b859497d6a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/prefixdevname-0.1.0-6.el8.x86_64.rpm"
           },
@@ -3141,9 +2867,6 @@
           "sha256:9461fa7a5e74bfd8d9e9961af9d3003d9d2b496830c2fd6b0641ae8b8bc8e178": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libacl-2.2.53-1.el8.x86_64.rpm"
           },
-          "sha256:94d5c3946873b079aa5af985e31501981fef1cb3065024e9f41f70c40fc9b975": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-util-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:95a49f92900d79b2d02c879e1eef3d92947e7f3294d65044b31ebb435f7ac705": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/glibc-2.28-216.el8.x86_64.rpm"
           },
@@ -3255,15 +2978,6 @@
           "sha256:ae6dd4ea3852d1ce30a0988bde8d35e91a8b0709615e3ac64c65a5e24e68fefa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/device-mapper-libs-1.02.181-6.el8.x86_64.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
-          "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-3.79.0-10.el8_6.x86_64.rpm"
-          },
           "sha256:af00ed7ea481e1fadd410520c479e751fa3b58d00b7dc93af8da937ae9d9528d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/selinux-policy-targeted-3.14.3-109.el8.noarch.rpm"
           },
@@ -3303,9 +3017,6 @@
           "sha256:b4babe48d93eccce4f0249ba34d592bfc306c3b14b40df7a5cc9eaec2eaae20f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/numactl-libs-2.0.12-13.el8.x86_64.rpm"
           },
-          "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/mokutil-0.3.0-12.el8.x86_64.rpm"
-          },
           "sha256:b76a180508132aaceb8dcebc5de9cec87d3459a39e4749f9af342d242c410dab": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/oddjob-mkhomedir-0.34.7-2.el8.x86_64.rpm"
           },
@@ -3474,18 +3185,12 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d570af0578f5b2c6225f1f2354404f65bccf91c3974e98dcbc0c7b55a61b9b46": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grep-3.1-6.el8.x86_64.rpm"
           },
           "sha256:d67580b9b2af79f599f77c35c694714d2d39d2ea01c28e8aaca1312e6ab25184": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-libselinux-2.9-6.el8.x86_64.rpm"
           },
-          "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/shim-x64-15.6-1.el8.x86_64.rpm"
-          },
           "sha256:d94ea399f82d4f9537af1098a588c5cc9a80454ba7c1de9b26dd11cb5c730d8a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-requests-2.20.0-2.1.el8_1.noarch.rpm"
           },
@@ -3519,9 +3224,6 @@
           "sha256:e29131b502b6a199003ed61e27eb3e5cb3d46f4b4a3f8ca1034945a406dcfe80": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsemanage-2.9-9.el8.x86_64.rpm"
           },
-          "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/mdadm-4.2-5.el8.x86_64.rpm"
-          },
           "sha256:e4f799b634299835dc1a8e79adcfb223d13b369bd033cbdb14170f845c9464ad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/ethtool-5.13-2.el8.x86_64.rpm"
           },
@@ -3633,9 +3335,6 @@
           "sha256:fc46ac94289cd660db8452aa7093c446b0f087cda089b3c3aeeb988286d80ee2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/systemd-239-68.el8.x86_64.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
           "sha256:fd60066d9141529ea385fa8fc3af88d0f6ac0cb7a8515af0abe9b65498707f6f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-urllib3-1.24.2-5.el8.noarch.rpm"
           },
@@ -3900,15 +3599,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5378,15 +5068,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2-libs",
         "epoch": 0,
@@ -5711,15 +5392,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dnf-plugins-core-4.0.21-14.1.el8.noarch.rpm",
         "checksum": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -5783,33 +5455,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/e2fsprogs-libs-1.45.6-5.el8.x86_64.rpm",
         "checksum": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -5918,15 +5563,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/fuse-libs-2.9.7-16.el8.x86_64.rpm",
         "checksum": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.8",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/fwupd-1.7.8-1.el8.x86_64.rpm",
-        "checksum": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -6107,15 +5743,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-common-2.02-142.el8.noarch.rpm",
         "checksum": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "142.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
-        "checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -6647,15 +6274,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -6692,24 +6310,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libidn2",
         "epoch": 0,
@@ -7007,15 +6607,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsmartcols-2.32.1-38.el8.x86_64.rpm",
         "checksum": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -7241,15 +6832,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libxml2-2.9.7-15.el8.x86_64.rpm",
         "checksum": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libyaml",
         "epoch": 0,
@@ -7349,15 +6931,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm",
         "checksum": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.2",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/mdadm-4.2-5.el8.x86_64.rpm",
-        "checksum": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -7376,15 +6949,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/microcode_ctl-20220809-1.el8.x86_64.rpm",
         "checksum": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/mokutil-0.3.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -8339,15 +7903,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.6",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/shim-x64-15.6-1.el8.x86_64.rpm",
-        "checksum": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -8726,96 +8281,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:694ba7edf36a3cf125b914dd638de18fa4d0928f046da1bda32f78c8f94439e2"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-crypto-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:2c3eeba223c5b9742d31138aa4adc585bd65a89bc9ccc723bbe721d997d9c11c"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-fs-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:44447cbfdf0236f20f68d31e1541d43ffcc878da80b7a74691ea71819181fcef"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-loop-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:0cb4318603418836dbbb30db39430ea5d89f4fac40f641bc91d6515fc4ef08cd"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-mdraid-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:85d03de6ce794c8ce61c85ba84a79df6d49559cccc1b1deb572aa3c8e52f7c1b"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-part-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:144fb6ba0e48ba305d5654d849671c24ac82f3661557f0991f6c548e54086a32"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-swap-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:00ecb47f6d186624b15d7064eacd55e9ad5c9f9e7fba7275d0659d3f228b826b"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-utils-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:0a466ad35225cbf85b0c942450b2dd4ce942d6e5111624708ff90542d051acdc"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -8843,15 +8308,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libudisks2-2.9.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:2350cfe649d5156bbba7fd3be4f13dd3945243facebc8bad01db1707fd276145"
-      },
       {
         "name": "libxkbcommon",
         "epoch": 0,
@@ -8861,60 +8317,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libxkbcommon-0.9.1-1.el8.x86_64.rpm",
         "checksum": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
       },
-      {
-        "name": "nspr",
-        "epoch": 0,
-        "version": "4.34.0",
-        "release": "3.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nspr-4.34.0-3.el8_6.x86_64.rpm",
-        "checksum": "sha256:82cd233003b87e6b810070eead73ec44073050aabccec9a619309074a1868fe9"
-      },
-      {
-        "name": "nss",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a"
-      },
-      {
-        "name": "nss-softokn",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-softokn-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:319d3d51dfc09875cdbb61518410fe2963887228089d4a9de8f673acc7a2ff82"
-      },
-      {
-        "name": "nss-softokn-freebl",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-softokn-freebl-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:4bcbfd3229e3fd2d6e1adfe46bc233872c4184838de40b2e61a9ba84fcb81512"
-      },
-      {
-        "name": "nss-sysinit",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-sysinit-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:507c1a196520e4263a0581e70b669c352097d6bdc7a5409ae748ee3942e71f5c"
-      },
-      {
-        "name": "nss-util",
-        "epoch": 0,
-        "version": "3.79.0",
-        "release": "10.el8_6",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-util-3.79.0-10.el8_6.x86_64.rpm",
-        "checksum": "sha256:94d5c3946873b079aa5af985e31501981fef1cb3065024e9f41f70c40fc9b975"
-      },
       {
         "name": "oddjob",
         "epoch": 0,
@@ -9068,15 +8470,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/rsyslog-8.2102.0-10.el8.x86_64.rpm",
         "checksum": "sha256:37ca74f003d06ada0528d353bdc0df49193a058cece3c51173dc8b9c80f410e5"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/udisks2-2.9.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:608502ce18d504a5c666f3779ff8b7106db7171664c3816458fe65c1680f19ee"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -9086,15 +8479,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/unbound-libs-1.16.2-2.el8.x86_64.rpm",
         "checksum": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json
index 81ac5605e..31866b918 100644
--- a/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-ec2_ha-boot.json
@@ -129,9 +129,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -658,9 +655,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:ac5e4942921cee7c931186db79f14c54ddda3d98756e37bd6bb5b0a1024f0e82"
                   },
@@ -790,9 +784,6 @@
                   {
                     "id": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -814,15 +805,6 @@
                   {
                     "id": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:45c47f5146e39f50ca18d1561821607bc582c5fd4de0bf05bc06a5e0eb33df34"
                   },
@@ -862,9 +844,6 @@
                   {
                     "id": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
                   },
-                  {
-                    "id": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-                  },
                   {
                     "id": "sha256:59b3cff57ffbea4c4c011e6a81341a1203c18b91569fff019c93b756331300f8"
                   },
@@ -925,9 +904,6 @@
                   {
                     "id": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
                   },
-                  {
-                    "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-                  },
                   {
                     "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
                   },
@@ -1120,9 +1096,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:2cd7f54b726250042483f37e513645c240beec147cbfa959cd689b306d36d103"
                   },
@@ -1135,12 +1108,6 @@
                   {
                     "id": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
                   },
-                  {
-                    "id": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-                  },
-                  {
-                    "id": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-                  },
                   {
                     "id": "sha256:fe37f767487e0806535a06cda4e302555c27166b6320657ae945d5217b8c36aa"
                   },
@@ -1246,9 +1213,6 @@
                   {
                     "id": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8"
                   },
@@ -1327,9 +1291,6 @@
                   {
                     "id": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15"
                   },
@@ -1372,18 +1333,12 @@
                   {
                     "id": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
                   },
-                  {
-                    "id": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-                  },
                   {
                     "id": "sha256:ca6208d771fbbfc703217b0f4314d214a866da86b105f222753a6efeb12d6f69"
                   },
                   {
                     "id": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
                   },
-                  {
-                    "id": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -1837,9 +1792,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -2095,36 +2047,6 @@
                   {
                     "id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
                   },
-                  {
-                    "id": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-                  },
-                  {
-                    "id": "sha256:694ba7edf36a3cf125b914dd638de18fa4d0928f046da1bda32f78c8f94439e2"
-                  },
-                  {
-                    "id": "sha256:2c3eeba223c5b9742d31138aa4adc585bd65a89bc9ccc723bbe721d997d9c11c"
-                  },
-                  {
-                    "id": "sha256:44447cbfdf0236f20f68d31e1541d43ffcc878da80b7a74691ea71819181fcef"
-                  },
-                  {
-                    "id": "sha256:0cb4318603418836dbbb30db39430ea5d89f4fac40f641bc91d6515fc4ef08cd"
-                  },
-                  {
-                    "id": "sha256:85d03de6ce794c8ce61c85ba84a79df6d49559cccc1b1deb572aa3c8e52f7c1b"
-                  },
-                  {
-                    "id": "sha256:144fb6ba0e48ba305d5654d849671c24ac82f3661557f0991f6c548e54086a32"
-                  },
-                  {
-                    "id": "sha256:00ecb47f6d186624b15d7064eacd55e9ad5c9f9e7fba7275d0659d3f228b826b"
-                  },
-                  {
-                    "id": "sha256:0a466ad35225cbf85b0c942450b2dd4ce942d6e5111624708ff90542d051acdc"
-                  },
-                  {
-                    "id": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-                  },
                   {
                     "id": "sha256:d16252dcb91c3e581ecb29234180fb99ac3199a052a89d0e23603cb6054bee16"
                   },
@@ -2137,9 +2059,6 @@
                   {
                     "id": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
                   },
-                  {
-                    "id": "sha256:2350cfe649d5156bbba7fd3be4f13dd3945243facebc8bad01db1707fd276145"
-                  },
                   {
                     "id": "sha256:34001e2596b82803f289adefe1a263b61917e8a67ff8e45d9ff5fc1ca150eb57"
                   },
@@ -2329,15 +2248,9 @@
                   {
                     "id": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
                   },
-                  {
-                    "id": "sha256:608502ce18d504a5c666f3779ff8b7106db7171664c3816458fe65c1680f19ee"
-                  },
                   {
                     "id": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
                   },
-                  {
-                    "id": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-                  },
                   {
                     "id": "sha256:340b3c65becfca3d39f2afeed9659505a33ee870270c4d115d9fefe8929ff806"
                   },
@@ -2418,9 +2331,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -2588,23 +2499,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -2612,13 +2510,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-431.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -2683,20 +2577,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -2712,45 +2594,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -2758,8 +2605,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -2785,28 +2632,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -2816,18 +2647,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -2845,8 +2664,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -2879,9 +2698,6 @@
     "sources": {
       "org.osbuild.curl": {
         "items": {
-          "sha256:00ecb47f6d186624b15d7064eacd55e9ad5c9f9e7fba7275d0659d3f228b826b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-swap-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:0178d3f292043e23199cf363579499565ede01af6214902f4a737fb5c28caa0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/fence-agents-ipdu-4.2.1-107.el8.noarch.rpm"
           },
@@ -2945,9 +2761,6 @@
           "sha256:0a308d1d53d328b959ad035797d7614c020e78bc5a970fe705924c3e97625858": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/pacemaker-schemas-2.1.4-5.el8.noarch.rpm"
           },
-          "sha256:0a466ad35225cbf85b0c942450b2dd4ce942d6e5111624708ff90542d051acdc": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-utils-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:0a7bb0319bedac10e172b6241902c7bc1859d867b030f8d80d36df39890e1e06": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/pacemaker-cluster-libs-2.1.4-5.el8.x86_64.rpm"
           },
@@ -2963,9 +2776,6 @@
           "sha256:0c0fca928fce9b38762624ef06e6672189a386dbb15b28ddbfdb51492357b09c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libmodulemd-2.13.0-1.el8.x86_64.rpm"
           },
-          "sha256:0cb4318603418836dbbb30db39430ea5d89f4fac40f641bc91d6515fc4ef08cd": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-loop-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:0d3f8e14265aa162bfcec4aff8064fa26188f1e51e897f20760bab906a9f9e5e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/perl-threads-2.21-2.el8.x86_64.rpm"
           },
@@ -3029,9 +2839,6 @@
           "sha256:14175dab807188a8261298dc3ba7b7cd19a9fbf36d0ee5b5c6cacc7e424998e4": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libssh-config-0.9.6-3.el8.noarch.rpm"
           },
-          "sha256:144fb6ba0e48ba305d5654d849671c24ac82f3661557f0991f6c548e54086a32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-part-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:14bdf3842e51213afe2488cd83c274f239e77535210c137d438ac7bd6b299f65": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/lvm2-libs-2.03.14-6.el8.x86_64.rpm"
           },
@@ -3092,9 +2899,6 @@
           "sha256:1cfdaa7f1de88dfb1a409b1930e2bb2fe74375d0fbfe00938a2371f81d88c56f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/NetworkManager-tui-1.40.2-1.el8.x86_64.rpm"
           },
-          "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libatasmart-0.19-14.el8.x86_64.rpm"
-          },
           "sha256:1dc1dbd0aa4dad715b3242468d4841f2f35bf6aa60d8e1928ee692784b12da1e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsecret-0.18.6-1.el8.x86_64.rpm"
           },
@@ -3122,9 +2926,6 @@
           "sha256:22d4d64559350664aa77d4534ee82dcfc26b4146d738af14ef87d2f4dfb3af90": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/rubygems-2.7.6.3-110.module+el8.6.0+15956+aa803fc1.noarch.rpm"
           },
-          "sha256:2350cfe649d5156bbba7fd3be4f13dd3945243facebc8bad01db1707fd276145": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libudisks2-2.9.0-12.el8.x86_64.rpm"
-          },
           "sha256:240b40a71d01005c0c8f780e5589e3999e3d6aa34e2a5e4eaf6f845fd21c7b5b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/keyutils-libs-1.5.10-9.el8.x86_64.rpm"
           },
@@ -3167,9 +2968,6 @@
           "sha256:2733570f8ea94551f3381538f9c8642c88532c800b384c07b4db02f6b8896c3f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libattr-2.4.48-3.el8.x86_64.rpm"
           },
-          "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/fwupd-1.7.8-1.el8.x86_64.rpm"
-          },
           "sha256:27efba5e62430987380ca7f2e4185e1d27c517a6f8d22958dd3fd0bc2591d3fe": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/rubygem-io-console-0.4.6-110.module+el8.6.0+15956+aa803fc1.x86_64.rpm"
           },
@@ -3209,9 +3007,6 @@
           "sha256:2bfb6eaf479f97a61db16efa6e6828468d3b5c6086358d88a46491a4ff6c78f8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dbus-common-1.12.8-23.el8.noarch.rpm"
           },
-          "sha256:2c3eeba223c5b9742d31138aa4adc585bd65a89bc9ccc723bbe721d997d9c11c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-crypto-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dnf-plugins-core-4.0.21-14.1.el8.noarch.rpm"
           },
@@ -3230,21 +3025,12 @@
           "sha256:2ff643bfe17476a8dfa94ea900ddf9d89ed0e5f56839f18209f8304a0e31bb2f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dmidecode-3.3-4.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
           "sha256:304d7d8d6a590a1afcd651cccd6158da0af801b5c22aa5c63e692df622b22bc0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/redhat-release-eula-8.8-0.1.el8.x86_64.rpm"
           },
-          "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgusb-0.3.0-1.el8.x86_64.rpm"
-          },
           "sha256:306bd571a6c8617903bc4cc5b89b65abaab50be1f98f69b860eee77e31c9b05d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-perf-4.18.0-431.el8.x86_64.rpm"
           },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30c6dbc7d2dd8024a16fe2d00b01fa71f4a1ea9d4af5519dc092695d4fa735cf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libss-1.45.6-5.el8.x86_64.rpm"
           },
@@ -3335,9 +3121,6 @@
           "sha256:3a9aede6732c73278d74c413ad9559c1ccf0c0bbdfd1b61734cf984e75d20367": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-configobj-5.0.6-11.el8.noarch.rpm"
           },
-          "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
-          },
           "sha256:3d6a5eeb0da36ce36cd6ddc5e3c2d2bc36cd5962d1450077c5c5754b8f5ac02c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/glib2-2.56.4-159.el8.x86_64.rpm"
           },
@@ -3374,9 +3157,6 @@
           "sha256:4361f417458cf707b9018d51a87ad76ec90b410cff38d232f3a83ac9f2a3f4b3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/fence-agents-hpblade-4.2.1-107.el8.noarch.rpm"
           },
-          "sha256:44447cbfdf0236f20f68d31e1541d43ffcc878da80b7a74691ea71819181fcef": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-fs-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:44f0d32c5f8ddf64ec80f8881272908601282dbad0642a087058e1b1ec24d669": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-libcomps-0.1.18-1.el8.x86_64.rpm"
           },
@@ -3395,9 +3175,6 @@
           "sha256:46e8d326546d5850b837e4fb1a9b77f58ba498956c23ac078f79ea7f15181c69": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/ruby-libs-2.5.9-110.module+el8.6.0+15956+aa803fc1.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-pc-2.02-142.el8.x86_64.rpm"
           },
@@ -3584,9 +3361,6 @@
           "sha256:5ffaf4869bdd844266a156b9f1fda9d64e4f79db592384a145bf064aaca47b41": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/lshw-B.02.19.2-6.el8.x86_64.rpm"
           },
-          "sha256:608502ce18d504a5c666f3779ff8b7106db7171664c3816458fe65c1680f19ee": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/udisks2-2.9.0-12.el8.x86_64.rpm"
-          },
           "sha256:60fe236d60faf42f2685db44f40508f7bf036d3ff5624e2727d5c50436a87c56": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgomp-8.5.0-17.el8.x86_64.rpm"
           },
@@ -3635,9 +3409,6 @@
           "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsolv-0.7.20-3.el8.x86_64.rpm"
           },
-          "sha256:694ba7edf36a3cf125b914dd638de18fa4d0928f046da1bda32f78c8f94439e2": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:6950a3136327480137b0c3ed7555bd36d107ebb39b687354d2d34c5542e19d2d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dbus-1.12.8-23.el8.x86_64.rpm"
           },
@@ -3665,9 +3436,6 @@
           "sha256:6d7a41fb238610416349a53d024cc505ab7f3f6e9953cc2244abb663ec404dad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/ncurses-6.1-9.20180224.el8.x86_64.rpm"
           },
-          "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm"
-          },
           "sha256:6dd24bbdf5a94e53c5e1ccc1164eed48cafebdd27da5154e7648bf1b36f2bd7d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/fence-agents-ifmib-4.2.1-107.el8.noarch.rpm"
           },
@@ -3692,9 +3460,6 @@
           "sha256:709fb09876846df58d761b2ddb973bbf2b870d995452648ef929a2cdf3ea8216": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libarchive-3.3.3-4.el8.x86_64.rpm"
           },
-          "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgudev-232-4.el8.x86_64.rpm"
-          },
           "sha256:71676aca45858e9e25878e4153d08e31beef91a916b85547105c8f911e4c29ca": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-policycoreutils-2.9-20.el8.noarch.rpm"
           },
@@ -3845,9 +3610,6 @@
           "sha256:84c4a7d89325e5d405712dff6db06ef55996a09faf7490c1693d032171730777": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/procps-ng-3.3.15-9.el8.x86_64.rpm"
           },
-          "sha256:85d03de6ce794c8ce61c85ba84a79df6d49559cccc1b1deb572aa3c8e52f7c1b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-mdraid-2.28-1.el8.x86_64.rpm"
-          },
           "sha256:862aa5c98f0bd869f0868281e52a6f8819b3f9e9d632bc902d6deb88f8acc51a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/fence-agents-intelmodular-4.2.1-107.el8.noarch.rpm"
           },
@@ -3875,9 +3637,6 @@
           "sha256:891b4ffa90ef5369b7a846fabe4ce87e0d7e604fa31a43104b93c7f5654bbb7c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libwbclient-4.16.4-2.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8af1caa726c0b3b398eed421511ff26222f3ddfa131b90fedaa4fe464216338c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgcrypt-1.8.5-7.el8_6.x86_64.rpm"
           },
@@ -3887,9 +3646,6 @@
           "sha256:8c6da26441750b3970fe73b6a9d2d780931da6cdea48f10d0b34c65c79a9e341": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/python3-jinja2-2.10.1-3.el8.noarch.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8d371e753071edc796d2eadb8278980290511be6279fdf46649c81b859497d6a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/prefixdevname-0.1.0-6.el8.x86_64.rpm"
           },
@@ -4106,12 +3862,6 @@
           "sha256:ae6dd4ea3852d1ce30a0988bde8d35e91a8b0709615e3ac64c65a5e24e68fefa": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/device-mapper-libs-1.02.181-6.el8.x86_64.rpm"
           },
-          "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
-          },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-3.79.0-10.el8_6.x86_64.rpm"
           },
@@ -4172,9 +3922,6 @@
           "sha256:b516896f3b3a83a1a5c9d0d6e84b025ecdb8d3676cbb195751b44224ad720078": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-ha-n8.8-20221025/Packages/pacemaker-cli-2.1.4-5.el8.x86_64.rpm"
           },
-          "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/mokutil-0.3.0-12.el8.x86_64.rpm"
-          },
           "sha256:b76a180508132aaceb8dcebc5de9cec87d3459a39e4749f9af342d242c410dab": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/oddjob-mkhomedir-0.34.7-2.el8.x86_64.rpm"
           },
@@ -4400,9 +4147,6 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d570af0578f5b2c6225f1f2354404f65bccf91c3974e98dcbc0c7b55a61b9b46": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grep-3.1-6.el8.x86_64.rpm"
           },
@@ -4412,9 +4156,6 @@
           "sha256:d71e828ca8bf6bfe31ff87d8b30861e16d1767fa18f9ff0fd4056170ed874065": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/fence-virt-1.0.0-3.el8.x86_64.rpm"
           },
-          "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/shim-x64-15.6-1.el8.x86_64.rpm"
-          },
           "sha256:d8f93540a6a7329a5158d3e543f77110104f30494f4d6f187427e5010d8df379": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libaio-0.3.112-1.el8.x86_64.rpm"
           },
@@ -4475,9 +4216,6 @@
           "sha256:e33a380e981f44fb1e1987142e4a41bf3dbeb452490f2030876d221640c52e14": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/samba-client-libs-4.16.4-2.el8.x86_64.rpm"
           },
-          "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/mdadm-4.2-5.el8.x86_64.rpm"
-          },
           "sha256:e4f799b634299835dc1a8e79adcfb223d13b369bd033cbdb14170f845c9464ad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/ethtool-5.13-2.el8.x86_64.rpm"
           },
@@ -4640,9 +4378,6 @@
           "sha256:fc46ac94289cd660db8452aa7093c446b0f087cda089b3c3aeeb988286d80ee2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/systemd-239-68.el8.x86_64.rpm"
           },
-          "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dosfstools-4.1-6.el8.x86_64.rpm"
-          },
           "sha256:fd60066d9141529ea385fa8fc3af88d0f6ac0cb7a8515af0abe9b65498707f6f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-urllib3-1.24.2-5.el8.noarch.rpm"
           },
@@ -4910,15 +4645,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -6397,15 +6123,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2",
         "epoch": 0,
@@ -6793,15 +6510,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dnf-plugins-core-4.0.21-14.1.el8.noarch.rpm",
         "checksum": "sha256:2c64abeeb3befc3f627cc10a1a6ef5b0bfc194d4698195c73162b64228882711"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -6865,33 +6573,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/e2fsprogs-libs-1.45.6-5.el8.x86_64.rpm",
         "checksum": "sha256:8e0e23d6a9399d9016d721467181d9abd3e888894149767b631889f1aeddf755"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -7009,15 +6690,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/fuse-libs-2.9.7-16.el8.x86_64.rpm",
         "checksum": "sha256:be62c3c22fe4351a434d5b971061e512db199d763205dd8aaf4c6faa35a9be42"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.8",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/fwupd-1.7.8-1.el8.x86_64.rpm",
-        "checksum": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -7198,15 +6870,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-common-2.02-142.el8.noarch.rpm",
         "checksum": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "142.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
-        "checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -7783,15 +7446,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -7828,24 +7482,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgpg-error-1.31-1.el8.x86_64.rpm",
         "checksum": "sha256:4bef8c6105544198bc4c5fecd21202bcf7823dda888cbe3fee888ee936c46bd9"
       },
-      {
-        "name": "libgudev",
-        "epoch": 0,
-        "version": "232",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgudev-232-4.el8.x86_64.rpm",
-        "checksum": "sha256:713ec69b972a8e88622b3fcd3b84fccdbd6c333b68b6c52151c2350edad2576a"
-      },
-      {
-        "name": "libgusb",
-        "epoch": 0,
-        "version": "0.3.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgusb-0.3.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:305ec4b5026b8ecffdfdf253e24c96aba795e9d07d17d3cad2d9e5573b641728"
-      },
       {
         "name": "libicu",
         "epoch": 0,
@@ -8161,15 +7797,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsmartcols-2.32.1-38.el8.x86_64.rpm",
         "checksum": "sha256:d15c8594702ab51f8aa792a6c0ebae49ddefc8740289397b2cd8cb6e4a711187"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -8404,15 +8031,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libxml2-2.9.7-15.el8.x86_64.rpm",
         "checksum": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libxslt",
         "epoch": 0,
@@ -8539,15 +8157,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm",
         "checksum": "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479"
       },
-      {
-        "name": "mdadm",
-        "epoch": 0,
-        "version": "4.2",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/mdadm-4.2-5.el8.x86_64.rpm",
-        "checksum": "sha256:e42b1e17b93e68510f5140bc010bfdd2f746caa6b52ebd3071bda8d4001af9de"
-      },
       {
         "name": "memstrack",
         "epoch": 0,
@@ -8566,15 +8175,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/microcode_ctl-20220809-1.el8.x86_64.rpm",
         "checksum": "sha256:d3e15db6aaa6d8ba4587408d87863b2f94092024bbb94893faa95c5d259a97d4"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/mokutil-0.3.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -9934,15 +9534,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.6",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/shim-x64-15.6-1.el8.x86_64.rpm",
-        "checksum": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-      },
       {
         "name": "slang",
         "epoch": 0,
@@ -10708,96 +10299,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/langpacks-en-1.0-12.el8.noarch.rpm",
         "checksum": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
       },
-      {
-        "name": "libatasmart",
-        "epoch": 0,
-        "version": "0.19",
-        "release": "14.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libatasmart-0.19-14.el8.x86_64.rpm",
-        "checksum": "sha256:1dac1f15a0b4e95d69e8903e7f8fb77e2f02318462490e3c30f3eeebd4cba37e"
-      },
-      {
-        "name": "libblockdev",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:694ba7edf36a3cf125b914dd638de18fa4d0928f046da1bda32f78c8f94439e2"
-      },
-      {
-        "name": "libblockdev-crypto",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-crypto-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:2c3eeba223c5b9742d31138aa4adc585bd65a89bc9ccc723bbe721d997d9c11c"
-      },
-      {
-        "name": "libblockdev-fs",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-fs-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:44447cbfdf0236f20f68d31e1541d43ffcc878da80b7a74691ea71819181fcef"
-      },
-      {
-        "name": "libblockdev-loop",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-loop-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:0cb4318603418836dbbb30db39430ea5d89f4fac40f641bc91d6515fc4ef08cd"
-      },
-      {
-        "name": "libblockdev-mdraid",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-mdraid-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:85d03de6ce794c8ce61c85ba84a79df6d49559cccc1b1deb572aa3c8e52f7c1b"
-      },
-      {
-        "name": "libblockdev-part",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-part-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:144fb6ba0e48ba305d5654d849671c24ac82f3661557f0991f6c548e54086a32"
-      },
-      {
-        "name": "libblockdev-swap",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-swap-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:00ecb47f6d186624b15d7064eacd55e9ad5c9f9e7fba7275d0659d3f228b826b"
-      },
-      {
-        "name": "libblockdev-utils",
-        "epoch": 0,
-        "version": "2.28",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-utils-2.28-1.el8.x86_64.rpm",
-        "checksum": "sha256:0a466ad35225cbf85b0c942450b2dd4ce942d6e5111624708ff90542d051acdc"
-      },
-      {
-        "name": "libbytesize",
-        "epoch": 0,
-        "version": "1.4",
-        "release": "3.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libbytesize-1.4-3.el8.x86_64.rpm",
-        "checksum": "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731"
-      },
       {
         "name": "libestr",
         "epoch": 0,
@@ -10834,15 +10335,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libmaxminddb-1.2.0-10.el8.x86_64.rpm",
         "checksum": "sha256:995a5401cd86404d14d08c0aeafeaa8da3f540b1806f9d0e233d75dec9e45c74"
       },
-      {
-        "name": "libudisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libudisks2-2.9.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:2350cfe649d5156bbba7fd3be4f13dd3945243facebc8bad01db1707fd276145"
-      },
       {
         "name": "libverto-libev",
         "epoch": 0,
@@ -11410,15 +10902,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/telnet-0.17-76.el8.x86_64.rpm",
         "checksum": "sha256:bafc9ec3dd737b0dbdf179b9d9b4c8a9b5c1a92423eae1e4eb3047522107695e"
       },
-      {
-        "name": "udisks2",
-        "epoch": 0,
-        "version": "2.9.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/udisks2-2.9.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:608502ce18d504a5c666f3779ff8b7106db7171664c3816458fe65c1680f19ee"
-      },
       {
         "name": "unbound-libs",
         "epoch": 0,
@@ -11428,15 +10911,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/unbound-libs-1.16.2-2.el8.x86_64.rpm",
         "checksum": "sha256:95b90e970f76a3ef6581c9e789fc9976ef8921f6ba58844f56c7e42e6c1786e3"
       },
-      {
-        "name": "volume_key-libs",
-        "epoch": 0,
-        "version": "0.3.11",
-        "release": "5.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm",
-        "checksum": "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c"
-      },
       {
         "name": "xkeyboard-config",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json
index 06201dd82..b6f88e3fc 100644
--- a/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-ec2_sap-boot.json
@@ -154,9 +154,6 @@
                   {
                     "id": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
                   },
-                  {
-                    "id": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-                  },
                   {
                     "id": "sha256:296e764bb6e34fff539d6efdb5ffbcc2f3649e97989ed9a39bd2aaecf1598c80"
                   },
@@ -725,9 +722,6 @@
                   {
                     "id": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
                   },
-                  {
-                    "id": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-                  },
                   {
                     "id": "sha256:ac5e4942921cee7c931186db79f14c54ddda3d98756e37bd6bb5b0a1024f0e82"
                   },
@@ -914,15 +908,6 @@
                   {
                     "id": "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368"
                   },
-                  {
-                    "id": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-                  },
-                  {
-                    "id": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-                  },
-                  {
-                    "id": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-                  },
                   {
                     "id": "sha256:45c47f5146e39f50ca18d1561821607bc582c5fd4de0bf05bc06a5e0eb33df34"
                   },
@@ -980,9 +965,6 @@
                   {
                     "id": "sha256:c33debf1cedf1a6c38ed7e2bc37416a3b2c26d27c0ced755fd640cb49db95987"
                   },
-                  {
-                    "id": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-                  },
                   {
                     "id": "sha256:59b3cff57ffbea4c4c011e6a81341a1203c18b91569fff019c93b756331300f8"
                   },
@@ -1049,9 +1031,6 @@
                   {
                     "id": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
                   },
-                  {
-                    "id": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-                  },
                   {
                     "id": "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d"
                   },
@@ -1289,9 +1268,6 @@
                   {
                     "id": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
                   },
-                  {
-                    "id": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-                  },
                   {
                     "id": "sha256:2cd7f54b726250042483f37e513645c240beec147cbfa959cd689b306d36d103"
                   },
@@ -1448,9 +1424,6 @@
                   {
                     "id": "sha256:cfa953b5825141026d5e6cd951f5aca15a88e8998e297e07d537e4aae8da5b21"
                   },
-                  {
-                    "id": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-                  },
                   {
                     "id": "sha256:68b01bee73a8421c1e1134e206bd765118c93595c2d894081453e49d194cc9e8"
                   },
@@ -1541,9 +1514,6 @@
                   {
                     "id": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
                   },
-                  {
-                    "id": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-                  },
                   {
                     "id": "sha256:c5de92eae3182b972bf0d6d59d33c0d50fc1cae852252b47a4babd0020821d15"
                   },
@@ -1616,9 +1586,6 @@
                   {
                     "id": "sha256:48e1edacae05696360d0dd0706b2d3debb617ae15e9f7ce47e528839231a6c25"
                   },
-                  {
-                    "id": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-                  },
                   {
                     "id": "sha256:fd9e5c379cd3482d32686fb13881827a39037e7a7afa92c62d58c1f05fcb797f"
                   },
@@ -2105,9 +2072,6 @@
                   {
                     "id": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
                   },
-                  {
-                    "id": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-                  },
                   {
                     "id": "sha256:efa20ae5eca5860656d0131086470cb8d5c3a1ae2819301e7d015f06bbb68a26"
                   },
@@ -3082,9 +3046,7 @@
           },
           {
             "type": "org.osbuild.fix-bls",
-            "options": {
-              "prefix": ""
-            }
+            "options": {}
           },
           {
             "type": "org.osbuild.locale",
@@ -3369,23 +3331,10 @@
             "options": {
               "filesystems": [
                 {
-                  "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
+                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
                   "vfs_type": "xfs",
                   "path": "/",
                   "options": "defaults"
-                },
-                {
-                  "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-                  "vfs_type": "xfs",
-                  "path": "/boot",
-                  "options": "defaults"
-                },
-                {
-                  "uuid": "7B77-95E7",
-                  "vfs_type": "vfat",
-                  "path": "/boot/efi",
-                  "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt",
-                  "passno": 2
                 }
               ]
             }
@@ -3393,13 +3342,9 @@
           {
             "type": "org.osbuild.grub2",
             "options": {
-              "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
+              "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
               "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1",
               "legacy": "i386-pc",
-              "uefi": {
-                "vendor": "redhat"
-              },
               "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-431.el8.x86_64",
               "config": {
                 "default": "saved"
@@ -3464,20 +3409,8 @@
                   "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
                 },
                 {
-                  "size": 409600,
+                  "size": 20967391,
                   "start": 4096,
-                  "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-                  "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-                },
-                {
-                  "size": 1024000,
-                  "start": 413696,
-                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
-                  "uuid": "CB07C243-BC44-4717-853E-28852021225B"
-                },
-                {
-                  "size": 19533791,
-                  "start": 1437696,
                   "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
                   "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
                 }
@@ -3493,45 +3426,10 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.mkfs.fat",
-            "options": {
-              "volid": "7B7795E7"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600,
-                  "lock": true
-                }
-              }
-            }
-          },
           {
             "type": "org.osbuild.mkfs.xfs",
             "options": {
               "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "label": "boot"
-            },
-            "devices": {
-              "device": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000,
-                  "lock": true
-                }
-              }
-            }
-          },
-          {
-            "type": "org.osbuild.mkfs.xfs",
-            "options": {
-              "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "label": "root"
             },
             "devices": {
@@ -3539,8 +3437,8 @@
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791,
+                  "start": 4096,
+                  "size": 20967391,
                   "lock": true
                 }
               }
@@ -3566,28 +3464,12 @@
               ]
             },
             "devices": {
-              "boot": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 413696,
-                  "size": 1024000
-                }
-              },
-              "boot.efi": {
-                "type": "org.osbuild.loopback",
-                "options": {
-                  "filename": "disk.img",
-                  "start": 4096,
-                  "size": 409600
-                }
-              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
                   "filename": "disk.img",
-                  "start": 1437696,
-                  "size": 19533791
+                  "start": 4096,
+                  "size": 20967391
                 }
               }
             },
@@ -3597,18 +3479,6 @@
                 "type": "org.osbuild.xfs",
                 "source": "root",
                 "target": "/"
-              },
-              {
-                "name": "boot",
-                "type": "org.osbuild.xfs",
-                "source": "boot",
-                "target": "/boot"
-              },
-              {
-                "name": "boot.efi",
-                "type": "org.osbuild.fat",
-                "source": "boot.efi",
-                "target": "/boot/efi"
               }
             ]
           },
@@ -3626,8 +3496,8 @@
               "prefix": {
                 "type": "partition",
                 "partlabel": "gpt",
-                "number": 2,
-                "path": "/grub2"
+                "number": 1,
+                "path": "/boot/grub2"
               }
             }
           }
@@ -4014,9 +3884,6 @@
           "sha256:2733570f8ea94551f3381538f9c8642c88532c800b384c07b4db02f6b8896c3f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libattr-2.4.48-3.el8.x86_64.rpm"
           },
-          "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/fwupd-1.7.8-1.el8.x86_64.rpm"
-          },
           "sha256:27d04a9a33eb9300a55a8ec7623c02da13d19185278e367b60422c8fe70279e7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/sssd-common-pac-2.7.3-4.el8.x86_64.rpm"
           },
@@ -4116,9 +3983,6 @@
           "sha256:2ff643bfe17476a8dfa94ea900ddf9d89ed0e5f56839f18209f8304a0e31bb2f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dmidecode-3.3-4.el8.x86_64.rpm"
           },
-          "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm"
-          },
           "sha256:304d7d8d6a590a1afcd651cccd6158da0af801b5c22aa5c63e692df622b22bc0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/redhat-release-eula-8.8-0.1.el8.x86_64.rpm"
           },
@@ -4128,9 +3992,6 @@
           "sha256:306bd571a6c8617903bc4cc5b89b65abaab50be1f98f69b860eee77e31c9b05d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-perf-4.18.0-431.el8.x86_64.rpm"
           },
-          "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgcab1-1.1-1.el8.x86_64.rpm"
-          },
           "sha256:30c6dbc7d2dd8024a16fe2d00b01fa71f4a1ea9d4af5519dc092695d4fa735cf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libss-1.45.6-5.el8.x86_64.rpm"
           },
@@ -4326,9 +4187,6 @@
           "sha256:471930ec9d0e115809eaae8aa5c888bc07104c600ff49b55ab746701691c7c0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/iptables-libs-1.8.4-23.el8.x86_64.rpm"
           },
-          "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efivar-libs-37-4.el8.x86_64.rpm"
-          },
           "sha256:47f150f7e5879e1d58afa8669173d69847f2666d4688807863bcf1df8e468f0d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-pc-2.02-142.el8.x86_64.rpm"
           },
@@ -4674,9 +4532,6 @@
           "sha256:6d7a41fb238610416349a53d024cc505ab7f3f6e9953cc2244abb663ec404dad": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/ncurses-6.1-9.20180224.el8.x86_64.rpm"
           },
-          "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm"
-          },
           "sha256:6dec9fcb8adb571e5de0e5c0c7bcc71a1142fcf2466394304102cf17b349513f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libdnf-0.63.0-11.1.el8.x86_64.rpm"
           },
@@ -4953,9 +4808,6 @@
           "sha256:8942bd9f52f391bf7832aa81ebc8ea66f420ed5b4d35310666997567f0ea9351": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/pinfo-0.6.10-18.el8.x86_64.rpm"
           },
-          "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm"
-          },
           "sha256:8a994138b4d4bbcc5663ba464b85c9a9a0112bf9bad7e1ac3302559b69e7fa55": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/gtk2-2.24.32-5.el8.x86_64.rpm"
           },
@@ -4971,9 +4823,6 @@
           "sha256:8c81bb15456e441250d2ed53b223bf85c21a9b25b6a36ab09953cc831f9e7109": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/tcsh-6.20.00-15.el8.x86_64.rpm"
           },
-          "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efi-filesystem-3-3.el8.noarch.rpm"
-          },
           "sha256:8ca5dd4feea941aba58c6d6e981883bca79704dba06583f880c0bf5e0cf4efcf": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/desktop-file-utils-0.23-8.el8.x86_64.rpm"
           },
@@ -5310,9 +5159,6 @@
           "sha256:aeb7478365d6c1bba4f23c8899a9988c3a8b366d573c590cd7fa49f906c4cb8c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/volume_key-libs-0.3.11-5.el8.x86_64.rpm"
           },
-          "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm"
-          },
           "sha256:aedb18b6816f6aaf53ea7eedfac2337e86d9913fb4f855ba11200997b1dfa01a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/nss-3.79.0-10.el8_6.x86_64.rpm"
           },
@@ -5397,9 +5243,6 @@
           "sha256:b57ccdca83b3f0f54a1bc887d26ac390f782ab122e31c4f59689897ee7d5c83d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsoup-2.62.3-3.el8.x86_64.rpm"
           },
-          "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/mokutil-0.3.0-12.el8.x86_64.rpm"
-          },
           "sha256:b6cc9474c830cf8059b3a60dde46416d2ece114835c8d2a22ef609dbc2974420": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/adobe-mappings-pdf-20180407-1.el8.noarch.rpm"
           },
@@ -5697,9 +5540,6 @@
           "sha256:d4dc248be7aacad57e6684036d48d7fc1697bb0f1aa880c2a77dbd3ed714c642": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/timedatex-0.5-3.el8.x86_64.rpm"
           },
-          "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efibootmgr-16-1.el8.x86_64.rpm"
-          },
           "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/ed-1.14.2-4.el8.x86_64.rpm"
           },
@@ -5712,9 +5552,6 @@
           "sha256:d67580b9b2af79f599f77c35c694714d2d39d2ea01c28e8aaca1312e6ab25184": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-libselinux-2.9-6.el8.x86_64.rpm"
           },
-          "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/shim-x64-15.6-1.el8.x86_64.rpm"
-          },
           "sha256:d805c42ee9293a8ba35f49af63e3f7d813420d4a62ee4cff5ecd7391be851a9b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libtool-ltdl-2.4.6-25.el8.x86_64.rpm"
           },
@@ -6324,15 +6161,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/diffutils-3.6-6.el8.x86_64.rpm",
         "checksum": "sha256:f7fc94ac5b5df2051aa2811c0cebecd7e04353ac871f1a792bc6c68f2c2aa6ce"
       },
-      {
-        "name": "dosfstools",
-        "epoch": 0,
-        "version": "4.1",
-        "release": "6.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/dosfstools-4.1-6.el8.x86_64.rpm",
-        "checksum": "sha256:fc6f294d87c32dd80d09ad1e31005a6c379c476539fec9cd52b51f0bbc3384e3"
-      },
       {
         "name": "dracut",
         "epoch": 0,
@@ -7928,15 +7756,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/brotli-1.0.6-3.el8.x86_64.rpm",
         "checksum": "sha256:267858a95e543459a0cd683e641955d7c04c13bcda830c5f7db5a0529077428a"
       },
-      {
-        "name": "bubblewrap",
-        "epoch": 0,
-        "version": "0.4.0",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/bubblewrap-0.4.0-1.el8.x86_64.rpm",
-        "checksum": "sha256:302bbd7fb5f0a8472eb5ddd24452d67d866c28d7467c58b577f2229e5be4a2b5"
-      },
       {
         "name": "bzip2",
         "epoch": 0,
@@ -8495,33 +8314,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/ed-1.14.2-4.el8.x86_64.rpm",
         "checksum": "sha256:d5689e2894c59a375f985b5228b32e78d10b4ceeec9fd7c79f2000480494d368"
       },
-      {
-        "name": "efi-filesystem",
-        "epoch": 0,
-        "version": "3",
-        "release": "3.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efi-filesystem-3-3.el8.noarch.rpm",
-        "checksum": "sha256:8c9c059292e68dfbdec942133c22ef69fb4113166def6ad66903a1973bc9bccb"
-      },
-      {
-        "name": "efibootmgr",
-        "epoch": 0,
-        "version": "16",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efibootmgr-16-1.el8.x86_64.rpm",
-        "checksum": "sha256:d5130266a054d7cc7cbfe68f84a7dd8d1668518d87361235d12a993bc0750a5d"
-      },
-      {
-        "name": "efivar-libs",
-        "epoch": 0,
-        "version": "37",
-        "release": "4.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/efivar-libs-37-4.el8.x86_64.rpm",
-        "checksum": "sha256:47b0a16a1305e23104da6f2f29ee2e7cbede921528e5a35a9df080c085a04d78"
-      },
       {
         "name": "elfutils-debuginfod-client",
         "epoch": 0,
@@ -8693,15 +8485,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/fuse3-libs-3.3.0-16.el8.x86_64.rpm",
         "checksum": "sha256:c33debf1cedf1a6c38ed7e2bc37416a3b2c26d27c0ced755fd640cb49db95987"
       },
-      {
-        "name": "fwupd",
-        "epoch": 0,
-        "version": "1.7.8",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/fwupd-1.7.8-1.el8.x86_64.rpm",
-        "checksum": "sha256:276d4a91295e1796fa088ff1d40a209750996c974dd4b482bd4cd43662f347e7"
-      },
       {
         "name": "gawk",
         "epoch": 0,
@@ -8900,15 +8683,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-common-2.02-142.el8.noarch.rpm",
         "checksum": "sha256:ff33f6c8ac7066ace875ef208625faa4e30ba9d792e2fdc94bc019aec2ecfeef"
       },
-      {
-        "name": "grub2-efi-x64",
-        "epoch": 1,
-        "version": "2.02",
-        "release": "142.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/grub2-efi-x64-2.02-142.el8.x86_64.rpm",
-        "checksum": "sha256:6da93684ea75c01ef19caf548714d25238ab05d4aecc09c780e1e9123ca2550b"
-      },
       {
         "name": "grub2-pc",
         "epoch": 1,
@@ -9620,15 +9394,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libffi-3.1-23.el8.x86_64.rpm",
         "checksum": "sha256:403980be89cb21247a5a1750e8fbee915f111ac53ff9089f72d303211df23a23"
       },
-      {
-        "name": "libgcab1",
-        "epoch": 0,
-        "version": "1.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libgcab1-1.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:30a2e433b8dace2788780dd1924f2928a3111e7934733a9d3fdd0ff4a16e7e32"
-      },
       {
         "name": "libgcc",
         "epoch": 0,
@@ -10097,15 +9862,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsmbclient-4.16.4-2.el8.x86_64.rpm",
         "checksum": "sha256:cfa953b5825141026d5e6cd951f5aca15a88e8998e297e07d537e4aae8da5b21"
       },
-      {
-        "name": "libsmbios",
-        "epoch": 0,
-        "version": "2.4.1",
-        "release": "2.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libsmbios-2.4.1-2.el8.x86_64.rpm",
-        "checksum": "sha256:8a2de5f0e170c44199145a6fa047c888eb6fcc00f67da35e452ab493b30c3f2e"
-      },
       {
         "name": "libsolv",
         "epoch": 0,
@@ -10376,15 +10132,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libxml2-2.9.7-15.el8.x86_64.rpm",
         "checksum": "sha256:9911a687cf9fa747a7c9c35d6d166289f76af411462c9f0a3502b72e74f211db"
       },
-      {
-        "name": "libxmlb",
-        "epoch": 0,
-        "version": "0.1.15",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libxmlb-0.1.15-1.el8.x86_64.rpm",
-        "checksum": "sha256:aecd902d4dd2636c381d15ed39eb556d828c16dd3ce7d53e5a8ff92c499ba080"
-      },
       {
         "name": "libxslt",
         "epoch": 0,
@@ -10601,15 +10348,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/mlocate-0.26-20.el8.x86_64.rpm",
         "checksum": "sha256:48e1edacae05696360d0dd0706b2d3debb617ae15e9f7ce47e528839231a6c25"
       },
-      {
-        "name": "mokutil",
-        "epoch": 1,
-        "version": "0.3.0",
-        "release": "12.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/mokutil-0.3.0-12.el8.x86_64.rpm",
-        "checksum": "sha256:b59e97f5c35fce51487c41981e7c08becbd7be0736a7a82f4e1ca2ffde109c15"
-      },
       {
         "name": "mozjs60",
         "epoch": 0,
@@ -12068,15 +11806,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/shared-mime-info-1.9-3.el8.x86_64.rpm",
         "checksum": "sha256:4e468750831505a71d52553acee82dd9091d30f6c39f6dcf717fed544714c3c3"
       },
-      {
-        "name": "shim-x64",
-        "epoch": 0,
-        "version": "15.6",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/shim-x64-15.6-1.el8.x86_64.rpm",
-        "checksum": "sha256:d725cc71c0cb795b4e42e5595ede9460419e8924635802dcf8415cc1c7004358"
-      },
       {
         "name": "slang",
         "epoch": 0,