diff --git a/DVD5-i586.group b/DVD5-i586.group
index b5ab1164..30a15061 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -420,6 +420,9 @@
     <package name="ding"/>
     <package name="ding-dict-de_en"/>
     <package name="discover"/>
+    <package name="discover-backend-flatpak"/>
+    <package name="discover-backend-fwupd"/>
+    <package name="discover-backend-packagekit"/>
     <package name="discover-lang"/>
     <package name="djvulibre"/>
     <package name="dleyna-connector-dbus"/>
@@ -483,7 +486,9 @@
     <package name="enscript"/>
     <package name="eog"/>
     <package name="eog-lang"/>
+    <package name="eog-plugin-exif-display"/>
     <package name="eog-plugins"/>
+    <package name="eog-plugins-data"/>
     <package name="eog-plugins-lang"/>
     <package name="epiphany"/>
     <package name="epiphany-branding-openSUSE"/>
@@ -579,6 +584,8 @@
     <package name="fontconfig-devel"/>
     <package name="fonts-KanjiStrokeOrders"/>
     <package name="fonts-config"/>
+    <package name="fortune"/>
+    <package name="fossil"/>
     <package name="fprintd"/>
     <package name="fprintd-lang"/>
     <package name="fprintd-pam"/>
@@ -660,7 +667,25 @@
     <package name="geany-plugins-lang"/>
     <package name="gedit"/>
     <package name="gedit-lang"/>
+    <package name="gedit-plugin-bookmarks"/>
+    <package name="gedit-plugin-bracketcompletion"/>
+    <package name="gedit-plugin-charmap"/>
+    <package name="gedit-plugin-codecomment"/>
+    <package name="gedit-plugin-colorpicker"/>
+    <package name="gedit-plugin-colorschemer"/>
+    <package name="gedit-plugin-commander"/>
+    <package name="gedit-plugin-dashboard"/>
     <package name="gedit-plugin-devhelp"/>
+    <package name="gedit-plugin-drawspaces"/>
+    <package name="gedit-plugin-findinfiles"/>
+    <package name="gedit-plugin-git"/>
+    <package name="gedit-plugin-joinlines"/>
+    <package name="gedit-plugin-multiedit"/>
+    <package name="gedit-plugin-smartspaces"/>
+    <package name="gedit-plugin-synctex"/>
+    <package name="gedit-plugin-terminal"/>
+    <package name="gedit-plugin-textsize"/>
+    <package name="gedit-plugin-wordcompletion"/>
     <package name="gedit-plugins"/>
     <package name="gedit-plugins-data"/>
     <package name="gedit-plugins-lang"/>
@@ -1417,6 +1442,7 @@
     <package name="kruler"/>
     <package name="kruler-lang"/>
     <package name="krusader"/>
+    <package name="krusader-doc"/>
     <package name="kscd"/>
     <package name="kscreen5"/>
     <package name="kscreen5-lang"/>
@@ -2081,6 +2107,7 @@
     <package name="libfreetype6"/>
     <package name="libfribidi0"/>
     <package name="libfstrm0"/>
+    <package name="libftdi1-2"/>
     <package name="libftgl2"/>
     <package name="libfuse2"/>
     <package name="libfwupd2"/>
@@ -2104,6 +2131,7 @@
     <package name="libgda-5_0-4"/>
     <package name="libgda-5_0-4-lang"/>
     <package name="libgda-5_0-bdb"/>
+    <package name="libgda-5_0-sqlcipher"/>
     <package name="libgda-5_0-sqlite"/>
     <package name="libgda-ui-5_0-4"/>
     <package name="libgda-ui-5_0-plugins"/>
@@ -2299,6 +2327,7 @@
     <package name="libiptcdata"/>
     <package name="libiptcdata-lang"/>
     <package name="libiptcdata0"/>
+    <package name="libirrecord0"/>
     <package name="libirs160"/>
     <package name="libisc166"/>
     <package name="libisccc160"/>
@@ -2394,7 +2423,9 @@
     <package name="liblightdm-gobject-1-0"/>
     <package name="liblilv-0-0"/>
     <package name="liblink-grammar5"/>
+    <package name="liblirc0"/>
     <package name="liblirc_client0"/>
+    <package name="liblirc_driver0"/>
     <package name="liblmdb-0_9_22"/>
     <package name="liblockdev1"/>
     <package name="libloudmouth-1-0"/>
@@ -2530,6 +2561,8 @@
     <package name="libopenraw1"/>
     <package name="libopenssl-1_1-devel"/>
     <package name="libopenssl-devel"/>
