diff --git a/internal/distro/rhel9/package_sets.go b/internal/distro/rhel9/package_sets.go
index 5dc255bb1..19e8acb71 100644
--- a/internal/distro/rhel9/package_sets.go
+++ b/internal/distro/rhel9/package_sets.go
@@ -1223,7 +1223,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 			"nmap-ncat",
 			"nm-connection-editor",
 			"nss-tools",
-			"nvme-cli", // for nvmf dracut module
 			"openssh-clients",
 			"openssh-server",
 			"oscap-anaconda-addon",
diff --git a/internal/distro/rhel9/pipelines.go b/internal/distro/rhel9/pipelines.go
index 11cf71ae0..09c7fef3b 100644
--- a/internal/distro/rhel9/pipelines.go
+++ b/internal/distro/rhel9/pipelines.go
@@ -1067,7 +1067,6 @@ func anacondaTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec
 		"multipath",
 		"nfs",
 		"nvdimm", // non-volatile DIMM firmware (provides nfit, cuse, and nd_e820)
-		"nvmf",
 		"rdma",
 		"rngd",
 	})
diff --git a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
index 9fc11f763..59201d3a4 100644
--- a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
@@ -8128,14 +8128,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:9130a491601594bf3791ee1fafd81840e9b9e66f111b2002236d144c7b65c081",
                     "options": {
@@ -9111,7 +9103,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -10777,9 +10768,6 @@
           "sha256:8a7da28db1c8dea227e2e3bf45e22d6f3920b44466d82392db10bc5a202ffcce": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/fwupd-1.5.9-3.el9.aarch64.rpm"
           },
-          "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm"
-          },
           "sha256:8abb0ab85d37efc7a8a6132e3f9398f0179fa791bf118fd9f87119adaec621e2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20220208/Packages/perl-B-1.80-479.el9.aarch64.rpm"
           },
@@ -22103,16 +22091,6 @@
         "checksum": "sha256:95bd797672d70a8752fb881c4ff04ccc14234842dfd9de6bc48373dd96c1ec81",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.14",
-        "release": "3.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm",
-        "checksum": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
index c17b14eb3..d786208d6 100644
--- a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
@@ -8157,14 +8157,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:9130a491601594bf3791ee1fafd81840e9b9e66f111b2002236d144c7b65c081",
                     "options": {
@@ -9141,7 +9133,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -10829,9 +10820,6 @@
           "sha256:8a7da28db1c8dea227e2e3bf45e22d6f3920b44466d82392db10bc5a202ffcce": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/fwupd-1.5.9-3.el9.aarch64.rpm"
           },
-          "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm"
-          },
           "sha256:8abb0ab85d37efc7a8a6132e3f9398f0179fa791bf118fd9f87119adaec621e2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20220208/Packages/perl-B-1.80-479.el9.aarch64.rpm"
           },
@@ -22155,16 +22143,6 @@
         "checksum": "sha256:95bd797672d70a8752fb881c4ff04ccc14234842dfd9de6bc48373dd96c1ec81",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.14",
-        "release": "3.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm",
-        "checksum": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-aarch64-image_installer-boot.json b/test/data/manifests/centos_9-aarch64-image_installer-boot.json
index db9e71310..acdf24610 100644
--- a/test/data/manifests/centos_9-aarch64-image_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-image_installer-boot.json
@@ -11821,14 +11821,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:9130a491601594bf3791ee1fafd81840e9b9e66f111b2002236d144c7b65c081",
                     "options": {
@@ -12805,7 +12797,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -14460,9 +14451,6 @@
           "sha256:8a7da28db1c8dea227e2e3bf45e22d6f3920b44466d82392db10bc5a202ffcce": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/fwupd-1.5.9-3.el9.aarch64.rpm"
           },
-          "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm"
-          },
           "sha256:8abb0ab85d37efc7a8a6132e3f9398f0179fa791bf118fd9f87119adaec621e2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20220208/Packages/perl-B-1.80-479.el9.aarch64.rpm"
           },
