diff --git a/comps-f26.xml.in b/comps-f26.xml.in
index f82ecef1..f3288f20 100644
--- a/comps-f26.xml.in
+++ b/comps-f26.xml.in
@@ -7039,6 +7039,8 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>headless-management</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>networkmanager-submodules</groupid>
     </grouplist>
     <optionlist>
       <groupid>ansible-node</groupid>
@@ -7053,12 +7055,10 @@
       <groupid>guest-agents</groupid>
       <groupid>ha</groupid>
       <groupid>server-hardware-support</groupid>
-      <groupid>hardware-support</groupid>
       <groupid>load-balancer</groupid>
       <groupid>mail-server</groupid>
       <groupid>mysql</groupid>
       <groupid>network-server</groupid>
-      <groupid>networkmanager-submodules</groupid>
       <groupid>printing</groupid>
       <groupid>smb-server</groupid>
       <groupid>sql-server</groupid>
diff --git a/comps-f27.xml.in b/comps-f27.xml.in
index a9b4e91d..39ba8721 100644
--- a/comps-f27.xml.in
+++ b/comps-f27.xml.in
@@ -7042,6 +7042,8 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>headless-management</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>networkmanager-submodules</groupid>
     </grouplist>
     <optionlist>
       <groupid>ansible-node</groupid>
@@ -7056,12 +7058,10 @@
       <groupid>guest-agents</groupid>
       <groupid>ha</groupid>
       <groupid>server-hardware-support</groupid>
-      <groupid>hardware-support</groupid>
       <groupid>load-balancer</groupid>
       <groupid>mail-server</groupid>
       <groupid>mysql</groupid>
       <groupid>network-server</groupid>
-      <groupid>networkmanager-submodules</groupid>
       <groupid>printing</groupid>
       <groupid>smb-server</groupid>
       <groupid>sql-server</groupid>