diff --git a/DVD5-i586.group b/DVD5-i586.group
index 1bf10fb7..e47660c8 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -323,6 +323,7 @@
     <package name="clamz"/>
     <package name="claws-mail"/>
     <package name="claws-mail-lang"/>
+    <package name="clazy"/>
     <package name="clicfs"/>
     <package name="clutter-gtk-lang"/>
     <package name="clutter-lang"/>
@@ -2348,7 +2349,7 @@
     <package name="libkdepim"/>
     <package name="libkdepim-lang"/>
     <package name="libkdepimlibs4"/>
-    <package name="libkdevplatform52"/>
+    <package name="libkdevplatform53"/>
     <package name="libkeduvocdocument-lang"/>
     <package name="libkerfuffle18"/>
     <package name="libkeybinder-3_0-0"/>
@@ -2494,7 +2495,7 @@
     <package name="libnettle6"/>
     <package name="libnewt0_52"/>
     <package name="libnfnetlink0"/>
-    <package name="libnfs11"/>
+    <package name="libnfs12"/>
     <package name="libnfsidmap-sss"/>
     <package name="libnftables0"/>
     <package name="libnftnl11"/>
@@ -2897,7 +2898,6 @@
     <package name="libusbmuxd4"/>
     <package name="libusbredirhost1"/>
     <package name="libusbredirparser1"/>
-    <package name="libustr-1_0-1"/>
     <package name="libutempter0"/>
     <package name="libutf8proc2"/>
     <package name="libuuid-devel"/>
@@ -4417,6 +4417,7 @@
     <package name="ruby2.5-rubygem-nio4r"/>
     <package name="ruby2.5-rubygem-nokogiri"/>
     <package name="ruby2.5-rubygem-nori"/>
+    <package name="ruby2.5-rubygem-oauth2"/>
     <package name="ruby2.5-rubygem-openid_connect"/>
     <package name="ruby2.5-rubygem-orm_adapter"/>
     <package name="ruby2.5-rubygem-packaging_rake_tasks"/>
@@ -4497,6 +4498,7 @@
     <package name="ruby2.5-rubygem-sprockets-rails"/>
     <package name="ruby2.5-rubygem-sqlite3"/>
     <package name="ruby2.5-rubygem-sshkit"/>
+    <package name="ruby2.5-rubygem-stomp"/>
     <package name="ruby2.5-rubygem-strptime"/>
     <package name="ruby2.5-rubygem-swd"/>
     <package name="ruby2.5-rubygem-temple"/>
@@ -4523,6 +4525,7 @@
     <package name="ruby2.5-rubygem-unf_ext"/>
     <package name="ruby2.5-rubygem-unicorn"/>
     <package name="ruby2.5-rubygem-unicorn-worker-killer"/>
+    <package name="ruby2.5-rubygem-vagrant_cloud"/>
     <package name="ruby2.5-rubygem-validate_email"/>
     <package name="ruby2.5-rubygem-validate_url"/>
     <package name="ruby2.5-rubygem-virtus"/>
@@ -4531,6 +4534,7 @@
     <package name="ruby2.5-rubygem-webfinger"/>
     <package name="ruby2.5-rubygem-webmock-1_2"/>
     <package name="ruby2.5-rubygem-webmock-2_3"/>
+    <package name="ruby2.5-rubygem-websocket"/>
     <package name="ruby2.5-rubygem-websocket-driver-0_6"/>
     <package name="ruby2.5-rubygem-websocket-extensions"/>
     <package name="ruby2.5-rubygem-winrm-2_1"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index a510b92e..505e78fa 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -326,6 +326,7 @@
     <package name="clamz"/>
     <package name="claws-mail"/>
     <package name="claws-mail-lang"/>
+    <package name="clazy"/>
     <package name="clicfs"/>
     <package name="clutter-gtk-lang"/>
     <package name="clutter-lang"/>
@@ -2445,7 +2446,7 @@
     <package name="libkdepim"/>
     <package name="libkdepim-lang"/>
     <package name="libkdepimlibs4"/>
