diff --git a/DVD5-i586.group b/DVD5-i586.group
index 1469340d..b33fb2fd 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -828,7 +828,6 @@
     <package name="gnome-shell-search-provider-gnome-photos"/>
     <package name="gnome-shell-search-provider-gnome-terminal"/>
     <package name="gnome-shell-search-provider-gnome-weather"/>
-    <package name="gnome-shell-search-provider-gnote"/>
     <package name="gnome-shell-search-provider-nautilus"/>
     <package name="gnome-shell-search-provider-seahorse"/>
     <package name="gnome-software"/>
@@ -851,8 +850,6 @@
     <package name="gnome-video-effects"/>
     <package name="gnome-weather"/>
     <package name="gnome-weather-lang"/>
-    <package name="gnote"/>
-    <package name="gnote-lang"/>
     <package name="gnu-unifont-bitmap-fonts"/>
     <package name="gnutls"/>
     <package name="goffice-lang"/>
@@ -4050,7 +4047,6 @@
     <package name="python-qt5-utils"/>
     <package name="python-rpm-macros"/>
     <package name="python-sip-common"/>
-    <package name="python-solv"/>
     <package name="python-talloc"/>
     <package name="python-xml"/>
     <package name="python2-M2Crypto"/>
@@ -4181,6 +4177,7 @@
     <package name="python3-pyxdg"/>
     <package name="python3-qt5"/>
     <package name="python3-requests"/>
+    <package name="python3-rpm"/>
     <package name="python3-setuptools"/>
     <package name="python3-sip"/>
     <package name="python3-six"/>
@@ -4188,6 +4185,7 @@
     <package name="python3-slip-dbus"/>
     <package name="python3-smbios"/>
     <package name="python3-smbios-utils"/>
+    <package name="python3-solv"/>
     <package name="python3-speechd"/>
     <package name="python3-urllib3"/>
     <package name="python3-xcffib"/>
@@ -4420,6 +4418,7 @@
     <package name="ruby2.5-rubygem-mixlib-authentication"/>
     <package name="ruby2.5-rubygem-mixlib-config"/>
     <package name="ruby2.5-rubygem-mixlib-log"/>
+    <package name="ruby2.5-rubygem-mixlib-shellout"/>
     <package name="ruby2.5-rubygem-mocha"/>
     <package name="ruby2.5-rubygem-msgpack"/>
     <package name="ruby2.5-rubygem-multi_json"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index b3f7c721..1465ab09 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -823,7 +823,6 @@
     <package name="gnome-shell-search-provider-gnome-photos"/>
     <package name="gnome-shell-search-provider-gnome-terminal"/>
     <package name="gnome-shell-search-provider-gnome-weather"/>
-    <package name="gnome-shell-search-provider-gnote"/>
     <package name="gnome-shell-search-provider-nautilus"/>
     <package name="gnome-shell-search-provider-seahorse"/>
     <package name="gnome-software"/>
@@ -846,8 +845,6 @@
     <package name="gnome-video-effects"/>
     <package name="gnome-weather"/>
     <package name="gnome-weather-lang"/>
-    <package name="gnote"/>
-    <package name="gnote-lang"/>
     <package name="gnu-unifont-bitmap-fonts"/>
     <package name="gnutls"/>
     <package name="goffice-lang"/>
@@ -4187,7 +4184,6 @@
     <package name="python-qt5-utils"/>
     <package name="python-rpm-macros"/>
     <package name="python-sip-common"/>
-    <package name="python-solv"/>
     <package name="python-talloc"/>
     <package name="python-talloc-32bit"/>
     <package name="python-xml"/>
@@ -4329,6 +4325,7 @@
     <package name="python3-slip-dbus"/>
     <package name="python3-smbios"/>
     <package name="python3-smbios-utils"/>
+    <package name="python3-solv"/>
     <package name="python3-speechd"/>
     <package name="python3-urllib3"/>
     <package name="python3-virt-bootstrap"/>
@@ -4563,6 +4560,7 @@
     <package name="ruby2.5-rubygem-mixlib-authentication"/>
     <package name="ruby2.5-rubygem-mixlib-config"/>
     <package name="ruby2.5-rubygem-mixlib-log"/>
+    <package name="ruby2.5-rubygem-mixlib-shellout"/>
     <package name="ruby2.5-rubygem-mocha"/>
     <package name="ruby2.5-rubygem-msgpack"/>
     <package name="ruby2.5-rubygem-multi_json"/>
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 e7c8fe9c..f36049a7 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,7 @@
       <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-suse6"/>
+      <repopackage name="libSPIRV-Tools-suse7"/>
       <repopackage name="libssh4-32bit" arch="x86_64"/>
       <repopackage name="libstdc++41" onlyarch="skipit"/>
       <repopackage name="libstdc++41-32bit" onlyarch="skipit"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 32f155e7..7b62dde9 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -832,7 +832,6 @@
       <repopackage name="gnome-shell-search-provider-gnome-photos" arch="i586,i686"/>
       <repopackage name="gnome-shell-search-provider-gnome-terminal" arch="i586,i686"/>
       <repopackage name="gnome-shell-search-provider-gnome-weather" arch="i586,i686"/>
-      <repopackage name="gnome-shell-search-provider-gnote" arch="i586,i686"/>
       <repopackage name="gnome-shell-search-provider-nautilus" arch="i586,i686"/>
       <repopackage name="gnome-shell-search-provider-seahorse" arch="i586,i686"/>
       <repopackage name="gnome-software" arch="i586,i686"/>
@@ -855,8 +854,6 @@
       <repopackage name="gnome-video-effects" arch="i586,i686"/>
       <repopackage name="gnome-weather" arch="i586,i686"/>
       <repopackage name="gnome-weather-lang" arch="i586,i686"/>