@@ -25747,16 +25735,6 @@
         "checksum": "sha256:95bd797672d70a8752fb881c4ff04ccc14234842dfd9de6bc48373dd96c1ec81",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.14",
-        "release": "3.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm",
-        "checksum": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json b/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
index b990b7a31..9fee867d8 100644
--- a/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
@@ -11850,14 +11850,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:9130a491601594bf3791ee1fafd81840e9b9e66f111b2002236d144c7b65c081",
                     "options": {
@@ -12834,7 +12826,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -14511,9 +14502,6 @@
           "sha256:8a7da28db1c8dea227e2e3bf45e22d6f3920b44466d82392db10bc5a202ffcce": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/fwupd-1.5.9-3.el9.aarch64.rpm"
           },
-          "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm"
-          },
           "sha256:8abb0ab85d37efc7a8a6132e3f9398f0179fa791bf118fd9f87119adaec621e2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20220208/Packages/perl-B-1.80-479.el9.aarch64.rpm"
           },
@@ -25798,16 +25786,6 @@
         "checksum": "sha256:95bd797672d70a8752fb881c4ff04ccc14234842dfd9de6bc48373dd96c1ec81",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.14",
-        "release": "3.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm",
-        "checksum": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-x86_64-edge_installer-boot.json b/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
index 41804bb20..bfd1cbc79 100644
--- a/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
@@ -8271,14 +8271,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:879771cd51bb4ef2afd2e4a8d29b4f66040ec7f0f47d647f2c00ab0122bdf8e0",
                     "options": {
@@ -9272,7 +9264,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -10908,9 +10899,6 @@
           "sha256:88bbb9c78ed4935955e5768f30829922cdbdd288917a32bcaf645868c9bb5026": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/crypto-policies-scripts-20220203-1.gitf03e75e.el9.noarch.rpm"
           },
-          "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm"
-          },
           "sha256:89728c73d1ba9818e95789a5b862ff9649cb934884e2733fca628277c5ef2d49": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20220208/Packages/protobuf-c-1.3.3-9.el9.x86_64.rpm"
           },
@@ -22473,16 +22461,6 @@
         "checksum": "sha256:a7da4ef003bc60045bc60dae299b703e7f1db326f25208fb922ce1b79e2882da",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.14",
-        "release": "3.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm",
-        "checksum": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json
index 6d3833113..1f6cdc63f 100644
--- a/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json
@@ -8300,14 +8300,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:879771cd51bb4ef2afd2e4a8d29b4f66040ec7f0f47d647f2c00ab0122bdf8e0",
                     "options": {
@@ -9302,7 +9294,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -10960,9 +10951,6 @@
           "sha256:88bbb9c78ed4935955e5768f30829922cdbdd288917a32bcaf645868c9bb5026": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/crypto-policies-scripts-20220203-1.gitf03e75e.el9.noarch.rpm"
           },
-          "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm"
-          },
           "sha256:89728c73d1ba9818e95789a5b862ff9649cb934884e2733fca628277c5ef2d49": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20220208/Packages/protobuf-c-1.3.3-9.el9.x86_64.rpm"
           },
@@ -22525,16 +22513,6 @@
         "checksum": "sha256:a7da4ef003bc60045bc60dae299b703e7f1db326f25208fb922ce1b79e2882da",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.14",
-        "release": "3.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm",
-        "checksum": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-x86_64-image_installer-boot.json b/test/data/manifests/centos_9-x86_64-image_installer-boot.json
index a1b4b1d36..20fe1058f 100644
--- a/test/data/manifests/centos_9-x86_64-image_installer-boot.json
+++ b/test/data/manifests/centos_9-x86_64-image_installer-boot.json
@@ -12029,14 +12029,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:879771cd51bb4ef2afd2e4a8d29b4f66040ec7f0f47d647f2c00ab0122bdf8e0",
                     "options": {
@@ -13031,7 +13023,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -14658,9 +14649,6 @@
           "sha256:88bbb9c78ed4935955e5768f30829922cdbdd288917a32bcaf645868c9bb5026": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/crypto-policies-scripts-20220203-1.gitf03e75e.el9.noarch.rpm"
           },
