diff --git a/DVD5-i586.group b/DVD5-i586.group
index e47660c8..3b924d3e 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -460,6 +460,7 @@
     <package name="ecj"/>
     <package name="ed"/>
     <package name="edict"/>
+    <package name="edict2"/>
     <package name="eekboard"/>
     <package name="efibootmgr"/>
     <package name="efont-unicode-bitmap-fonts"/>
@@ -1116,6 +1117,7 @@
     <package name="jhbuild-lang"/>
     <package name="jhead"/>
     <package name="jline"/>
+    <package name="jmdict"/>
     <package name="joe"/>
     <package name="json-glib-lang"/>
     <package name="juk"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index 505e78fa..ae86ee07 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -468,6 +468,7 @@
     <package name="ecj"/>
     <package name="ed"/>
     <package name="edict"/>
+    <package name="edict2"/>
     <package name="eekboard"/>
     <package name="efibootmgr"/>
     <package name="efont-unicode-bitmap-fonts"/>
@@ -1138,6 +1139,7 @@
     <package name="jhbuild-lang"/>
     <package name="jhead"/>
     <package name="jline"/>
+    <package name="jmdict"/>
     <package name="joe"/>
     <package name="json-glib-lang"/>
     <package name="juk"/>
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 42789992..7b778018 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
@@ -397,7 +397,6 @@
       <repopackage name="libsndfile1-32bit" arch="x86_64"/>
       <repopackage name="libsoftokn3-32bit" arch="x86_64"/>
       <repopackage name="libspeex1-32bit" arch="x86_64"/>
-      <repopackage name="libSPIRV-Tools-suse8"/>
       <repopackage name="libssh4-32bit" arch="x86_64"/>
       <repopackage name="libstdc++41" onlyarch="skipit"/>
       <repopackage name="libstdc++41-32bit" onlyarch="skipit"/>
@@ -433,7 +432,6 @@
       <repopackage name="libunrar-devel"/>
       <repopackage name="libunrar5_6_8"/>
       <repopackage name="libvorbisenc2-32bit" arch="x86_64"/>
-      <repopackage name="libvulkan1"/>
       <repopackage name="libX11-xcb1-32bit" arch="x86_64"/>
       <repopackage name="libxcb-dri2-0-32bit" arch="x86_64"/>
       <repopackage name="libxcb-dri3-0-32bit" arch="x86_64"/>
@@ -551,7 +549,6 @@
       <repopackage name="ubuntu-fonts"/>
       <repopackage name="udev-mini" onlyarch="skipit"/>
       <repopackage name="unrar"/>
-      <repopackage name="vulkan"/>
       <repopackage name="xv"/>
       <repopackage name="yast2-all-packages" onlyarch="skipit"/>
       <repopackage name="yast2-branding-SLED" onlyarch="skipit"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index be680cee..c08f9d0c 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -459,6 +459,7 @@
       <repopackage name="ecj" arch="i586,i686"/>
       <repopackage name="ed" arch="i586,i686"/>
       <repopackage name="edict" arch="i586,i686"/>
+      <repopackage name="edict2" arch="i586,i686"/>
       <repopackage name="eekboard" arch="i586,i686"/>
       <repopackage name="efibootmgr" arch="i586,i686"/>
       <repopackage name="efont-unicode-bitmap-fonts" arch="i586,i686"/>
@@ -1122,6 +1123,7 @@
       <repopackage name="jhbuild-lang" arch="i586,i686"/>
       <repopackage name="jhead" arch="i586,i686"/>
       <repopackage name="jline" arch="i586,i686"/>
+      <repopackage name="jmdict" arch="i586,i686"/>
       <repopackage name="joe" arch="i586,i686"/>
       <repopackage name="json-glib-lang" arch="i586,i686"/>
       <repopackage name="juk" 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 5fe8bc2d..35562f7d 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -470,6 +470,7 @@
       <repopackage name="ecj" arch="x86_64"/>
       <repopackage name="ed" arch="x86_64"/>
       <repopackage name="edict" arch="x86_64"/>
+      <repopackage name="edict2" arch="x86_64"/>
       <repopackage name="eekboard" arch="x86_64"/>
       <repopackage name="efibootmgr" arch="x86_64"/>
       <repopackage name="efont-unicode-bitmap-fonts" arch="x86_64"/>
@@ -1145,6 +1146,7 @@
       <repopackage name="jhbuild-lang" arch="x86_64"/>
       <repopackage name="jhead" arch="x86_64"/>
       <repopackage name="jline" arch="x86_64"/>
+      <repopackage name="jmdict" arch="x86_64"/>
       <repopackage name="joe" arch="x86_64"/>
       <repopackage name="json-glib-lang" arch="x86_64"/>
       <repopackage name="juk" arch="x86_64"/>
diff --git a/openSUSE-Addon-NonOss-Deps.group b/openSUSE-Addon-NonOss-Deps.group
index d9258f63..ede6e4c2 100644
--- a/openSUSE-Addon-NonOss-Deps.group
+++ b/openSUSE-Addon-NonOss-Deps.group
@@ -17,7 +17,6 @@
     <package name="glu-devel"/>
     <package name="libOSMesa-devel"/>
     <package name="libOSMesa8"/>
-    <package name="libSPIRV-Tools-suse8"/>
     <package name="libXdamage-devel"/>
     <package name="libXxf86vm-devel"/>
     <package name="libenet7"/>
@@ -26,13 +25,11 @@
     <package name="libglvnd-devel"/>
     <package name="libopenssl1_0_0-steam"/>
     <package name="libregina3"/>
-    <package name="libvulkan1"/>
     <package name="lksctp-tools"/>
     <package name="openttd-data"/>
     <package name="openttd-opengfx"/>
     <package name="steamtricks"/>
     <package name="steamtricks-data"/>
     <package name="ubuntu-fonts"/>
-    <package name="vulkan"/>
   </packagelist>
 </group>