diff --git a/comps-f28.xml.in b/comps-f28.xml.in
index 02940bbd..91f690ca 100644
--- a/comps-f28.xml.in
+++ b/comps-f28.xml.in
@@ -709,10 +709,11 @@
     <default>false</default>
     <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>
+      <packagereq type="mandatory">atomic</packagereq>
+      <packagereq type="default">docker</packagereq>
+      <packagereq type="default">docker-cockpit</packagereq>
+      <packagereq type="optional">buildah</packagereq>
+      <packagereq type="optional">podman</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6488,8 +6489,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>atomic</packagereq>
-      <packagereq>buildah</packagereq>
       <packagereq>docker</packagereq>
       <packagereq>nss-altfiles</packagereq>
       <packagereq>ostree-grub2</packagereq>