+    <package name="libopenssl1_0_0"/>
+    <package name="libopenssl1_0_0-hmac"/>
     <package name="libopenssl1_1"/>
     <package name="libopenssl1_1-hmac"/>
     <package name="libopts25"/>
@@ -2638,6 +2671,7 @@
     <package name="libpurple-plugin-mrim"/>
     <package name="libpurple-plugin-mrim-lang"/>
     <package name="libpurple-plugin-pack"/>
+    <package name="libpurple-plugin-pack-extras"/>
     <package name="libpurple-plugin-pack-lang"/>
     <package name="libpurple-plugin-prpltwtr"/>
     <package name="libpurple-plugin-prpltwtr-lang"/>
@@ -3077,6 +3111,7 @@
     <package name="libzapojit-0_0-0"/>
     <package name="libzbar0"/>
     <package name="libzebra1"/>
+    <package name="libzeitgeist-2_0-0"/>
     <package name="libzhuyin-1_1-data"/>
     <package name="libzhuyin13"/>
     <package name="libzhuyin7"/>
@@ -3100,6 +3135,7 @@
     <package name="lightsoff-lang"/>
     <package name="links"/>
     <package name="linux-glibc-devel"/>
+    <package name="lirc-core"/>
     <package name="lklug-fonts"/>
     <package name="lockdev"/>
     <package name="log4j"/>
@@ -3332,6 +3368,13 @@
     <package name="nuoveXT2-icon-theme"/>
     <package name="nut"/>
     <package name="nut-cgi"/>
+    <package name="nut-devel-doc-html"/>
+    <package name="nut-devel-doc-pdf"/>
+    <package name="nut-doc-asciidoc"/>
+    <package name="nut-doc-html"/>
+    <package name="nut-doc-images"/>
+    <package name="nut-doc-pdf"/>
+    <package name="nut-drivers-net"/>
     <package name="obconf"/>
     <package name="obs-service-download_files"/>
     <package name="obs-service-download_url"/>
@@ -3864,6 +3907,7 @@
     <package name="pidgin-plugin-mattermost"/>
     <package name="pidgin-plugin-mrim"/>
     <package name="pidgin-plugin-pack"/>
+    <package name="pidgin-plugin-pack-extras"/>
     <package name="pidgin-plugin-prpltwtr"/>
     <package name="pidgin-plugin-rocketchat"/>
     <package name="pidgin-plugin-sipe"/>
@@ -3981,6 +4025,7 @@
     <package name="pulseaudio-lang"/>
     <package name="pulseaudio-module-bluetooth"/>
     <package name="pulseaudio-module-gsettings"/>
+    <package name="pulseaudio-module-lirc"/>
     <package name="pulseaudio-module-x11"/>
     <package name="pulseaudio-module-zeroconf"/>
     <package name="pulseaudio-utils"/>
@@ -4821,6 +4866,7 @@
     <package name="typelib-1_0-Geoclue-2_0"/>
     <package name="typelib-1_0-GeocodeGlib-1_0"/>
     <package name="typelib-1_0-Gepub-0_6"/>
+    <package name="typelib-1_0-Ggit-1_0"/>
     <package name="typelib-1_0-GjsPrivate-1_0"/>
     <package name="typelib-1_0-GnomeBluetooth-1_0"/>
     <package name="typelib-1_0-GnomeDesktop-3_0"/>
@@ -4838,6 +4884,7 @@
     <package name="typelib-1_0-Gtk-3_0"/>
     <package name="typelib-1_0-GtkClutter-1_0"/>
     <package name="typelib-1_0-GtkSource-3_0"/>
+    <package name="typelib-1_0-Gucharmap-2_90"/>
     <package name="typelib-1_0-IBus-1_0"/>
     <package name="typelib-1_0-JavaScriptCore-4_0"/>
     <package name="typelib-1_0-Json-1_0"/>
@@ -4868,6 +4915,7 @@
     <package name="typelib-1_0-WebKit2-4_0"/>
     <package name="typelib-1_0-Wnck-3_0"/>
     <package name="typelib-1_0-Xkl-1_0"/>
+    <package name="typelib-1_0-Zeitgeist-2_0"/>
     <package name="typelib-1_0-Zpj-0_0"/>
     <package name="typelib-1_0-libdazzle-1_0"/>
     <package name="ucode-amd"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index 900fcbef..2c543158 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -425,6 +425,9 @@
     <package name="ding"/>
     <package name="ding-dict-de_en"/>
     <package name="discover"/>