-          "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm"
-          },
           "sha256:89728c73d1ba9818e95789a5b862ff9649cb934884e2733fca628277c5ef2d49": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20220208/Packages/protobuf-c-1.3.3-9.el9.x86_64.rpm"
           },
@@ -26187,16 +26175,6 @@
         "checksum": "sha256:a7da4ef003bc60045bc60dae299b703e7f1db326f25208fb922ce1b79e2882da",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.14",
-        "release": "3.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm",
-        "checksum": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-x86_64-image_installer_with_users-boot.json b/test/data/manifests/centos_9-x86_64-image_installer_with_users-boot.json
index fd4395f39..c1eb84908 100644
--- a/test/data/manifests/centos_9-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-x86_64-image_installer_with_users-boot.json
@@ -12058,14 +12058,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:879771cd51bb4ef2afd2e4a8d29b4f66040ec7f0f47d647f2c00ab0122bdf8e0",
                     "options": {
@@ -13060,7 +13052,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -14709,9 +14700,6 @@
           "sha256:88bbb9c78ed4935955e5768f30829922cdbdd288917a32bcaf645868c9bb5026": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/crypto-policies-scripts-20220203-1.gitf03e75e.el9.noarch.rpm"
           },
-          "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm"
-          },
           "sha256:89728c73d1ba9818e95789a5b862ff9649cb934884e2733fca628277c5ef2d49": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20220208/Packages/protobuf-c-1.3.3-9.el9.x86_64.rpm"
           },
@@ -26238,16 +26226,6 @@
         "checksum": "sha256:a7da4ef003bc60045bc60dae299b703e7f1db326f25208fb922ce1b79e2882da",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.14",
-        "release": "3.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm",
-        "checksum": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
index 2a12c08ed..0da66b191 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
@@ -1723,9 +1723,6 @@
                   {
                     "id": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
                   },
-                  {
-                    "id": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
-                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac"
                   },
@@ -3576,7 +3573,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -4582,9 +4578,6 @@
           "sha256:4f1f5c0c2f4e131af3839456a1e191da440b62559b289820f942edaa2a2ca354": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/libmaxminddb-1.5.2-3.el9.aarch64.rpm"
           },
-          "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm"
-          },
           "sha256:4f52b48ea331a31c91582de5377507caf3400970ff40b7f242e0ad5b93d5b9ae": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/gstreamer1-plugins-good-1.18.4-5.el9.aarch64.rpm"
           },
@@ -11487,15 +11480,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.aarch64.rpm",
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "2.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm",
-        "checksum": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
index 0de0e7c08..8094c89cc 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
@@ -1752,9 +1752,6 @@
                   {
                     "id": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
                   },
-                  {
-                    "id": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
-                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac"
                   },
@@ -3606,7 +3603,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -4634,9 +4630,6 @@
           "sha256:4f1f5c0c2f4e131af3839456a1e191da440b62559b289820f942edaa2a2ca354": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/libmaxminddb-1.5.2-3.el9.aarch64.rpm"
           },
-          "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm"
-          },
           "sha256:4f52b48ea331a31c91582de5377507caf3400970ff40b7f242e0ad5b93d5b9ae": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/gstreamer1-plugins-good-1.18.4-5.el9.aarch64.rpm"
           },
@@ -11539,15 +11532,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.aarch64.rpm",
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "2.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm",
-        "checksum": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
index f3c3de6dc..e0b283a31 100644
--- a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
@@ -3177,9 +3177,6 @@
                   {
                     "id": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
                   },
