diff --git a/comps-f24.xml.in b/comps-f24.xml.in
index 85314005..b983b461 100644
--- a/comps-f24.xml.in
+++ b/comps-f24.xml.in
@@ -629,6 +629,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">docker</packagereq>
+      <packagereq type="mandatory">docker-cockpit></packagereq>
       <packagereq type="optional">docker-registry</packagereq>
       <packagereq type="optional">fedora-dockerfiles</packagereq>
     </packagelist>
@@ -3014,7 +3015,11 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="mandatory">cockpit</packagereq>
+      <packagereq type="mandatory">cockpit-bridge</packagereq>
+      <packagereq type="mandatory">cockpit-networkmanager</packagereq>
+      <packagereq type="mandatory">cockpit-shell</packagereq>
+      <packagereq type="mandatory">cockpit-storaged</packagereq>
+      <packagereq type="mandatory">cockpit-ws</packagereq>
       <packagereq type="mandatory">openssh-server</packagereq>
       <packagereq type="mandatory">PackageKit</packagereq>
       <packagereq type="mandatory">rolekit</packagereq>
@@ -6752,10 +6757,10 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>headless-management</groupid>
-      <groupid>container-management</groupid>
     </grouplist>
     <optionlist>
       <groupid>ansible-node</groupid>
+      <groupid>container-management</groupid>
       <groupid>dogtag</groupid>
       <groupid>domain-client</groupid>
       <groupid>directory-server</groupid>