diff --git a/groups.yml b/groups.yml
index e5af80d..53b5565 100644
--- a/groups.yml
+++ b/groups.yml
@@ -86,7 +86,7 @@ dvd:
   - patterns-xfce-xfce_basis: [suggested]
   - patterns-xfce-xfce_laptop: [suggested]
   - patterns-xfce-xfce_office: [suggested]
-  - patterns-yast-yast2_yast2_basis: [suggested]
+  - patterns-yast-yast2_basis: [suggested]
   - patterns-yast-yast2_install_wf: [suggested]
   - arabic-fonts
   - arphic-uming-fonts
@@ -160,14 +160,9 @@ dvd:
   - patterns-base-minimal_base_conflicts: [suggested]
   - patterns-yast-x11_yast: [suggested]
   - patterns-server-xen_server: [suggested]
-  # bluncks 2nd baby
-  - apport-gtk
-  - apport-qt
   # bnc#431280 (Japanese fonts)
   - arphic-uming-fonts
   - capi4hylafax
-  # FAX
-  - capisuite
   - cellwriter
   - clicfs
   - createrepo
@@ -176,19 +171,11 @@ dvd:
   # hylafax as requested by kkeil
   - hylafax+
   - hylafax+-client
-  - isns
   # kdump+tools
   - kdump
   # all kernel flavors we want to have
   - kernel-default
   - kexec-tools
-  # kiwi as requested by ms
-  - kiwi
-  - kiwi-config-openSUSE
-  - kiwi-desc-isoboot
-  - kiwi-desc-netboot
-  - kiwi-desc-oemboot
-  - kiwi-desc-vmxboot
 
   - patterns-media-rest_dvd: [suggested]
   # all loggers
@@ -285,132 +272,22 @@ dvd:
   # lock to align with package-lists solution
   - appmenu-qt: [locked]
   - aspell-ispell: [locked]
-  - brasero: [locked]
-  - brasero-nautilus: [locked]
-  - cdda2wav: [locked]
-  - cdrdao: [locked]
-  - cdrecord: [locked]
   - clang7-checker: [locked]
-  - dvd+rw-tools: [locked]
-  - exim: [locked]
   - fluid-soundfont-gm: [locked]
   - fluid-soundfont-gs: [locked]
   - gcin-branding-upstream: [locked]
   - gimp-help: [locked]
   - install-initrd-openSUSE: [locked]
-  - java-12-openjdk: [locked]
-  - k3b: [locked]
   - laptop-mode-tools: [locked]
   - libreoffice-branding-upstream: [locked]
-  - mate-calc: [locked]
-  - mkisofs: [locked]
   - poppler-data: [locked]
   - pulseaudio-module-gconf: [locked]
-  - readcd: [locked]
-  - timidity: [locked]
-  - totem-plugin-brasero: [locked]
-  - unity-gtk-module-common: [locked]
-  - unity-gtk2-module: [locked]
-  - unity-gtk3-module: [locked]
-  - vcdimager: [locked]
-  - zisofs-tools: [locked]
-  - apache-commons-collections: [locked]
-  - apache-commons-daemon: [locked]
-  - apache-commons-dbcp: [locked]
-  - apache-commons-io: [locked]
-  - apache-commons-logging: [locked]
-  - apache-commons-parent: [locked]
-  - apache-commons-pool2: [locked]
-  - apache-pdfbox: [locked]
-  - avalon-framework: [locked]
-  - cglib: [locked]
-  - ecj: [locked]
-  - geronimo-jta-1_1-api: [locked]
-  - geronimo-specs-pom: [locked]
-  - icu4j: [locked]
-  - jakarta-taglibs-standard: [locked]
-  - log4j: [locked]
-  - msmtp: [locked]
-  - msmtp-mta: [locked]
-  - relaxngDatatype: [locked]
-  - saxon6: [locked]
-  - servletapi5: [locked]
-  - sonatype-oss-parent: [locked]
-  - tei-roma: [locked]
   - tomcat: [locked]