-      <repopackage name="gnote" arch="i586,i686"/>
-      <repopackage name="gnote-lang" arch="i586,i686"/>
       <repopackage name="gnu-unifont-bitmap-fonts" arch="i586,i686"/>
       <repopackage name="gnutls" arch="i586,i686"/>
       <repopackage name="goffice-lang" arch="i586,i686"/>
@@ -4105,7 +4102,6 @@
       <repopackage name="python-qt5-utils" arch="i586,i686"/>
       <repopackage name="python-rpm-macros" arch="i586,i686"/>
       <repopackage name="python-sip-common" arch="i586,i686"/>
-      <repopackage name="python-solv" arch="i586,i686"/>
       <repopackage name="python-talloc" arch="i586,i686"/>
       <repopackage name="python-xml" arch="i586,i686"/>
       <repopackage name="python2-appdirs" arch="i586,i686"/>
@@ -4236,6 +4232,7 @@
       <repopackage name="python3-PyYAML" arch="i586,i686"/>
       <repopackage name="python3-qt5" arch="i586,i686"/>
       <repopackage name="python3-requests" arch="i586,i686"/>
+      <repopackage name="python3-rpm" arch="i586,i686"/>
       <repopackage name="python3-setuptools" arch="i586,i686"/>
       <repopackage name="python3-sip" arch="i586,i686"/>
       <repopackage name="python3-six" arch="i586,i686"/>
@@ -4243,6 +4240,7 @@
       <repopackage name="python3-slip-dbus" arch="i586,i686"/>
       <repopackage name="python3-smbios" arch="i586,i686"/>
       <repopackage name="python3-smbios-utils" arch="i586,i686"/>
+      <repopackage name="python3-solv" arch="i586,i686"/>
       <repopackage name="python3-speechd" arch="i586,i686"/>
       <repopackage name="python3-urllib3" arch="i586,i686"/>
       <repopackage name="python3-xcffib" arch="i586,i686"/>
@@ -4475,6 +4473,7 @@
       <repopackage name="ruby2.5-rubygem-mixlib-authentication" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-mixlib-config" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-mixlib-log" arch="i586,i686"/>
+      <repopackage name="ruby2.5-rubygem-mixlib-shellout" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-mocha" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-msgpack" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-multi_json" 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 e5fbc9a4..bb20e99c 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -828,7 +828,6 @@
       <repopackage name="gnome-shell-search-provider-gnome-photos" arch="x86_64"/>
       <repopackage name="gnome-shell-search-provider-gnome-terminal" arch="x86_64"/>
       <repopackage name="gnome-shell-search-provider-gnome-weather" arch="x86_64"/>
-      <repopackage name="gnome-shell-search-provider-gnote" arch="x86_64"/>
       <repopackage name="gnome-shell-search-provider-nautilus" arch="x86_64"/>
       <repopackage name="gnome-shell-search-provider-seahorse" arch="x86_64"/>
       <repopackage name="gnome-software" arch="x86_64"/>
@@ -851,8 +850,6 @@
       <repopackage name="gnome-video-effects" arch="x86_64"/>
       <repopackage name="gnome-weather" arch="x86_64"/>
       <repopackage name="gnome-weather-lang" arch="x86_64"/>
-      <repopackage name="gnote" arch="x86_64"/>
-      <repopackage name="gnote-lang" arch="x86_64"/>
       <repopackage name="gnu-unifont-bitmap-fonts" arch="x86_64"/>
       <repopackage name="gnutls" arch="x86_64"/>
       <repopackage name="goffice-lang" arch="x86_64"/>
@@ -4240,7 +4237,6 @@
       <repopackage name="python-qt5-utils" arch="x86_64"/>
       <repopackage name="python-rpm-macros" arch="x86_64"/>
       <repopackage name="python-sip-common" arch="x86_64"/>
-      <repopackage name="python-solv" arch="x86_64"/>
       <repopackage name="python-talloc" arch="x86_64"/>
       <repopackage name="python-talloc-32bit" arch="x86_64"/>
       <repopackage name="python-xml" arch="x86_64"/>
@@ -4382,6 +4378,7 @@
       <repopackage name="python3-slip-dbus" arch="x86_64"/>
       <repopackage name="python3-smbios" arch="x86_64"/>
       <repopackage name="python3-smbios-utils" arch="x86_64"/>
+      <repopackage name="python3-solv" arch="x86_64"/>
       <repopackage name="python3-speechd" arch="x86_64"/>
       <repopackage name="python3-urllib3" arch="x86_64"/>
       <repopackage name="python3-virt-bootstrap" arch="x86_64"/>
@@ -4616,6 +4613,7 @@
       <repopackage name="ruby2.5-rubygem-mixlib-authentication" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-mixlib-config" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-mixlib-log" arch="x86_64"/>
+      <repopackage name="ruby2.5-rubygem-mixlib-shellout" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-mocha" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-msgpack" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-multi_json" arch="x86_64"/>
diff --git a/openSUSE-Addon-NonOss-Deps.group b/openSUSE-Addon-NonOss-Deps.group
index 294ff13e..55c1cc25 100644
--- a/openSUSE-Addon-NonOss-Deps.group
+++ b/openSUSE-Addon-NonOss-Deps.group
@@ -17,7 +17,7 @@
     <package name="glu-devel"/>
     <package name="libOSMesa-devel"/>
     <package name="libOSMesa8"/>
-    <package name="libSPIRV-Tools-suse6"/>
+    <package name="libSPIRV-Tools-suse7"/>
     <package name="libXdamage-devel"/>
     <package name="libXxf86vm-devel"/>
     <package name="libenet7"/>