-    <package name="libkdevplatform52"/>
+    <package name="libkdevplatform53"/>
     <package name="libkeduvocdocument-lang"/>
     <package name="libkerfuffle18"/>
     <package name="libkeybinder-3_0-0"/>
@@ -2609,7 +2610,7 @@
     <package name="libnettle6-32bit"/>
     <package name="libnewt0_52"/>
     <package name="libnfnetlink0"/>
-    <package name="libnfs11"/>
+    <package name="libnfs12"/>
     <package name="libnfsidmap-sss"/>
     <package name="libnftables0"/>
     <package name="libnftnl11"/>
@@ -3055,7 +3056,6 @@
     <package name="libusbmuxd4"/>
     <package name="libusbredirhost1"/>
     <package name="libusbredirparser1"/>
-    <package name="libustr-1_0-1"/>
     <package name="libutempter0"/>
     <package name="libutf8proc2"/>
     <package name="libuuid-devel"/>
@@ -4608,6 +4608,7 @@
     <package name="ruby2.5-rubygem-nio4r"/>
     <package name="ruby2.5-rubygem-nokogiri"/>
     <package name="ruby2.5-rubygem-nori"/>
+    <package name="ruby2.5-rubygem-oauth2"/>
     <package name="ruby2.5-rubygem-openid_connect"/>
     <package name="ruby2.5-rubygem-orm_adapter"/>
     <package name="ruby2.5-rubygem-packaging_rake_tasks"/>
@@ -4688,6 +4689,7 @@
     <package name="ruby2.5-rubygem-sprockets-rails"/>
     <package name="ruby2.5-rubygem-sqlite3"/>
     <package name="ruby2.5-rubygem-sshkit"/>
+    <package name="ruby2.5-rubygem-stomp"/>
     <package name="ruby2.5-rubygem-strptime"/>
     <package name="ruby2.5-rubygem-swd"/>
     <package name="ruby2.5-rubygem-temple"/>
@@ -4714,6 +4716,7 @@
     <package name="ruby2.5-rubygem-unf_ext"/>
     <package name="ruby2.5-rubygem-unicorn"/>
     <package name="ruby2.5-rubygem-unicorn-worker-killer"/>
+    <package name="ruby2.5-rubygem-vagrant_cloud"/>
     <package name="ruby2.5-rubygem-validate_email"/>
     <package name="ruby2.5-rubygem-validate_url"/>
     <package name="ruby2.5-rubygem-virtus"/>
@@ -4722,6 +4725,7 @@
     <package name="ruby2.5-rubygem-webfinger"/>
     <package name="ruby2.5-rubygem-webmock-1_2"/>
     <package name="ruby2.5-rubygem-webmock-2_3"/>
+    <package name="ruby2.5-rubygem-websocket"/>
     <package name="ruby2.5-rubygem-websocket-driver-0_6"/>
     <package name="ruby2.5-rubygem-websocket-extensions"/>
     <package name="ruby2.5-rubygem-winrm-2_1"/>
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 b9def328..c9dbd5b5 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
@@ -669,9 +669,6 @@
       <repopackage name="libusb-1_0-0"/>
       <repopackage name="libusb-1_0-0"/>
       <repopackage name="libusb-1_0-0"/>
-      <repopackage name="libustr-1_0-1"/>
-      <repopackage name="libustr-1_0-1"/>
-      <repopackage name="libustr-1_0-1"/>
       <repopackage name="libutempter0"/>
       <repopackage name="libutempter0"/>
       <repopackage name="libutempter0"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 448095cf..ede95470 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -322,6 +322,7 @@
       <repopackage name="clamz" arch="i586,i686"/>
       <repopackage name="claws-mail" arch="i586,i686"/>
       <repopackage name="claws-mail-lang" arch="i586,i686"/>
+      <repopackage name="clazy" arch="i586,i686"/>
       <repopackage name="clicfs" arch="i586,i686"/>
       <repopackage name="clutter-gtk-lang" arch="i586,i686"/>
       <repopackage name="clutter-lang" arch="i586,i686"/>
@@ -2089,7 +2090,7 @@
       <repopackage name="libkdepim" arch="i586,i686"/>
       <repopackage name="libkdepim-lang" arch="i586,i686"/>
       <repopackage name="libkdepimlibs4" arch="i586,i686"/>