-  - tomcat-admin-webapps: [locked]
-  - tomcat-el-3_0-api: [locked]
-  - tomcat-jsp-2_3-api: [locked]
-  - tomcat-lib: [locked]
-  - tomcat-servlet-4_0-api: [locked]
-  - tomcat-webapps: [locked]
-  - trang: [locked]
-  - xalan-j2: [locked]
-  - xerces-j2: [locked]
-  - xmlgraphics-batik: [locked]
-  - xmlgraphics-commons: [locked]
-  - xmlgraphics-fop: [locked]
 
   - virtualbox: [locked]
   - virtualbox-host-kmp-default: [locked]
-  - libqt5-qtstyleplugins-platformtheme-gtk2: [locked]
-  - libstdc++6-locale: [locked]
-  - lttng-modules: [locked]
-  - openafs: [locked]
 
-  # packages only on the i586 DVD (possibly oversights)
-  - chrome-gnome-shell: [i586]
   - desktop-data-openSUSE-extra: [i586]
-  - eog-plugin-exif-display: [i586]
-  - eog-plugins-data: [i586]
-  - fipscheck: [i586]
-  - fortune: [i586]
-  - fossil: [i586]
-  - gedit-plugin-bookmarks: [i586]
-  - gedit-plugin-bracketcompletion: [i586]
-  - gedit-plugin-charmap: [i586]
-  - gedit-plugin-codecomment: [i586]
-  - gedit-plugin-colorpicker: [i586]
-  - gedit-plugin-colorschemer: [i586]
-  - gedit-plugin-commander: [i586]
-  - gedit-plugin-dashboard: [i586]
-  - gedit-plugin-drawspaces: [i586]
-  - gedit-plugin-findinfiles: [i586]
-  - gedit-plugin-git: [i586]
-  - gedit-plugin-joinlines: [i586]
-  - gedit-plugin-multiedit: [i586]
-  - gedit-plugin-smartspaces: [i586]
-  - gedit-plugin-synctex: [i586]
-  - gedit-plugin-terminal: [i586]
-  - gedit-plugin-textsize: [i586]
-  - gedit-plugin-wordcompletion: [i586]
-  - kmozillahelper: [i586]
-  - krusader-doc: [i586]
-  - libestr0: [i586]
-  - libfastjson4: [i586]
-  - libfipscheck1: [i586]
-  - libgda-5_0-sqlcipher: [i586]
-  - libirrecord0: [i586]
-  - liblirc0: [i586]
-  - liblirc_driver0: [i586]
-  - liblogging0: [i586]
-  - liblognorm5: [i586]
-  - libopenssl1_0_0: [i586]
-  - libopenssl1_0_0-hmac: [i586]
-  - libpurple-plugin-pack-extras: [i586]
-  - libzeitgeist-2_0-0: [i586]
-  - lirc-core: [i586]
-  - mozilla-nss-tools: [i586]
-  - nut-drivers-net: [i586]
-  - pesign: [i586]
-  - pesign-obs-integration: [i586]
-  - pidgin-plugin-pack-extras: [i586]
-  - plasma-browser-integration: [i586]
-  - plasma-browser-integration-lang: [i586]
-  - pulseaudio-module-lirc: [i586]
-  - typelib-1_0-Ggit-1_0: [i586]
-  - typelib-1_0-Gucharmap-2_90: [i586]
-  - typelib-1_0-Zeitgeist-2_0: [i586]
 
   # additional packages not picked
   - apache-parent
@@ -422,7 +299,6 @@ dvd:
   - fuse3
   - icewm-config-upstream
   - icewm-lite
-  - java-12-openjdk-headless
   - lifecycle-data-openSUSE
   - mokutil: [x86_64]
   - mtd-utils
@@ -458,10 +334,12 @@ dvd:
   - xen-tools-domU
   - xml-commons-apis
   - xml-commons-resolver
+  # used in staging tests
   - yast2-nfs-server
   - bind
   - Mesa-demo-x
   - inkscape
+  - autoyast2
 
 opensuse_kubic:
   - dummy-release: [locked]