diff --git a/comps.xml b/comps.xml
index 21180f0..2a6710d 100644
--- a/comps.xml
+++ b/comps.xml
@@ -688,9 +688,13 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">buildah</packagereq>
       <packagereq variant="Certified" type="mandatory">containernetworking-plugins</packagereq>
-      <packagereq variant="Certified" type="mandatory">podman</packagereq>
+      <packagereq variant="Certified" type="mandatory">docker-buildx-plugin</packagereq>
+      <packagereq variant="Certified" type="mandatory">docker-ce-cli</packagereq>
+      <packagereq variant="Certified" type="mandatory">docker-ce-rootless-extras</packagereq>
+      <packagereq variant="Certified" type="mandatory">docker-ce</packagereq>
+      <packagereq variant="Certified" type="mandatory">docker-compose-plugin</packagereq>
+      <packagereq variant="Certified" type="mandatory">docker-compose-switch</packagereq>
       <packagereq variant="Certified" type="optional">python3-psutil</packagereq>
       <packagereq variant="Certified" type="optional">toolbox</packagereq>
     </packagelist>
@@ -3887,7 +3891,6 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq variant="Certified" type="mandatory">cockpit-packagekit</packagereq>
-      <packagereq variant="Certified" type="mandatory">cockpit-podman</packagereq>
       <packagereq variant="Certified" type="mandatory">cockpit-storaged</packagereq>
       <packagereq variant="Certified" type="mandatory">setroubleshoot-server</packagereq>
       <packagereq variant="Certified" type="mandatory">PackageKit</packagereq>