diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 2f2017d1..335de65b 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -4317,7 +4317,6 @@
       <packagereq>caja-sendto</packagereq>
       <packagereq>caja-wallpaper</packagereq>
       <packagereq>claws-mail</packagereq>
-      <packagereq>dconf</packagereq>
       <packagereq>dconf-editor</packagereq>
       <packagereq>engrampa</packagereq>
       <packagereq>eom</packagereq>
@@ -4331,7 +4330,6 @@
       <packagereq>gparted</packagereq>
       <packagereq>gtk2-engines</packagereq>
       <packagereq>gucharmap</packagereq>
-      <packagereq>gvfs</packagereq>
       <packagereq>gvfs-afc</packagereq>
       <packagereq>gvfs-archive</packagereq>
       <packagereq>gvfs-fuse</packagereq>
@@ -4374,12 +4372,15 @@
       <packagereq>mate-user-guide</packagereq>
       <packagereq>mozo</packagereq>
       <packagereq>network-manager-applet</packagereq>
-      <packagereq>NetworkManager</packagereq>
+      <packagereq>NetworkManager-adsl</packagereq>
+      <packagereq>NetworkManager-bluetooth</packagereq>
       <packagereq>NetworkManager-l2tp</packagereq>
       <packagereq>NetworkManager-openconnect</packagereq>
-      <packagereq>NetworkManager-openvpn</packagereq>
-      <packagereq>NetworkManager-pptp</packagereq>
-      <packagereq>NetworkManager-vpnc</packagereq>
+      <packagereq>NetworkManager-iodine-gnome</packagereq>
+      <packagereq>NetworkManager-openswan-gnome</packagereq>
+      <packagereq>NetworkManager-openvpn-gnome</packagereq>
+      <packagereq>NetworkManager-pptp-gnome</packagereq>
+      <packagereq>NetworkManager-vpnc-gnome</packagereq>
       <packagereq>parole</packagereq>
       <packagereq>pluma</packagereq>
       <packagereq>seahorse</packagereq>
diff --git a/comps-f23.xml.in b/comps-f23.xml.in
index edd359a2..1eaca23e 100644
--- a/comps-f23.xml.in
+++ b/comps-f23.xml.in
@@ -4264,7 +4264,6 @@
       <packagereq>caja-sendto</packagereq>
       <packagereq>caja-wallpaper</packagereq>
       <packagereq>claws-mail</packagereq>
-      <packagereq>dconf</packagereq>
       <packagereq>dconf-editor</packagereq>
       <packagereq>engrampa</packagereq>
       <packagereq>eom</packagereq>
@@ -4278,7 +4277,6 @@
       <packagereq>gparted</packagereq>
       <packagereq>gtk2-engines</packagereq>
       <packagereq>gucharmap</packagereq>
-      <packagereq>gvfs</packagereq>
       <packagereq>gvfs-afc</packagereq>
       <packagereq>gvfs-archive</packagereq>
       <packagereq>gvfs-fuse</packagereq>
@@ -4321,12 +4319,15 @@
       <packagereq>mate-user-guide</packagereq>
       <packagereq>mozo</packagereq>
       <packagereq>network-manager-applet</packagereq>
-      <packagereq>NetworkManager</packagereq>
+      <packagereq>NetworkManager-adsl</packagereq>
+      <packagereq>NetworkManager-bluetooth</packagereq>
       <packagereq>NetworkManager-l2tp</packagereq>
       <packagereq>NetworkManager-openconnect</packagereq>
-      <packagereq>NetworkManager-openvpn</packagereq>
-      <packagereq>NetworkManager-pptp</packagereq>
-      <packagereq>NetworkManager-vpnc</packagereq>
+      <packagereq>NetworkManager-iodine-gnome</packagereq>
+      <packagereq>NetworkManager-openswan-gnome</packagereq>
+      <packagereq>NetworkManager-openvpn-gnome</packagereq>
+      <packagereq>NetworkManager-pptp-gnome</packagereq>
+      <packagereq>NetworkManager-vpnc-gnome</packagereq>
       <packagereq>parole</packagereq>
       <packagereq>pluma</packagereq>
       <packagereq>seahorse</packagereq>