diff --git a/comps.xml b/comps.xml
index 25e1f44..3a37079 100644
--- a/comps.xml
+++ b/comps.xml
@@ -3313,7 +3313,6 @@
       <packagereq variant="Certified" type="default">NetworkManager-openconnect-gnome</packagereq>
       <packagereq variant="Certified" type="default">NetworkManager-openvpn-gnome</packagereq>
       <packagereq variant="Certified" type="default">NetworkManager-pptp-gnome</packagereq>
-      <packagereq variant="Certified" type="default">driver-manager</packagereq>
       <packagereq variant="Certified" type="default">sphere-desktop-selector</packagereq>
       <packagereq variant="Certified" type="default">sphere-keyboard-config</packagereq>
       <packagereq variant="Certified" type="default">file-roller</packagereq>
@@ -3335,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>
@@ -6024,16 +6024,16 @@
     <packagelist>
       <packagereq variant="Certified" type="mandatory">cups</packagereq>
       <packagereq variant="Certified" type="mandatory">cups-pk-helper</packagereq>
-      <packagereq variant="Certified" type="mandatory">enscript</packagereq>
       <packagereq variant="Certified" type="default">colord</packagereq>
       <packagereq variant="Certified" type="default">gutenprint</packagereq>
       <packagereq variant="Certified" type="default">gutenprint-cups</packagereq>
       <packagereq variant="Certified" type="default">gutenprint-doc</packagereq>
       <packagereq variant="Certified" type="default">paps</packagereq>
-      <packagereq variant="Certified" type="default">pnm2ppa</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">
@@ -7874,7 +7874,6 @@
       <packagereq variant="Certified" type="mandatory">evolution-help</packagereq>
       <packagereq variant="Certified" type="mandatory">evolution</packagereq>
       <packagereq variant="Certified" type="mandatory">file</packagereq>
-      <packagereq variant="Certified" type="mandatory">git</packagereq>
       <packagereq variant="Certified" type="mandatory">glibc-all-langpacks</packagereq>
       <packagereq variant="Certified" type="mandatory">gnupg2</packagereq>
       <packagereq variant="Certified" type="mandatory">google-noto-emoji-fonts</packagereq>
@@ -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">