diff --git a/groups.yml b/groups.yml
index 86e5a3a..0c6dc0d 100644
--- a/groups.yml
+++ b/groups.yml
@@ -9,15 +9,13 @@
 OUTPUT:
   - dvd:
       recommends: true
-      includes:
-        - base
-        - dvd
   - opensuse_kubic:
       recommends: false
       includes:
         - opensuse_kubic
 
 dvd:
+  - kernel-default
   - patterns-media-rest_dvd: [suggested]
   - dia: [locked]
   - gnuchess: [locked]
@@ -27,32 +25,15 @@ dvd:
   - seamonkey: [locked]
   - systemd-presets-branding-CAASP: [locked]
   - texlive: [locked]
-  - xerces-j2-xml-resolver: [locked]
-  - xerces-j2-xml-apis: [locked]
-  - xml-commons-resolver: [locked]
-  - xml-commons-apis: [locked]
-  - gnu-javamail: [locked]
   - gnuchess: [locked]
-  - notification-daemon-xfce: [locked]
-  - java-1_4_2-ibm: [locked]
   - myspell-german-old: [locked]
-  - hpijs-standalone: [locked]
-  - geronimo-tomcat-servlet-container: [locked]
-  - iscan: [locked]
-  - acroread_ja: [locked]
   - apache2-worker: [locked]
-  - apper: [locked]
-  - liberation2-fonts: [locked]
-  - xen-tools-domU: [locked]
   - gnu-free-fonts: [locked]
-  - libwx_baseu-suse-nostl1: [locked]
   - frozen-bubble: [locked]
   - marble: [locked]
   - digikam: [locked]
   - dia: [locked]
   - inkscape: [locked]
-  - kdelibs3: [locked]
-  - qt3: [locked]
   - gimp-help: [locked]
   - gimp-help-it: [locked]
   - gimp-help-pl: [locked]
@@ -67,39 +48,21 @@ dvd:
   - gimp-help-en_GB: [locked]
   - gimp-help-pt_BR: [locked]
   - gimp-help-ru: [locked]
-  - kde4-l10n-fr-doc: [locked]
-  - kde4-l10n-sv-doc: [locked]
-  - kde4-l10n-es-doc: [locked]
-  - kde4-l10n-pt_BR-doc: [locked]
-  - kde4-l10n-pl-doc: [locked]
-  - kde4-l10n-da-doc: [locked]
-  - kde4-l10n-da-data: [locked]
-  - kde4-l10n-it-doc: [locked]
   - libqt4-devel-doc-data: [locked]
-  - blender-doc: [locked]
   - gnucash-docs: [locked]
-  - oxygen-icon-theme-large: [locked]
   - kernel-debug: [locked]
   ## highly outdated at the moment
-  - opensuse-manuals_hu: [locked]
-  - opensuse-manuals_ja: [locked]
-  - opensuse-manuals_ru: [locked]
   - MozillaFirefox-translations-other: [locked]
   - MozillaThunderbird-translations-other: [locked]
   - texlive: [locked]
   - lyx: [locked]
-  - monodevelop: [locked]
   - gnumeric: [locked]
-  - libreoffice-help-zh-CN: [locked]
-  - opensuse-startup_en-pdf: [locked]
   - gnome-devel-docs: [locked]
   - timidity: [locked]
-  - kdebase4-wallpapers: [x86_64]
   - desktop-data-openSUSE-extra: [x86_64]
   - scribus: [locked]
   - dynamic-wallpapers-11x: [locked]
   - python-doc-pdf: [locked]
-  - kde4-l10n-de-doc: [locked]
   - wine-gecko: [locked]
 
   # trying to get a working DVD: [locked]
@@ -111,10 +74,8 @@ dvd:
   - kde-l10n-ru-doc: [locked]
   - libqt5-creator: [locked]
   - seamonkey: [locked]
-  - calligra-krita: [locked]
   - blender: [locked]
   - digikam-doc: [locked]
-  - python3-doc-pdf: [locked]
   - calibre: [locked]
 
   ## attemt to shrink the DVD - 20151115 by dimstar: [locked]
@@ -136,8 +97,6 @@ dvd:
   ## More space needed - 2017-02-02
   - ant: [locked]
   - java-1_8_0-openjdk-devel: [locked]
-  - java-1_7_0-openjdk-devel: [locked]
-  - java-1_9_0-openjdk-devel: [locked]
 
   ## wow, we run out of space... drop 40MB of cjk fonts:
   - noto-sans-cjk-fonts: [locked]
@@ -149,10 +108,94 @@ dvd:
 
   - libqt5-qtdeclarative-devel: [locked]
 
-empty:
+  # 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]   
+  - desktop-data-openSUSE-extra: [locked]
+  - dummy-release: [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]
+  - rsyslog: [locked]
+  - syslog-service: [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]
 
-base:
-  - kernel-default
+  # additional packages not picked
+  - apache-parent
+  - bbswitch-kmp-default
+  - bcm20702a1-firmware
+  - bcm43xx-firmware
+  - crash-kmp-default
+  - dpdk-kmp-default
+  - drbd-kmp-default
+  - elilo
+  - erofs-utils
+  - f2fs-tools
+  - fuse3
+  - icewm-config-upstream
+  - icewm-lite
+  - java-12-openjdk-headless
+  - lifecycle-data-openSUSE
+  - lttng-modules
+  - mokutil
+  - mtd-utils
+  - nut
+  - nut-cgi
+  - openafs
+  - openafs-client
+  - openSUSE-release
+  - openSUSE-release-dvd
+  - pcsc-acr38
+  - pcsc-asedriveiiie-usb
+  - pcsc-asekey
+  - pcsc-cyberjack
+  - pcsc-gempc
+  - pcsc-towitoko
+  - postgresql
+  - postgresql-contrib
+  - postgresql-devel
+  - postgresql-server
+  - postgresql10
+  - postgresql10-contrib
+  - postgresql10-devel
+  - postgresql10-server
+  - qemu-guest-agent
+  - rng-tools
+  - rt2860
+  - sendmail
+  - spacenavd
+  - spu-tools
+  - system-user-upsd
+  - technisat-usb2-firmware
+  - vhba-kmp-default
+  - virtualbox-guest-tools
+  - virtualbox-guest-x11
+  - xen-tools-domU
 
 opensuse_kubic:
   - dummy-release: [locked]