-                  {
-                    "id": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
-                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac"
                   },
@@ -5031,7 +5028,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -6047,9 +6043,6 @@
           "sha256:4f1f5c0c2f4e131af3839456a1e191da440b62559b289820f942edaa2a2ca354": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/libmaxminddb-1.5.2-3.el9.aarch64.rpm"
           },
-          "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm"
-          },
           "sha256:4f52b48ea331a31c91582de5377507caf3400970ff40b7f242e0ad5b93d5b9ae": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/gstreamer1-plugins-good-1.18.4-5.el9.aarch64.rpm"
           },
@@ -12901,15 +12894,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.aarch64.rpm",
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "2.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm",
-        "checksum": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
index 5e516bfb3..8f95368e7 100644
--- a/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
@@ -3206,9 +3206,6 @@
                   {
                     "id": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
                   },
-                  {
-                    "id": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
-                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac"
                   },
@@ -5060,7 +5057,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -6098,9 +6094,6 @@
           "sha256:4f1f5c0c2f4e131af3839456a1e191da440b62559b289820f942edaa2a2ca354": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/libmaxminddb-1.5.2-3.el9.aarch64.rpm"
           },
-          "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm"
-          },
           "sha256:4f52b48ea331a31c91582de5377507caf3400970ff40b7f242e0ad5b93d5b9ae": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/gstreamer1-plugins-good-1.18.4-5.el9.aarch64.rpm"
           },
@@ -12952,15 +12945,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.aarch64.rpm",
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "2.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm",
-        "checksum": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
index d1389983c..3736b4a07 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
@@ -1762,9 +1762,6 @@
                   {
                     "id": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
                   },
-                  {
-                    "id": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
-                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575"
                   },
@@ -3640,7 +3637,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -5597,9 +5593,6 @@
           "sha256:a362e6e28a10e0214b16d03edd7f125015f95a611e03b7ee3b51ad8b3cc3ace6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/geoclue2-2.5.7-5.el9.x86_64.rpm"
           },
-          "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm"
-          },
           "sha256:a3aa10107f6fa6c6c2e5e0f134d137c7c5b0b77d118fb0f8cdf1e23167616e25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/p11-kit-0.24.1-2.el9.x86_64.rpm"
           },
@@ -11713,15 +11706,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.x86_64.rpm",
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "2.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm",
-        "checksum": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json
index 985ce88a8..35cd043a2 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json
@@ -1791,9 +1791,6 @@
                   {
                     "id": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
                   },
-                  {
-                    "id": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
-                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575"
                   },
@@ -3670,7 +3667,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -5649,9 +5645,6 @@
           "sha256:a362e6e28a10e0214b16d03edd7f125015f95a611e03b7ee3b51ad8b3cc3ace6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/geoclue2-2.5.7-5.el9.x86_64.rpm"
           },
-          "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm"
-          },
           "sha256:a3aa10107f6fa6c6c2e5e0f134d137c7c5b0b77d118fb0f8cdf1e23167616e25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/p11-kit-0.24.1-2.el9.x86_64.rpm"
           },
@@ -11765,15 +11758,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.x86_64.rpm",
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "2.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm",
-        "checksum": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-x86_64-image_installer-boot.json b/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
index 9267f0f7d..2d17d6ba1 100644
--- a/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
@@ -3243,9 +3243,6 @@
                   {
                     "id": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
                   },
-                  {
-                    "id": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
-                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575"
                   },
@@ -5122,7 +5119,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -7094,9 +7090,6 @@
           "sha256:a362e6e28a10e0214b16d03edd7f125015f95a611e03b7ee3b51ad8b3cc3ace6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/geoclue2-2.5.7-5.el9.x86_64.rpm"
           },
-          "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm"
-          },
           "sha256:a3aa10107f6fa6c6c2e5e0f134d137c7c5b0b77d118fb0f8cdf1e23167616e25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/p11-kit-0.24.1-2.el9.x86_64.rpm"
           },
