diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks
index d5c23cd..236a44f 100644
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -1,8 +1,21 @@
 %packages
-@firefox
-@gnome-desktop
+
+# Exclude unwanted groups that fedora-live-base.ks pulls in
+-@dial-up
+-@input-methods
+-@standard
+
+# Make sure to sync any additions / removals done here with
+# workstation-product-environment in comps
+@base-x
+@core
+@fonts
+@guest-desktop-agents
+@hardware-support
 @libreoffice
+@multimedia
 @networkmanager-submodules
+@printing
 @workstation-product
 
 # Exclude unwanted packages from @anaconda-tools group