+    <package name="discover-backend-flatpak"/>
+    <package name="discover-backend-fwupd"/>
+    <package name="discover-backend-packagekit"/>
     <package name="discover-lang"/>
     <package name="djvulibre"/>
     <package name="dleyna-connector-dbus"/>
@@ -2651,6 +2654,8 @@
     <package name="libopenraw1"/>
     <package name="libopenssl-1_1-devel"/>
     <package name="libopenssl-devel"/>
+    <package name="libopenssl1_0_0"/>
+    <package name="libopenssl1_0_0-hmac"/>
     <package name="libopenssl1_1"/>
     <package name="libopenssl1_1-32bit"/>
     <package name="libopenssl1_1-hmac"/>
diff --git a/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi b/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
index b4ebff17..06491004 100644
--- a/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
+++ b/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
@@ -382,7 +382,6 @@
       <repopackage name="libobjc46" onlyarch="skipit"/>
       <repopackage name="libobjc46-32bit" onlyarch="skipit"/>
       <repopackage name="libopenal1-32bit" arch="x86_64"/>
-      <repopackage name="libopenssl1_0_0"/>
       <repopackage name="libopenssl1_0_0-steam"/>
       <repopackage name="libopenssl1_0_0-steam-32bit" arch="x86_64"/>
       <repopackage name="libOSMesa-devel"/>
diff --git a/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
index f5345cb9..72889dd1 100644
--- a/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
@@ -194,8 +194,6 @@
       <repopackage name="gio-branding-openSUSE"/>
       <repopackage name="gio-branding-openSUSE"/>
       <repopackage name="gio-branding-openSUSE"/>
-      <repopackage name="git-core"/>
-      <repopackage name="git-core"/>
       <repopackage name="glib-networking"/>
       <repopackage name="glib-networking"/>
       <repopackage name="glib-networking"/>
@@ -286,8 +284,6 @@
       <repopackage name="kubernetes-kubelet"/>
       <repopackage name="kubic-locale-archive"/>
       <repopackage name="less"/>
-      <repopackage name="less"/>
-      <repopackage name="less"/>
       <repopackage name="libacl1"/>
       <repopackage name="libacl1"/>
       <repopackage name="libacl1"/>
@@ -353,8 +349,6 @@
       <repopackage name="libcryptsetup12"/>
       <repopackage name="libcryptsetup12"/>
       <repopackage name="libcurl4"/>
-      <repopackage name="libcurl4"/>
-      <repopackage name="libcurl4"/>
       <repopackage name="libdb-4_8"/>
       <repopackage name="libdb-4_8"/>
       <repopackage name="libdb-4_8"/>
@@ -375,8 +369,6 @@
       <repopackage name="libebl-plugins"/>
       <repopackage name="libebl-plugins"/>
       <repopackage name="libedit0"/>
-      <repopackage name="libedit0"/>
-      <repopackage name="libedit0"/>
       <repopackage name="libefivar1"/>
       <repopackage name="libelf1"/>
       <repopackage name="libelf1"/>
@@ -528,8 +520,6 @@
       <repopackage name="libnftnl7"/>
       <repopackage name="libnftnl7"/>
       <repopackage name="libnghttp2-14"/>
-      <repopackage name="libnghttp2-14"/>
-      <repopackage name="libnghttp2-14"/>
       <repopackage name="libnl-config"/>
       <repopackage name="libnl-config"/>
       <repopackage name="libnl-config"/>
@@ -545,6 +535,7 @@
       <repopackage name="libnuma1"/>
       <repopackage name="liboath0"/>
       <repopackage name="libopeniscsiusr0_2_0"/>
+      <repopackage name="libopenssl1_0_0"/>
       <repopackage name="libopenssl1_1"/>
       <repopackage name="libopenssl1_1"/>
       <repopackage name="libopenssl1_1"/>
@@ -576,8 +567,6 @@
       <repopackage name="libproxy1"/>
       <repopackage name="libproxy1"/>
       <repopackage name="libpsl5"/>
-      <repopackage name="libpsl5"/>
-      <repopackage name="libpsl5"/>
       <repopackage name="libpython2_7-1_0"/>
       <repopackage name="libpython3_6m1_0"/>
       <repopackage name="libpython3_6m1_0"/>
@@ -611,8 +600,6 @@
       <repopackage name="libsepol1"/>
       <repopackage name="libsepol1"/>
       <repopackage name="libsgutils2-1_43-2"/>
-      <repopackage name="libsha1detectcoll1"/>
-      <repopackage name="libsha1detectcoll1"/>
       <repopackage name="libsmartcols1"/>
       <repopackage name="libsmartcols1"/>
       <repopackage name="libsmartcols1"/>