@@ -13156,15 +13149,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.x86_64.rpm",
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "2.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm",
-        "checksum": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json
index 4204c1aa2..1603ef4dc 100644
--- a/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json
@@ -3272,9 +3272,6 @@
                   {
                     "id": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
                   },
-                  {
-                    "id": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
-                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575"
                   },
@@ -5151,7 +5148,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -7145,9 +7141,6 @@
           "sha256:a362e6e28a10e0214b16d03edd7f125015f95a611e03b7ee3b51ad8b3cc3ace6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/geoclue2-2.5.7-5.el9.x86_64.rpm"
           },
-          "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm"
-          },
           "sha256:a3aa10107f6fa6c6c2e5e0f134d137c7c5b0b77d118fb0f8cdf1e23167616e25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/p11-kit-0.24.1-2.el9.x86_64.rpm"
           },
@@ -13207,15 +13200,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.x86_64.rpm",
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "2.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm",
-        "checksum": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
index 1e6bab22f..84cbf0d4b 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
@@ -4488,14 +4488,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac",
                     "options": {
@@ -9271,7 +9263,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -11384,9 +11375,6 @@
           "sha256:b66b63dc25e7eb3bba8af2ad2488b0920edc934a58ce9e5ba27f2a6905d9da5f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.1-20220324/Packages/google-noto-cjk-fonts-common-20201206-4.el9.noarch.rpm"
           },
-          "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm"
-          },
           "sha256:b6a73c9da522df55690b886c0a9af39338571d34ee6f0d4d9b994c8289df3412": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/libattr-2.5.1-3.el9.aarch64.rpm"
           },
@@ -17767,16 +17755,6 @@
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "3.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm",
-        "checksum": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
index 0bd2ce85b..05f553aaf 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
@@ -4517,14 +4517,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac",
                     "options": {
@@ -9301,7 +9293,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -11436,9 +11427,6 @@
           "sha256:b66b63dc25e7eb3bba8af2ad2488b0920edc934a58ce9e5ba27f2a6905d9da5f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.1-20220324/Packages/google-noto-cjk-fonts-common-20201206-4.el9.noarch.rpm"
           },
-          "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm"
-          },
           "sha256:b6a73c9da522df55690b886c0a9af39338571d34ee6f0d4d9b994c8289df3412": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/libattr-2.5.1-3.el9.aarch64.rpm"
           },
@@ -17819,16 +17807,6 @@
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "3.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm",
-        "checksum": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer-boot.json b/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
index 92810c2de..0f4990192 100644
--- a/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
@@ -8301,14 +8301,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac",
                     "options": {
@@ -13085,7 +13077,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -15208,9 +15199,6 @@
           "sha256:b66b63dc25e7eb3bba8af2ad2488b0920edc934a58ce9e5ba27f2a6905d9da5f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.1-20220324/Packages/google-noto-cjk-fonts-common-20201206-4.el9.noarch.rpm"
           },
-          "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm"
-          },
           "sha256:b6a73c9da522df55690b886c0a9af39338571d34ee6f0d4d9b994c8289df3412": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/libattr-2.5.1-3.el9.aarch64.rpm"
           },
@@ -21531,16 +21519,6 @@
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "3.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm",
-        "checksum": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
index 76530737a..3a8082a2f 100644
--- a/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
@@ -8330,14 +8330,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac",
                     "options": {
@@ -13114,7 +13106,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -15259,9 +15250,6 @@
           "sha256:b66b63dc25e7eb3bba8af2ad2488b0920edc934a58ce9e5ba27f2a6905d9da5f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.1-20220324/Packages/google-noto-cjk-fonts-common-20201206-4.el9.noarch.rpm"
           },
-          "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm"
-          },
           "sha256:b6a73c9da522df55690b886c0a9af39338571d34ee6f0d4d9b994c8289df3412": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/libattr-2.5.1-3.el9.aarch64.rpm"
           },
