diff --git a/comps-f31.xml.in b/comps-f31.xml.in
index 53e05465..f5f15457 100644
--- a/comps-f31.xml.in
+++ b/comps-f31.xml.in
@@ -115,6 +115,17 @@
       <packagereq>zram</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>x86-baremetal-tools</id>
+    <_name>x86 Baremetal Tools</_name>
+    <_description>Tools for working with baremetal x86 systems</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>memtest86+</packagereq>
+      <packagereq>syslinux</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>audio</id>
     <_name>Audio Production</_name>
diff --git a/comps-f32.xml.in b/comps-f32.xml.in
index 2c9cd6a5..0dac4b68 100644
--- a/comps-f32.xml.in
+++ b/comps-f32.xml.in
@@ -115,6 +115,17 @@
       <packagereq>zram</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>x86-baremetal-tools</id>
+    <_name>x86 Baremetal Tools</_name>
+    <_description>Tools for working with baremetal x86 systems</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>memtest86+</packagereq>
+      <packagereq>syslinux</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>audio</id>
     <_name>Audio Production</_name>