diff --git a/configs/rhel-program--image-azure-cvm.yaml b/configs/rhel-program--image-azure-cvm.yaml
index ec82a1bb..f8c350d0 100644
--- a/configs/rhel-program--image-azure-cvm.yaml
+++ b/configs/rhel-program--image-azure-cvm.yaml
@@ -67,7 +67,7 @@ data:
       - python3-libselinux
       # redhat-cloud-client-configuration
       - redhat-release
-      - rhc
+      # rhc
       - rootfiles
       - rpm
       - rpm-plugin-audit
diff --git a/configs/rhel-program--image-azure.yaml b/configs/rhel-program--image-azure.yaml
index 1cf74a1a..0c07160a 100644
--- a/configs/rhel-program--image-azure.yaml
+++ b/configs/rhel-program--image-azure.yaml
@@ -79,8 +79,8 @@ data:
       - kernel-modules
       - kernel-tools
       - kexec-tools
-      - kpatch
-      - kpatch-dnf
+      # kpatch
+      # kpatch-dnf
       - langpacks-en
       - ledmon
       - less
@@ -121,8 +121,8 @@ data:
       - quota
       - realmd
       - redhat-release
-      - redhat-release-eula
-      - rhc
+      # redhat-release-eula
+      # rhc
       - rng-tools
       - rootfiles
       - rpm
@@ -243,8 +243,8 @@ data:
       - kernel-modules
       - kernel-tools
       - kexec-tools
-      - kpatch
-      - kpatch-dnf
+      # kpatch
+      # kpatch-dnf
       - langpacks-en
       - ledmon
       - less
@@ -287,8 +287,8 @@ data:
       - quota
       - realmd
       - redhat-release
-      - redhat-release-eula
-      - rhc
+      # redhat-release-eula
+      # rhc
       - rng-tools
       - rootfiles
       - rpm
diff --git a/configs/rhel-program--image-ec2-ha.yaml b/configs/rhel-program--image-ec2-ha.yaml
index 249ea73e..c781d08c 100644
--- a/configs/rhel-program--image-ec2-ha.yaml
+++ b/configs/rhel-program--image-ec2-ha.yaml
@@ -75,8 +75,8 @@ data:
       - procps-ng
       - python3-libselinux
       - redhat-release
-      - redhat-release-eula
-      - rhc
+      # redhat-release-eula
+      # rhc
       - rootfiles
       - rpm
       - rpm-plugin-audit
diff --git a/configs/rhel-program--image-ec2.yaml b/configs/rhel-program--image-ec2.yaml
index 7bd3b205..6520d1c3 100644
--- a/configs/rhel-program--image-ec2.yaml
+++ b/configs/rhel-program--image-ec2.yaml
@@ -70,8 +70,8 @@ data:
       - procps-ng
       - python3-libselinux
       - redhat-release
-      - redhat-release-eula
-      - rhc
+      # redhat-release-eula
+      # rhc
       - rootfiles
       - rpm
       - rpm-plugin-audit
@@ -158,8 +158,8 @@ data:
       - procps-ng
       - python3-libselinux
       - redhat-release
-      - redhat-release-eula
-      - rhc
+      # redhat-release-eula
+      # rhc
       - rootfiles
       - rpm
       - rpm-plugin-audit
diff --git a/configs/rhel-program--image-qcow2-c10s.yaml b/configs/rhel-program--image-qcow2-c10s.yaml
index e2257f93..5e5a706f 100644
--- a/configs/rhel-program--image-qcow2-c10s.yaml
+++ b/configs/rhel-program--image-qcow2-c10s.yaml
@@ -29,7 +29,6 @@ data:
     - dnf-utils
     - dracut-config-generic
     - e2fsprogs
-    - efibootmgr
     - filesystem
     - glibc
     - grubby
diff --git a/configs/rhel-program--image-qcow2.yaml b/configs/rhel-program--image-qcow2.yaml
index 1d6378f3..073d34f4 100644
--- a/configs/rhel-program--image-qcow2.yaml
+++ b/configs/rhel-program--image-qcow2.yaml
@@ -29,7 +29,6 @@ data:
     - dnf-utils
     - dracut-config-generic
     - e2fsprogs
-    - efibootmgr
     - filesystem
     - glibc
     - grubby
@@ -68,8 +67,8 @@ data:
     - python3-libselinux
     - qemu-guest-agent
     - redhat-release
-    - redhat-release-eula
-    - rhc
+    # redhat-release-eula
+    # rhc
     - rootfiles
     - rpm
     - rpm-plugin-audit