diff --git a/fedora-cinnamon-common.ks b/fedora-cinnamon-common.ks
index 58baba9..52c3ebe 100644
--- a/fedora-cinnamon-common.ks
+++ b/fedora-cinnamon-common.ks
@@ -9,8 +9,10 @@
 %packages
 
 fedora-release-cinnamon
-@networkmanager-submodules
-@cinnamon-desktop
+
+# install env-group to resolve RhBug:1891500
+@^cinnamon-desktop-environment
+
 @libreoffice
 parole
 rhythmbox
diff --git a/fedora-kde-common.ks b/fedora-kde-common.ks
index 8d074b6..f6b5ecd 100644
--- a/fedora-kde-common.ks
+++ b/fedora-kde-common.ks
@@ -1,13 +1,17 @@
 
 %packages
+# install env-group to resolve RhBug:1891500
+@^kde-desktop-environment
+
 @firefox
 @kde-apps
-@kde-desktop
 @kde-media
 @kde-office
-@networkmanager-submodules
+
 fedora-release-kde
 
+-@admin-tools
+
 ### The KDE-Desktop
 
 ### Browser
diff --git a/fedora-live-robotics.ks b/fedora-live-robotics.ks
index 1dfbdeb..2534913 100644
--- a/fedora-live-robotics.ks
+++ b/fedora-live-robotics.ks
@@ -10,7 +10,8 @@ part / --size 10752
 
 %packages
 # Start with GNOME
-@gnome-desktop
+# Install workstation-product-environment to resolve RhBug:1891500
+@^workstation-product-environment
 
 # Add robotics development packages
 @robotics-suite
@@ -30,9 +31,10 @@ mercurial
 -@dial-up
 -@input-methods
 -@standard
-
-# Add a web browser
-@firefox
+-@container-management
+-@libreoffice
+-@networkmanager-submodules
+-@workstation-product
 
 # Remove office suite
 -libreoffice-*
diff --git a/fedora-live-security.ks b/fedora-live-security.ks
index 7261301..8faa8fa 100644
--- a/fedora-live-security.ks
+++ b/fedora-live-security.ks
@@ -21,7 +21,9 @@
 part / --size 10240
 
 %packages
-@xfce-desktop
+# install env-group to resolve RhBug:1891500
+@^xfce-desktop-environment
+
 @xfce-apps
 
 # Security tools
diff --git a/fedora-lxde-common.ks b/fedora-lxde-common.ks
index 3051ebf..31b458f 100644
--- a/fedora-lxde-common.ks
+++ b/fedora-lxde-common.ks
@@ -8,11 +8,12 @@
 
 %packages
 ### LXDE desktop
-@lxde-desktop
+# install env-group to resolve RhBug:1891500
+@^lxde-desktop-environment
+
 @lxde-apps
 @lxde-media
 @lxde-office
-@networkmanager-submodules
 
 # FIXME: can be omitted once comps is updated
 midori
@@ -39,6 +40,7 @@ metacity
 #-words
 
 # save some space
+-@admin-tools
 -autofs
 -acpid
 -gimp-help
diff --git a/fedora-lxqt-common.ks b/fedora-lxqt-common.ks
index c27d297..39f3889 100644
--- a/fedora-lxqt-common.ks
+++ b/fedora-lxqt-common.ks
@@ -9,10 +9,11 @@
 #
 
 %packages
-@lxqt
+# install env-group to resolve RhBug:1891500
+@^lxqt-desktop-environment
+
 @lxqt-apps
 @lxqt-media
-@networkmanager-submodules
 
 # for nm applet
 gnome-keyring
@@ -43,6 +44,7 @@ wqy-microhei-fonts          # a compact CJK font, to replace:
 
 # remove input methods to free space
 -@input-methods
+-@admin-tools
 -scim*
 -m17n*
 # Temporary include ibus to workaround RHBZ 1633225
diff --git a/fedora-mate-common.ks b/fedora-mate-common.ks
index ed5a276..6697c5e 100644
--- a/fedora-mate-common.ks
+++ b/fedora-mate-common.ks
@@ -1,6 +1,8 @@
 %packages
+# install env-group to resolve RhBug:1891500
+@^mate-desktop-environment
+
 fedora-release-matecompiz
-@mate
 compiz
 compiz-plugins-main
 compiz-plugins-extra
@@ -14,7 +16,6 @@ simple-ccsm
 emerald-themes
 emerald
 fusion-icon
-@networkmanager-submodules
 
 # blacklist applications which breaks mate-desktop
 -audacious
@@ -31,6 +32,7 @@ nss-mdns
 
 # Drop things for size
 -@3d-printing
+-@admin-tools
 -brasero
 -fedora-icon-theme
 -gnome-icon-theme