-      <repopackage name="libkdevplatform52" arch="i586,i686"/>
+      <repopackage name="libkdevplatform53" arch="i586,i686"/>
       <repopackage name="libkeduvocdocument-lang" arch="i586,i686"/>
       <repopackage name="libKEduVocDocument5" arch="i586,i686"/>
       <repopackage name="libkerfuffle18" arch="i586,i686"/>
@@ -2403,7 +2404,7 @@
       <repopackage name="libnettle6" arch="i586,i686"/>
       <repopackage name="libnewt0_52" arch="i586,i686"/>
       <repopackage name="libnfnetlink0" arch="i586,i686"/>
-      <repopackage name="libnfs11" arch="i586,i686"/>
+      <repopackage name="libnfs12" arch="i586,i686"/>
       <repopackage name="libnfsidmap-sss" arch="i586,i686"/>
       <repopackage name="libnftables0" arch="i586,i686"/>
       <repopackage name="libnftnl11" arch="i586,i686"/>
@@ -2860,7 +2861,6 @@
       <repopackage name="libusbmuxd4" arch="i586,i686"/>
       <repopackage name="libusbredirhost1" arch="i586,i686"/>
       <repopackage name="libusbredirparser1" arch="i586,i686"/>
-      <repopackage name="libustr-1_0-1" arch="i586,i686"/>
       <repopackage name="libutempter0" arch="i586,i686"/>
       <repopackage name="libutf8proc2" arch="i586,i686"/>
       <repopackage name="libuuid-devel" arch="i586,i686"/>
@@ -4472,6 +4472,7 @@
       <repopackage name="ruby2.5-rubygem-nio4r" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-nokogiri" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-nori" arch="i586,i686"/>
+      <repopackage name="ruby2.5-rubygem-oauth2" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-openid_connect" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-orm_adapter" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-packaging_rake_tasks" arch="i586,i686"/>
@@ -4552,6 +4553,7 @@
       <repopackage name="ruby2.5-rubygem-sprockets-rails" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-sqlite3" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-sshkit" arch="i586,i686"/>
+      <repopackage name="ruby2.5-rubygem-stomp" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-strptime" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-swd" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-temple" arch="i586,i686"/>
@@ -4578,6 +4580,7 @@
       <repopackage name="ruby2.5-rubygem-unf_ext" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-unicorn" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-unicorn-worker-killer" arch="i586,i686"/>
+      <repopackage name="ruby2.5-rubygem-vagrant_cloud" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-validate_email" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-validate_url" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-virtus" arch="i586,i686"/>
@@ -4586,6 +4589,7 @@
       <repopackage name="ruby2.5-rubygem-webfinger" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-webmock-1_2" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-webmock-2_3" arch="i586,i686"/>
+      <repopackage name="ruby2.5-rubygem-websocket" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-websocket-driver-0_6" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-websocket-extensions" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-winrm-2_1" 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 b93160c3..bd3ac09e 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -328,6 +328,7 @@
       <repopackage name="clamz" arch="x86_64"/>
       <repopackage name="claws-mail" arch="x86_64"/>
       <repopackage name="claws-mail-lang" arch="x86_64"/>
+      <repopackage name="clazy" arch="x86_64"/>
       <repopackage name="clicfs" arch="x86_64"/>
       <repopackage name="clutter-gtk-lang" arch="x86_64"/>
       <repopackage name="clutter-lang" arch="x86_64"/>
@@ -2169,7 +2170,7 @@
       <repopackage name="libkdepim" arch="x86_64"/>
       <repopackage name="libkdepim-lang" arch="x86_64"/>
       <repopackage name="libkdepimlibs4" arch="x86_64"/>
-      <repopackage name="libkdevplatform52" arch="x86_64"/>
+      <repopackage name="libkdevplatform53" arch="x86_64"/>
       <repopackage name="libkeduvocdocument-lang" arch="x86_64"/>
       <repopackage name="libKEduVocDocument5" arch="x86_64"/>
       <repopackage name="libkerfuffle18" arch="x86_64"/>