@@ -627,8 +614,6 @@
       <repopackage name="libsqlite3-0"/>
       <repopackage name="libsqlite3-0"/>
       <repopackage name="libssh4"/>
-      <repopackage name="libssh4"/>
-      <repopackage name="libssh4"/>
       <repopackage name="libsss_certmap0"/>
       <repopackage name="libsss_certmap0"/>
       <repopackage name="libsss_idmap0"/>
@@ -733,10 +718,6 @@
       <repopackage name="open-lldp"/>
       <repopackage name="open-vm-tools"/>
       <repopackage name="openslp"/>
-      <repopackage name="openslp"/>
-      <repopackage name="openslp"/>
-      <repopackage name="openssh"/>
-      <repopackage name="openssh"/>
       <repopackage name="openssh"/>
       <repopackage name="openssl"/>
       <repopackage name="openssl"/>
@@ -790,8 +771,6 @@
       <repopackage name="perl-Bootloader"/>
       <repopackage name="perl-Bootloader"/>
       <repopackage name="perl-Bootloader"/>
-      <repopackage name="perl-Error"/>
-      <repopackage name="perl-Error"/>
       <repopackage name="perl-HTML-Parser"/>
       <repopackage name="perl-HTML-Tagset"/>
       <repopackage name="perl-JSON"/>
@@ -872,8 +851,6 @@
       <repopackage name="rpm-config-SUSE"/>
       <repopackage name="rpm-config-SUSE"/>
       <repopackage name="rsync"/>
-      <repopackage name="rsync"/>
-      <repopackage name="rsync"/>
       <repopackage name="rsyslog"/>
       <repopackage name="runc"/>
       <repopackage name="runc"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 48854361..f73ff56a 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -419,6 +419,9 @@
       <repopackage name="ding" arch="i586,i686"/>
       <repopackage name="ding-dict-de_en" arch="i586,i686"/>
       <repopackage name="discover" arch="i586,i686"/>
+      <repopackage name="discover-backend-flatpak" arch="i586,i686"/>
+      <repopackage name="discover-backend-fwupd" arch="i586,i686"/>
+      <repopackage name="discover-backend-packagekit" arch="i586,i686"/>
       <repopackage name="discover-lang" arch="i586,i686"/>
       <repopackage name="djvulibre" arch="i586,i686"/>
       <repopackage name="dleyna-connector-dbus" arch="i586,i686"/>
@@ -482,7 +485,9 @@
       <repopackage name="enscript" arch="i586,i686"/>
       <repopackage name="eog" arch="i586,i686"/>
       <repopackage name="eog-lang" arch="i586,i686"/>
+      <repopackage name="eog-plugin-exif-display" arch="i586,i686"/>
       <repopackage name="eog-plugins" arch="i586,i686"/>
+      <repopackage name="eog-plugins-data" arch="i586,i686"/>
       <repopackage name="eog-plugins-lang" arch="i586,i686"/>
       <repopackage name="epiphany" arch="i586,i686"/>
       <repopackage name="epiphany-branding-openSUSE" arch="i586,i686"/>
@@ -579,6 +584,8 @@
       <repopackage name="fontconfig-devel" arch="i586,i686"/>
       <repopackage name="fonts-config" arch="i586,i686"/>
       <repopackage name="fonts-KanjiStrokeOrders" arch="i586,i686"/>
+      <repopackage name="fortune" arch="i586,i686"/>
+      <repopackage name="fossil" arch="i586,i686"/>
       <repopackage name="fprintd" arch="i586,i686"/>
       <repopackage name="fprintd-lang" arch="i586,i686"/>
       <repopackage name="fprintd-pam" arch="i586,i686"/>
@@ -660,7 +667,25 @@
       <repopackage name="geany-plugins-lang" arch="i586,i686"/>
       <repopackage name="gedit" arch="i586,i686"/>
       <repopackage name="gedit-lang" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-bookmarks" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-bracketcompletion" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-charmap" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-codecomment" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-colorpicker" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-colorschemer" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-commander" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-dashboard" arch="i586,i686"/>
       <repopackage name="gedit-plugin-devhelp" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-drawspaces" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-findinfiles" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-git" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-joinlines" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-multiedit" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-smartspaces" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-synctex" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-terminal" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-textsize" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-wordcompletion" arch="i586,i686"/>
       <repopackage name="gedit-plugins" arch="i586,i686"/>
       <repopackage name="gedit-plugins-data" arch="i586,i686"/>
       <repopackage name="gedit-plugins-lang" arch="i586,i686"/>
