diff --git a/comps.xml b/comps.xml
index 5769858..3a37079 100644
--- a/comps.xml
+++ b/comps.xml
@@ -1986,10 +1986,6 @@
       <packagereq variant="CRB" type="default">yelp-devel</packagereq>
       <packagereq variant="CRB" type="default">zlib-static</packagereq>
       <packagereq variant="CRB" type="default">zziplib-devel</packagereq>
-      <packagereq variant="CRB" type="optional">driver-manager</packagereq>
-      <packagereq variant="CRB" type="default">enscript</packagereq>
-      <packagereq variant="CRB" type="default">git</packagereq>
-      <packagereq variant="CRB" type="optional">pnm2ppa</packagereq>
     </packagelist>
   </group>
   <group variant="Certified">
@@ -3338,6 +3334,7 @@
       <packagereq variant="Certified" type="default">kora-icon-theme</packagereq>
       <packagereq variant="Certified" type="default">libheif</packagereq>
       <packagereq variant="Certified" type="default">simple-scan</packagereq>
+      <packagereq variant="Certified" type="optional">driver-manager</packagereq>
       <packagereq variant="Certified" type="optional">gedit-plugins</packagereq>
       <packagereq variant="Certified" type="optional">gnome-backgrounds</packagereq>
       <packagereq variant="Certified" type="optional">gnome-shell-extension-apps-menu</packagereq>
@@ -6034,7 +6031,9 @@
       <packagereq variant="Certified" type="default">paps</packagereq>
       <packagereq variant="Certified" type="default">system-config-printer-udev</packagereq>
       <packagereq variant="Certified" type="optional">bluez-cups</packagereq>
+      <packagereq variant="Certified" type="optional">enscript</packagereq>
       <packagereq variant="Certified" type="optional">hplip</packagereq>
+      <packagereq variant="Certified" type="optional">pnm2ppa</packagereq>
     </packagelist>
   </group>
   <group variant="Certified">
@@ -7933,6 +7932,7 @@
       <packagereq variant="Certified" type="mandatory">words</packagereq>
       <packagereq variant="Certified" type="mandatory">xorg-x11-drv-libinput</packagereq>
       <packagereq variant="Certified" type="mandatory">zip</packagereq>
+      <packagereq variant="Certified" type="optional">git</packagereq>
     </packagelist>
   </group>
   <environment variant="Certified">