diff --git a/comps-f24.xml.in b/comps-f24.xml.in
index 4ed07992..98cd38dc 100644
--- a/comps-f24.xml.in
+++ b/comps-f24.xml.in
@@ -112,6 +112,17 @@
       <packagereq type="optional">sil-scheherazade-fonts</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>arm-tools</id>
+    <_name>Tools for working with arm systems</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>fedora-arm-installer</packagereq>
+      <packagereq>uboot-images-armv7</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>assamese-support</id>
     <_name>Assamese Support</_name>
@@ -6944,6 +6955,7 @@
     </grouplist>
     <optionlist>
       <groupid>ansible-node</groupid>
+      <groupid>arm-tools</groupid>
       <groupid>container-management</groupid>
       <groupid>dogtag</groupid>
       <groupid>domain-client</groupid>
@@ -6988,6 +7000,9 @@
       <groupid>printing</groupid>
       <groupid>workstation-product</groupid>
     </grouplist>
+    <optionlist>
+      <groupid>arm-tools</groupid>
+    </optionlist>
   </environment>
   <environment>
     <id>lxde-desktop-environment</id>
diff --git a/comps-f25.xml.in b/comps-f25.xml.in
index d36d803e..ebb52f46 100644
--- a/comps-f25.xml.in
+++ b/comps-f25.xml.in
@@ -112,6 +112,17 @@
       <packagereq type="optional">sil-scheherazade-fonts</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>arm-tools</id>
+    <_name>Tools for working with arm systems</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>fedora-arm-installer</packagereq>
+      <packagereq>uboot-images-armv7</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>assamese-support</id>
     <_name>Assamese Support</_name>
@@ -6937,6 +6948,7 @@
     </grouplist>
     <optionlist>
       <groupid>ansible-node</groupid>
+      <groupid>arm-tools</groupid>
       <groupid>container-management</groupid>
       <groupid>dogtag</groupid>
       <groupid>domain-client</groupid>
@@ -6981,6 +6993,9 @@
       <groupid>printing</groupid>
       <groupid>workstation-product</groupid>
     </grouplist>
+    <optionlist>
+      <groupid>arm-tools</groupid>
+    </optionlist>
   </environment>
   <environment>
     <id>lxde-desktop-environment</id>