@@ -1426,6 +1451,7 @@
       <repopackage name="kruler" arch="i586,i686"/>
       <repopackage name="kruler-lang" arch="i586,i686"/>
       <repopackage name="krusader" arch="i586,i686"/>
+      <repopackage name="krusader-doc" arch="i586,i686"/>
       <repopackage name="kscd" arch="i586,i686"/>
       <repopackage name="kscreen5" arch="i586,i686"/>
       <repopackage name="kscreen5-lang" arch="i586,i686"/>
@@ -1808,6 +1834,7 @@
       <repopackage name="libfreetype6" arch="i586,i686"/>
       <repopackage name="libfribidi0" arch="i586,i686"/>
       <repopackage name="libfstrm0" arch="i586,i686"/>
+      <repopackage name="libftdi1-2" arch="i586,i686"/>
       <repopackage name="libftgl2" arch="i586,i686"/>
       <repopackage name="libfuse2" arch="i586,i686"/>
       <repopackage name="libfwupd2" arch="i586,i686"/>
@@ -1831,6 +1858,7 @@
       <repopackage name="libgda-5_0-4" arch="i586,i686"/>
       <repopackage name="libgda-5_0-4-lang" arch="i586,i686"/>
       <repopackage name="libgda-5_0-bdb" arch="i586,i686"/>
+      <repopackage name="libgda-5_0-sqlcipher" arch="i586,i686"/>
       <repopackage name="libgda-5_0-sqlite" arch="i586,i686"/>
       <repopackage name="libgda-ui-5_0-4" arch="i586,i686"/>
       <repopackage name="libgda-ui-5_0-plugins" arch="i586,i686"/>
@@ -2037,6 +2065,7 @@
       <repopackage name="libiptcdata" arch="i586,i686"/>
       <repopackage name="libiptcdata-lang" arch="i586,i686"/>
       <repopackage name="libiptcdata0" arch="i586,i686"/>
+      <repopackage name="libirrecord0" arch="i586,i686"/>
       <repopackage name="libirs160" arch="i586,i686"/>
       <repopackage name="libisc166" arch="i586,i686"/>
       <repopackage name="libisccc160" arch="i586,i686"/>
@@ -2300,7 +2329,9 @@
       <repopackage name="liblightdm-gobject-1-0" arch="i586,i686"/>
       <repopackage name="liblilv-0-0" arch="i586,i686"/>
       <repopackage name="liblink-grammar5" arch="i586,i686"/>
+      <repopackage name="liblirc0" arch="i586,i686"/>
       <repopackage name="liblirc_client0" arch="i586,i686"/>
+      <repopackage name="liblirc_driver0" arch="i586,i686"/>
       <repopackage name="libLLVM6" arch="i586,i686"/>
       <repopackage name="liblmdb-0_9_22" arch="i586,i686"/>
       <repopackage name="liblockdev1" arch="i586,i686"/>
@@ -2441,6 +2472,8 @@
       <repopackage name="libopenraw1" arch="i586,i686"/>
       <repopackage name="libopenssl-1_1-devel" arch="i586,i686"/>
       <repopackage name="libopenssl-devel" arch="i586,i686"/>
+      <repopackage name="libopenssl1_0_0" arch="i586,i686"/>
+      <repopackage name="libopenssl1_0_0-hmac" arch="i586,i686"/>
       <repopackage name="libopenssl1_1" arch="i586,i686"/>
       <repopackage name="libopenssl1_1-hmac" arch="i586,i686"/>
       <repopackage name="libopts25" arch="i586,i686"/>
@@ -2549,6 +2582,7 @@
       <repopackage name="libpurple-plugin-mrim" arch="i586,i686"/>
       <repopackage name="libpurple-plugin-mrim-lang" arch="i586,i686"/>
       <repopackage name="libpurple-plugin-pack" arch="i586,i686"/>
+      <repopackage name="libpurple-plugin-pack-extras" arch="i586,i686"/>
       <repopackage name="libpurple-plugin-pack-lang" arch="i586,i686"/>
       <repopackage name="libpurple-plugin-prpltwtr" arch="i586,i686"/>
       <repopackage name="libpurple-plugin-prpltwtr-lang" arch="i586,i686"/>
@@ -3086,6 +3120,7 @@
       <repopackage name="libzapojit-0_0-0" arch="i586,i686"/>
       <repopackage name="libzbar0" arch="i586,i686"/>
       <repopackage name="libzebra1" arch="i586,i686"/>
