diff --git a/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-base.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-base.bb
index e81ad33..93024b9 100644
--- a/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-base.bb
+++ b/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-base.bb
@@ -1,8 +1,18 @@
 #
 # Base set of packages, should not include anything needed only on desktop
 #
+
 inherit packagegroup
 
+BASH_COMPLETION = "\
+    bash-completion \
+    iproute2-bash-completion \
+    glib-2.0-bash-completion \
+    pulseaudio-bash-completion \
+    systemd-bash-completion \
+    util-linux-bash-completion \
+"
+
 RDEPENDS_${PN} = "\
     base-files \
     base-passwd \
@@ -19,16 +29,14 @@ RDEPENDS_${PN} = "\
     which \
     parted \
     bash \
-    bash-completion \
+    ${BASH_COMPLETION} \
     grep \
     procps \
     psmisc-extras \
     tar \
     pciutils \
     sysfsutils \
-    polkit \
     wpa-supplicant \
-    networkmanager \
     kernel-modules \
     packagegroup-firmware \
     vim \
@@ -56,9 +64,4 @@ RDEPENDS_${PN} = "\
     e2fsprogs \
     dosfstools \
     libpam \
-    iproute2-bash-completion \
-    glib-2.0-bash-completion \
-    pulseaudio-bash-completion \
-    systemd-bash-completion \
-    util-linux-bash-completion \
 "
diff --git a/meta-citadel/recipes-core/packagegroups/packagegroup-desktop.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-desktop.bb
index 7c3d3a8..7d7d394 100644
--- a/meta-citadel/recipes-core/packagegroups/packagegroup-desktop.bb
+++ b/meta-citadel/recipes-core/packagegroups/packagegroup-desktop.bb
@@ -1,7 +1,7 @@
-
 #
 # Packages common to any desktop environment
 #
+
 inherit packagegroup
 
 CITADEL_POWERTOP = ""
@@ -23,6 +23,7 @@ RDEPENDS_${PN} = "\
     iso-codes \
     libgudev \
     networkmanager \
+    polkit \
     network-manager-applet \
     clutter-1.0 \
     libxkbcommon \