@@ -2501,7 +2502,7 @@
       <repopackage name="libnettle6-32bit" arch="x86_64"/>
       <repopackage name="libnewt0_52" arch="x86_64"/>
       <repopackage name="libnfnetlink0" arch="x86_64"/>
-      <repopackage name="libnfs11" arch="x86_64"/>
+      <repopackage name="libnfs12" arch="x86_64"/>
       <repopackage name="libnfsidmap-sss" arch="x86_64"/>
       <repopackage name="libnftables0" arch="x86_64"/>
       <repopackage name="libnftnl11" arch="x86_64"/>
@@ -3002,7 +3003,6 @@
       <repopackage name="libusbmuxd4" arch="x86_64"/>
       <repopackage name="libusbredirhost1" arch="x86_64"/>
       <repopackage name="libusbredirparser1" arch="x86_64"/>
-      <repopackage name="libustr-1_0-1" arch="x86_64"/>
       <repopackage name="libutempter0" arch="x86_64"/>
       <repopackage name="libutf8proc2" arch="x86_64"/>
       <repopackage name="libuuid-devel" arch="x86_64"/>
@@ -4661,6 +4661,7 @@
       <repopackage name="ruby2.5-rubygem-nio4r" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-nokogiri" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-nori" arch="x86_64"/>
+      <repopackage name="ruby2.5-rubygem-oauth2" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-openid_connect" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-orm_adapter" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-packaging_rake_tasks" arch="x86_64"/>
@@ -4741,6 +4742,7 @@
       <repopackage name="ruby2.5-rubygem-sprockets-rails" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-sqlite3" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-sshkit" arch="x86_64"/>
+      <repopackage name="ruby2.5-rubygem-stomp" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-strptime" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-swd" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-temple" arch="x86_64"/>
@@ -4767,6 +4769,7 @@
       <repopackage name="ruby2.5-rubygem-unf_ext" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-unicorn" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-unicorn-worker-killer" arch="x86_64"/>
+      <repopackage name="ruby2.5-rubygem-vagrant_cloud" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-validate_email" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-validate_url" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-virtus" arch="x86_64"/>
@@ -4775,6 +4778,7 @@
       <repopackage name="ruby2.5-rubygem-webfinger" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-webmock-1_2" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-webmock-2_3" arch="x86_64"/>
+      <repopackage name="ruby2.5-rubygem-websocket" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-websocket-driver-0_6" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-websocket-extensions" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-winrm-2_1" arch="x86_64"/>
diff --git a/openSUSE-Kubic-3.group b/openSUSE-Kubic-3.group
index 31ca1224..f5c5d5d0 100644
--- a/openSUSE-Kubic-3.group
+++ b/openSUSE-Kubic-3.group
@@ -175,7 +175,6 @@
     <package name="libudev1"/>
     <package name="libunistring2"/>
     <package name="libusb-1_0-0"/>
-    <package name="libustr-1_0-1"/>
     <package name="libutempter0"/>
     <package name="libuuid1"/>
     <package name="libverto1"/>
diff --git a/openSUSE-Kubic-DVD.group b/openSUSE-Kubic-DVD.group
index 0d43ca21..c22ed927 100644
--- a/openSUSE-Kubic-DVD.group
+++ b/openSUSE-Kubic-DVD.group
@@ -186,7 +186,6 @@
     <package name="libudev1"/>
     <package name="libunistring2"/>
     <package name="libusb-1_0-0"/>
-    <package name="libustr-1_0-1"/>
     <package name="libutempter0"/>
     <package name="libuuid1"/>
     <package name="libverto1"/>
diff --git a/openSUSE-Kubic.group b/openSUSE-Kubic.group
index 8dbf459e..cbc4a662 100644
--- a/openSUSE-Kubic.group
+++ b/openSUSE-Kubic.group
@@ -257,7 +257,6 @@
     <package name="libunistring2"/>
     <package name="liburcu6"/>
     <package name="libusb-1_0-0"/>
-    <package name="libustr-1_0-1"/>
     <package name="libutempter0"/>
     <package name="libuuid1"/>
     <package name="libverto1"/>