+      <repopackage name="libzeitgeist-2_0-0" arch="i586,i686"/>
       <repopackage name="libzhuyin-1_1-data" arch="i586,i686"/>
       <repopackage name="libzhuyin13" arch="i586,i686"/>
       <repopackage name="libzhuyin7" arch="i586,i686"/>
@@ -3109,6 +3144,7 @@
       <repopackage name="lightsoff-lang" arch="i586,i686"/>
       <repopackage name="links" arch="i586,i686"/>
       <repopackage name="linux-glibc-devel" arch="i586,i686"/>
+      <repopackage name="lirc-core" arch="i586,i686"/>
       <repopackage name="lklug-fonts" arch="i586,i686"/>
       <repopackage name="lockdev" arch="i586,i686"/>
       <repopackage name="log4j" arch="i586,i686"/>
@@ -3377,6 +3413,13 @@
       <repopackage name="nuoveXT2-icon-theme" arch="i586,i686"/>
       <repopackage name="nut" arch="i586,i686"/>
       <repopackage name="nut-cgi" arch="i586,i686"/>
+      <repopackage name="nut-devel-doc-html" arch="i586,i686"/>
+      <repopackage name="nut-devel-doc-pdf" arch="i586,i686"/>
+      <repopackage name="nut-doc-asciidoc" arch="i586,i686"/>
+      <repopackage name="nut-doc-html" arch="i586,i686"/>
+      <repopackage name="nut-doc-images" arch="i586,i686"/>
+      <repopackage name="nut-doc-pdf" arch="i586,i686"/>
+      <repopackage name="nut-drivers-net" arch="i586,i686"/>
       <repopackage name="obconf" arch="i586,i686"/>
       <repopackage name="obs-service-download_files" arch="i586,i686"/>
       <repopackage name="obs-service-download_url" arch="i586,i686"/>
@@ -3919,6 +3962,7 @@
       <repopackage name="pidgin-plugin-mattermost" arch="i586,i686"/>
       <repopackage name="pidgin-plugin-mrim" arch="i586,i686"/>
       <repopackage name="pidgin-plugin-pack" arch="i586,i686"/>
+      <repopackage name="pidgin-plugin-pack-extras" arch="i586,i686"/>
       <repopackage name="pidgin-plugin-prpltwtr" arch="i586,i686"/>
       <repopackage name="pidgin-plugin-rocketchat" arch="i586,i686"/>
       <repopackage name="pidgin-plugin-sipe" arch="i586,i686"/>
@@ -4036,6 +4080,7 @@
       <repopackage name="pulseaudio-lang" arch="i586,i686"/>
       <repopackage name="pulseaudio-module-bluetooth" arch="i586,i686"/>
       <repopackage name="pulseaudio-module-gsettings" arch="i586,i686"/>
+      <repopackage name="pulseaudio-module-lirc" arch="i586,i686"/>
       <repopackage name="pulseaudio-module-x11" arch="i586,i686"/>
       <repopackage name="pulseaudio-module-zeroconf" arch="i586,i686"/>
       <repopackage name="pulseaudio-utils" arch="i586,i686"/>
@@ -4874,6 +4919,7 @@
       <repopackage name="typelib-1_0-Gepub-0_6" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GES-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GFBGraph-0_2" arch="i586,i686"/>
+      <repopackage name="typelib-1_0-Ggit-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GjsPrivate-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GMenu-3_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GnomeBluetooth-1_0" arch="i586,i686"/>
@@ -4893,6 +4939,7 @@
       <repopackage name="typelib-1_0-Gtk-3_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GtkClutter-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GtkSource-3_0" arch="i586,i686"/>
+      <repopackage name="typelib-1_0-Gucharmap-2_90" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GWeather-3_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-IBus-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-JavaScriptCore-4_0" arch="i586,i686"/>
@@ -4925,6 +4972,7 @@
       <repopackage name="typelib-1_0-WebKit2-4_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-Wnck-3_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-Xkl-1_0" arch="i586,i686"/>
+      <repopackage name="typelib-1_0-Zeitgeist-2_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-Zpj-0_0" arch="i586,i686"/>
       <repopackage name="ucode-amd" arch="i586,i686"/>
       <repopackage name="ucode-intel" arch="i586,i686"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
index d91060bd..ccf3b247 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -427,6 +427,9 @@
       <repopackage name="ding" arch="x86_64"/>
       <repopackage name="ding-dict-de_en" arch="x86_64"/>
       <repopackage name="discover" arch="x86_64"/>
