diff --git a/comps-f27.xml.in b/comps-f27.xml.in
index b17f0834..7e80656b 100644
--- a/comps-f27.xml.in
+++ b/comps-f27.xml.in
@@ -72,9 +72,15 @@
       <packagereq>firewalld</packagereq>
       <packagereq>gfs2-utils</packagereq>
       <packagereq>glibc-all-langpacks</packagereq>
-      <packagereq>grub2</packagereq>
-      <packagereq>grub2-efi</packagereq>
-      <packagereq>grub2-efi-cdboot</packagereq>
+      <packagereq>grub2-pc</packagereq>
+      <packagereq>grub2-ppc64le</packagereq>
+      <packagereq>grub2-ppc64</packagereq>
+      <packagereq>grub2-efi-aa64</packagereq>
+      <packagereq>grub2-efi-aa64-cdboot</packagereq>
+      <packagereq>grub2-efi-ia32</packagereq>
+      <packagereq>grub2-efi-ia32-cdboot</packagereq>
+      <packagereq>grub2-efi-x64</packagereq>
+      <packagereq>grub2-efi-x64-cdboot</packagereq>
       <packagereq>grub2-tools</packagereq>
       <packagereq>grub2-tools-extra</packagereq>
       <packagereq>grub2-tools-efi</packagereq>
diff --git a/comps-f28.xml.in b/comps-f28.xml.in
index 533feca7..65f81b9a 100644
--- a/comps-f28.xml.in
+++ b/comps-f28.xml.in
@@ -72,9 +72,15 @@
       <packagereq>firewalld</packagereq>
       <packagereq>gfs2-utils</packagereq>
       <packagereq>glibc-all-langpacks</packagereq>
-      <packagereq>grub2</packagereq>
-      <packagereq>grub2-efi</packagereq>
-      <packagereq>grub2-efi-cdboot</packagereq>
+      <packagereq>grub2-pc</packagereq>
+      <packagereq>grub2-ppc64le</packagereq>
+      <packagereq>grub2-ppc64</packagereq>
+      <packagereq>grub2-efi-aa64</packagereq>
+      <packagereq>grub2-efi-aa64-cdboot</packagereq>
+      <packagereq>grub2-efi-ia32</packagereq>
+      <packagereq>grub2-efi-ia32-cdboot</packagereq>
+      <packagereq>grub2-efi-x64</packagereq>
+      <packagereq>grub2-efi-x64-cdboot</packagereq>
       <packagereq>grub2-tools</packagereq>
       <packagereq>grub2-tools-extra</packagereq>
       <packagereq>grub2-tools-efi</packagereq>