diff --git a/src/modules/netinstall/netinstall.yaml b/src/modules/netinstall/netinstall.yaml
index 37d4ccffe7..282f55fb17 100644
--- a/src/modules/netinstall/netinstall.yaml
+++ b/src/modules/netinstall/netinstall.yaml
@@ -250,45 +250,45 @@
     - phonon-qt6-vlc
     - xwaylandvideobridge
 - name: "GNOME-Desktop"
-  description: "GNOME Desktop - designed to put you in control and get things done."
+  description: "GNOME desktop environment - designed to put you in control and get things done."
   hidden: false
   selected: false
   critical: true
   packages:
-    - adwaita-icon-theme
-    - eog
-    - evince
-    - file-roller
     - gdm
     - gedit
-    - gnome
     - gnome-backgrounds
-    - gnome-calculator
     - gnome-control-center
-    - gnome-disk-utility
     - gnome-keyring
-    - gnome-nettool
-    - gnome-power-manager
-    - gnome-screenshot
     - gnome-shell
     - gnome-terminal
-    - gnome-themes-extra
     - gnome-tweaks
-    - gnome-usage
-    - malcontent
     - libnma
-    - gvfs
-    - gvfs-afc
-    - gvfs-gphoto2
-    - gvfs-mtp
-    - gvfs-nfs
-    - gvfs-smb
-    - nautilus
     - sushi
-    - totem
     - qt6-wayland
-    - xdg-user-dirs-gtk
-    - xdg-desktop-portal-gnome
+  subgroups:
+      - name: "GNOME Apps"
+        description: "Additional software from the GNOME project"
+        selected: true
+        critical: false
+        packages:
+          - eog
+          - evince
+          - file-roller
+          - simple-scan
+          - gnome-disk-utility
+          - gnome-screenshot
+          - gnome-power-manager
+          - gnome-calculator
+          - gnome-nettool
+          - gnome-usage
+          - malcontent
+          - totem
+          - gvfs-afc
+          - gvfs-nfs
+          - gvfs-smb
+          - gvfs-gphoto2
+          - gvfs-mtp
 - name: "Xfce4"
   description: "Xfce is a lightweight desktop environment for UNIX-like operating systems. It aims to be fast and low on system resources, while still being visually appealing and user friendly."
   hidden: false