+      <repopackage name="discover-backend-flatpak" arch="x86_64"/>
+      <repopackage name="discover-backend-fwupd" arch="x86_64"/>
+      <repopackage name="discover-backend-packagekit" arch="x86_64"/>
       <repopackage name="discover-lang" arch="x86_64"/>
       <repopackage name="djvulibre" arch="x86_64"/>
       <repopackage name="dleyna-connector-dbus" arch="x86_64"/>
@@ -2545,6 +2548,8 @@
       <repopackage name="libopenraw1" arch="x86_64"/>
       <repopackage name="libopenssl-1_1-devel" arch="x86_64"/>
       <repopackage name="libopenssl-devel" arch="x86_64"/>
+      <repopackage name="libopenssl1_0_0" arch="x86_64"/>
+      <repopackage name="libopenssl1_0_0-hmac" arch="x86_64"/>
       <repopackage name="libopenssl1_1" arch="x86_64"/>
       <repopackage name="libopenssl1_1-32bit" arch="x86_64"/>
       <repopackage name="libopenssl1_1-hmac" arch="x86_64"/>
diff --git a/openSUSE-Addon-NonOss-Deps.group b/openSUSE-Addon-NonOss-Deps.group
index ade99e30..55c1cc25 100644
--- a/openSUSE-Addon-NonOss-Deps.group
+++ b/openSUSE-Addon-NonOss-Deps.group
@@ -24,7 +24,6 @@
     <package name="libgbm-devel"/>
     <package name="libglut3"/>
     <package name="libglvnd-devel"/>
-    <package name="libopenssl1_0_0"/>
     <package name="libopenssl1_0_0-steam"/>
     <package name="libregina3"/>
     <package name="libvulkan1"/>
diff --git a/openSUSE-Kubic-3.group b/openSUSE-Kubic-3.group
index 193a60df..cb6c1a62 100644
--- a/openSUSE-Kubic-3.group
+++ b/openSUSE-Kubic-3.group
@@ -45,7 +45,6 @@
     <package name="findutils"/>
     <package name="gawk"/>
     <package name="gio-branding-openSUSE"/>
-    <package name="git-core"/>
     <package name="glib-networking"/>
     <package name="glib2-tools"/>
     <package name="glibc"/>
@@ -67,7 +66,6 @@
     <package name="kubernetes-common"/>
     <package name="kubernetes-kubeadm"/>
     <package name="kubernetes-kubelet"/>
-    <package name="less"/>
     <package name="libacl1"/>
     <package name="libapparmor1"/>
     <package name="libarchive13"/>
@@ -87,14 +85,12 @@
     <package name="libcontainers-common"/>
     <package name="libcrack2"/>
     <package name="libcryptsetup12"/>
-    <package name="libcurl4"/>
     <package name="libdb-4_8"/>
     <package name="libdbus-1-3"/>
     <package name="libdevmapper1_03"/>
     <package name="libdhash1"/>
     <package name="libdw1"/>
     <package name="libebl-plugins"/>
-    <package name="libedit0"/>
     <package name="libelf1"/>
     <package name="libexpat1"/>
     <package name="libext2fs2"/>
@@ -138,7 +134,6 @@
     <package name="libnettle6"/>
     <package name="libnfnetlink0"/>
     <package name="libnftnl7"/>
-    <package name="libnghttp2-14"/>
     <package name="libnl-config"/>
     <package name="libnl3-200"/>
     <package name="libnpth0"/>
@@ -152,7 +147,6 @@
     <package name="libpopt0"/>
     <package name="libprocps7"/>
     <package name="libproxy1"/>
-    <package name="libpsl5"/>
     <package name="libpython3_6m1_0"/>
     <package name="libqrencode4"/>
     <package name="libreadline7"/>
@@ -162,11 +156,9 @@
     <package name="libselinux1"/>
     <package name="libsemanage1"/>
     <package name="libsepol1"/>
-    <package name="libsha1detectcoll1"/>
     <package name="libsmartcols1"/>
     <package name="libsoup-2_4-1"/>
     <package name="libsqlite3-0"/>
-    <package name="libssh4"/>
     <package name="libsss_certmap0"/>
     <package name="libsss_idmap0"/>
     <package name="libsss_nss_idmap0"/>
@@ -193,8 +185,6 @@
     <package name="libzio1"/>
     <package name="ncurses-utils"/>
     <package name="netcfg"/>
-    <package name="openslp"/>
-    <package name="openssh"/>
     <package name="openssl"/>
     <package name="openssl-1_1"/>
     <package name="p11-kit"/>
@@ -209,7 +199,6 @@
     <package name="patterns-caasp-sssd-ldap"/>
     <package name="perl"/>
     <package name="perl-Bootloader"/>