@@ -21582,16 +21570,6 @@
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "3.el9",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm",
-        "checksum": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
index 05eca9289..3e5df8793 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
@@ -4592,14 +4592,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575",
                     "options": {
@@ -9448,7 +9440,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -11918,9 +11909,6 @@
           "sha256:ce6dcb35f56a067393e94e5d49299a9ab256ad4949e6f86ac27e6b58516b18a7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/kmod-libs-28-7.el9.x86_64.rpm"
           },
-          "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm"
-          },
           "sha256:cee202f1330ee17cfc3d5db3cd841594896cfda34b275da9bed1f5e6ccfaf644": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20220324/Packages/libwayland-client-1.19.0-4.el9.x86_64.rpm"
           },
@@ -18122,16 +18110,6 @@
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "3.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm",
-        "checksum": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json
index 2af236821..d758ab3a0 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json
@@ -4621,14 +4621,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575",
                     "options": {
@@ -9478,7 +9470,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -11970,9 +11961,6 @@
           "sha256:ce6dcb35f56a067393e94e5d49299a9ab256ad4949e6f86ac27e6b58516b18a7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/kmod-libs-28-7.el9.x86_64.rpm"
           },
-          "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm"
-          },
           "sha256:cee202f1330ee17cfc3d5db3cd841594896cfda34b275da9bed1f5e6ccfaf644": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20220324/Packages/libwayland-client-1.19.0-4.el9.x86_64.rpm"
           },
@@ -18174,16 +18162,6 @@
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "3.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm",
-        "checksum": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-x86_64-image_installer-boot.json b/test/data/manifests/rhel_91-x86_64-image_installer-boot.json
index 0410dcfd1..f4a93dbf0 100644
--- a/test/data/manifests/rhel_91-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-image_installer-boot.json
@@ -8477,14 +8477,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575",
                     "options": {
@@ -13334,7 +13326,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -15828,9 +15819,6 @@
           "sha256:ce6dcb35f56a067393e94e5d49299a9ab256ad4949e6f86ac27e6b58516b18a7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/kmod-libs-28-7.el9.x86_64.rpm"
           },
-          "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm"
-          },
           "sha256:cee202f1330ee17cfc3d5db3cd841594896cfda34b275da9bed1f5e6ccfaf644": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20220324/Packages/libwayland-client-1.19.0-4.el9.x86_64.rpm"
           },
@@ -21960,16 +21948,6 @@
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "3.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm",
-        "checksum": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json
index 53de08989..4ea016fae 100644
--- a/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json
@@ -8506,14 +8506,6 @@
                       }
                     }
                   },
-                  {
-                    "id": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
-                    "options": {
-                      "metadata": {
-                        "rpm.check_gpg": true
-                      }
-                    }
-                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575",
                     "options": {
@@ -13363,7 +13355,6 @@
                 "multipath",
                 "nfs",
                 "nvdimm",
-                "nvmf",
                 "rdma",
                 "rngd"
               ],
@@ -15879,9 +15870,6 @@
           "sha256:ce6dcb35f56a067393e94e5d49299a9ab256ad4949e6f86ac27e6b58516b18a7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/kmod-libs-28-7.el9.x86_64.rpm"
           },
-          "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm"
-          },
           "sha256:cee202f1330ee17cfc3d5db3cd841594896cfda34b275da9bed1f5e6ccfaf644": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20220324/Packages/libwayland-client-1.19.0-4.el9.x86_64.rpm"
           },
@@ -22011,16 +21999,6 @@
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6",
         "check_gpg": true
       },
-      {
-        "name": "nvme-cli",
-        "epoch": 0,
-        "version": "1.16",
-        "release": "3.el9",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm",
-        "checksum": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
-        "check_gpg": true
-      },
       {
         "name": "openldap",
         "epoch": 0,