-    <package name="perl-Error"/>
     <package name="perl-apparmor"/>
     <package name="perl-base"/>
     <package name="permissions"/>
@@ -224,7 +213,6 @@
     <package name="python3-base"/>
     <package name="rpm"/>
     <package name="rpm-config-SUSE"/>
-    <package name="rsync"/>
     <package name="runc"/>
     <package name="sed"/>
     <package name="shadow"/>
diff --git a/openSUSE-Kubic-DVD.group b/openSUSE-Kubic-DVD.group
index 5f87be41..99072163 100644
--- a/openSUSE-Kubic-DVD.group
+++ b/openSUSE-Kubic-DVD.group
@@ -44,7 +44,6 @@
     <package name="findutils"/>
     <package name="gawk"/>
     <package name="gio-branding-openSUSE"/>
-    <package name="git-core"/>
     <package name="glib-networking"/>
     <package name="glib2-tools"/>
     <package name="glibc"/>
@@ -72,7 +71,6 @@
     <package name="kubernetes-common"/>
     <package name="kubernetes-kubeadm"/>
     <package name="kubernetes-kubelet"/>
-    <package name="less"/>
     <package name="libacl1"/>
     <package name="libapparmor1"/>
     <package name="libarchive13"/>
@@ -92,7 +90,6 @@
     <package name="libcontainers-common"/>
     <package name="libcrack2"/>
     <package name="libcryptsetup12"/>
-    <package name="libcurl4"/>
     <package name="libdb-4_8"/>
     <package name="libdbus-1-3"/>
     <package name="libdevmapper1_03"/>
@@ -100,7 +97,6 @@
     <package name="libdnet1"/>
     <package name="libdw1"/>
     <package name="libebl-plugins"/>
-    <package name="libedit0"/>
     <package name="libelf1"/>
     <package name="libexpat1"/>
     <package name="libext2fs2"/>
@@ -148,7 +144,6 @@
     <package name="libnettle6"/>
     <package name="libnfnetlink0"/>
     <package name="libnftnl7"/>
-    <package name="libnghttp2-14"/>
     <package name="libnl-config"/>
     <package name="libnl3-200"/>
     <package name="libnpth0"/>
@@ -162,7 +157,6 @@
     <package name="libpopt0"/>
     <package name="libprocps7"/>
     <package name="libproxy1"/>
-    <package name="libpsl5"/>
     <package name="libpython2_7-1_0"/>
     <package name="libpython3_6m1_0"/>
     <package name="libqrencode4"/>
@@ -173,11 +167,9 @@
     <package name="libselinux1"/>
     <package name="libsemanage1"/>
     <package name="libsepol1"/>
-    <package name="libsha1detectcoll1"/>
     <package name="libsmartcols1"/>
     <package name="libsoup-2_4-1"/>
     <package name="libsqlite3-0"/>
-    <package name="libssh4"/>
     <package name="libsss_certmap0"/>
     <package name="libsss_idmap0"/>
     <package name="libsss_nss_idmap0"/>
@@ -213,8 +205,6 @@
     <package name="open-vm-tools"/>
     <package name="openSUSE-Tumbleweed-Kubic-release"/>
     <package name="openSUSE-Tumbleweed-Kubic-release-dvd"/>
-    <package name="openslp"/>
-    <package name="openssh"/>
     <package name="openssl"/>
     <package name="openssl-1_1"/>
     <package name="p11-kit"/>
@@ -230,7 +220,6 @@
     <package name="patterns-caasp-sssd-ldap"/>
     <package name="perl"/>
     <package name="perl-Bootloader"/>
-    <package name="perl-Error"/>
     <package name="perl-apparmor"/>
     <package name="perl-base"/>
     <package name="permissions"/>
@@ -246,7 +235,6 @@
     <package name="python3-base"/>
     <package name="rpm"/>
     <package name="rpm-config-SUSE"/>
-    <package name="rsync"/>
     <package name="runc"/>
     <package name="sed"/>
     <package name="shadow"/>
diff --git a/openSUSE-Kubic.group b/openSUSE-Kubic.group
index 21a47c6c..5c89e601 100644
--- a/openSUSE-Kubic.group
+++ b/openSUSE-Kubic.group
@@ -198,6 +198,7 @@
     <package name="libnuma1"/>
     <package name="liboath0"/>
     <package name="libopeniscsiusr0_2_0"/>
+    <package name="libopenssl1_0_0"/>
     <package name="libopenssl1_1"/>
     <package name="libostree-1-1"/>
     <package name="libp11-kit0"/>