diff --git a/DVD5-i586.group b/DVD5-i586.group
index f29ce507..44286f31 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -673,6 +673,7 @@
     <package name="geronimo-specs-poms"/>
     <package name="gettext-runtime"/>
     <package name="gettext-tools"/>
+    <package name="ghc-bootstrap"/>
     <package name="ghex"/>
     <package name="ghex-lang"/>
     <package name="ghostscript"/>
@@ -2051,7 +2052,6 @@
     <package name="libfcitx-4_2_9"/>
     <package name="libfdisk1"/>
     <package name="libfdt1"/>
-    <package name="libffi7"/>
     <package name="libfftw3-3"/>
     <package name="libfftw3_threads3"/>
     <package name="libfind3_0"/>
@@ -2474,6 +2474,7 @@
     <package name="libmysqld19"/>
     <package name="libmythes-1_2-0"/>
     <package name="libnautilus-extension1"/>
+    <package name="libncurses5"/>
     <package name="libncurses6"/>
     <package name="libndp0"/>
     <package name="libndr-krb5pac0"/>
@@ -2839,7 +2840,6 @@
     <package name="libtasn1"/>
     <package name="libtasn1-6"/>
     <package name="libtbb2"/>
-    <package name="libtcmalloc4"/>
     <package name="libtcnative-1-0"/>
     <package name="libtdb1"/>
     <package name="libteamdctl0"/>
@@ -4298,11 +4298,13 @@
     <package name="ruby2.5-rubygem-coffee-script"/>
     <package name="ruby2.5-rubygem-coffee-script-source"/>
     <package name="ruby2.5-rubygem-colorator"/>
+    <package name="ruby2.5-rubygem-colored"/>
     <package name="ruby2.5-rubygem-commander"/>
     <package name="ruby2.5-rubygem-concurrent-ruby"/>
     <package name="ruby2.5-rubygem-cool.io"/>
     <package name="ruby2.5-rubygem-crack"/>
     <package name="ruby2.5-rubygem-crass"/>
+    <package name="ruby2.5-rubygem-cri"/>
     <package name="ruby2.5-rubygem-delayed_job"/>
     <package name="ruby2.5-rubygem-descendants_tracker"/>
     <package name="ruby2.5-rubygem-devise"/>
@@ -4321,7 +4323,6 @@
     <package name="ruby2.5-rubygem-excon"/>
     <package name="ruby2.5-rubygem-execjs"/>
     <package name="ruby2.5-rubygem-faraday"/>
-    <package name="ruby2.5-rubygem-faraday-0_12"/>
     <package name="ruby2.5-rubygem-fast_gettext"/>
     <package name="ruby2.5-rubygem-ffi"/>
     <package name="ruby2.5-rubygem-fluentd"/>
@@ -4363,7 +4364,6 @@
     <package name="ruby2.5-rubygem-json-schema"/>
     <package name="ruby2.5-rubygem-json_pure"/>
     <package name="ruby2.5-rubygem-jwt"/>
-    <package name="ruby2.5-rubygem-jwt-1_5"/>
     <package name="ruby2.5-rubygem-kgio"/>
     <package name="ruby2.5-rubygem-kramdown"/>
     <package name="ruby2.5-rubygem-libyui-rake"/>
@@ -4405,10 +4405,6 @@
     <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-omniauth"/>
-    <package name="ruby2.5-rubygem-omniauth-gitlab"/>
-    <package name="ruby2.5-rubygem-omniauth-oauth2"/>
     <package name="ruby2.5-rubygem-openid_connect"/>
     <package name="ruby2.5-rubygem-orm_adapter"/>
     <package name="ruby2.5-rubygem-packaging_rake_tasks"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index e9111603..35bec694 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -686,6 +686,7 @@
     <package name="geronimo-specs-poms"/>
     <package name="gettext-runtime"/>
     <package name="gettext-tools"/>
+    <package name="ghc-bootstrap"/>
     <package name="ghex"/>
     <package name="ghex-lang"/>
     <package name="ghostscript"/>
@@ -2122,7 +2123,6 @@
     <package name="libfcitx-4_2_9"/>
     <package name="libfdisk1"/>
     <package name="libfdt1"/>
-    <package name="libffi7"/>
     <package name="libffi7-32bit"/>
     <package name="libfftw3-3"/>
     <package name="libfftw3_threads3"/>
@@ -2585,6 +2585,7 @@
     <package name="libmysqld19"/>
     <package name="libmythes-1_2-0"/>
     <package name="libnautilus-extension1"/>
+    <package name="libncurses5"/>
     <package name="libncurses6"/>
     <package name="libndp0"/>
     <package name="libndr-krb5pac0"/>
@@ -2990,7 +2991,6 @@
     <package name="libtasn1-6"/>
     <package name="libtasn1-6-32bit"/>
     <package name="libtbb2"/>
-    <package name="libtcmalloc4"/>
     <package name="libtcnative-1-0"/>
     <package name="libtdb1"/>
     <package name="libtdb1-32bit"/>
@@ -4489,11 +4489,13 @@
     <package name="ruby2.5-rubygem-coffee-script"/>
     <package name="ruby2.5-rubygem-coffee-script-source"/>
     <package name="ruby2.5-rubygem-colorator"/>
+    <package name="ruby2.5-rubygem-colored"/>
     <package name="ruby2.5-rubygem-commander"/>
     <package name="ruby2.5-rubygem-concurrent-ruby"/>
     <package name="ruby2.5-rubygem-cool.io"/>
     <package name="ruby2.5-rubygem-crack"/>
     <package name="ruby2.5-rubygem-crass"/>
+    <package name="ruby2.5-rubygem-cri"/>
     <package name="ruby2.5-rubygem-delayed_job"/>
     <package name="ruby2.5-rubygem-descendants_tracker"/>
     <package name="ruby2.5-rubygem-devise"/>
@@ -4512,7 +4514,6 @@
     <package name="ruby2.5-rubygem-excon"/>
     <package name="ruby2.5-rubygem-execjs"/>
     <package name="ruby2.5-rubygem-faraday"/>
-    <package name="ruby2.5-rubygem-faraday-0_12"/>
     <package name="ruby2.5-rubygem-fast_gettext"/>
     <package name="ruby2.5-rubygem-ffi"/>
     <package name="ruby2.5-rubygem-fluentd"/>
@@ -4554,7 +4555,6 @@
     <package name="ruby2.5-rubygem-json-schema"/>
     <package name="ruby2.5-rubygem-json_pure"/>
     <package name="ruby2.5-rubygem-jwt"/>
-    <package name="ruby2.5-rubygem-jwt-1_5"/>
     <package name="ruby2.5-rubygem-kgio"/>
     <package name="ruby2.5-rubygem-kramdown"/>
     <package name="ruby2.5-rubygem-libyui-rake"/>
@@ -4596,10 +4596,6 @@
     <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-omniauth"/>
-    <package name="ruby2.5-rubygem-omniauth-gitlab"/>
-    <package name="ruby2.5-rubygem-omniauth-oauth2"/>
     <package name="ruby2.5-rubygem-openid_connect"/>
     <package name="ruby2.5-rubygem-orm_adapter"/>
     <package name="ruby2.5-rubygem-packaging_rake_tasks"/>
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 dc6fbc17..bee6b2f9 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
@@ -191,6 +191,9 @@
       <repopackage name="gawk"/>
       <repopackage name="gawk"/>
       <repopackage name="gettext-runtime"/>
+      <repopackage name="ghc-bootstrap"/>
+      <repopackage name="ghc-bootstrap"/>
+      <repopackage name="ghc-bootstrap"/>
       <repopackage name="gio-branding-openSUSE"/>
       <repopackage name="gio-branding-openSUSE"/>
       <repopackage name="gio-branding-openSUSE"/>
@@ -204,6 +207,9 @@
       <repopackage name="glibc"/>
       <repopackage name="glibc"/>
       <repopackage name="glibc-locale"/>
+      <repopackage name="gmp-devel"/>
+      <repopackage name="gmp-devel"/>
+      <repopackage name="gmp-devel"/>
       <repopackage name="gpg2"/>
       <repopackage name="gpg2"/>
       <repopackage name="gpg2"/>
@@ -386,9 +392,6 @@
       <repopackage name="libfdisk1"/>
       <repopackage name="libfdisk1"/>
       <repopackage name="libfdisk1"/>
-      <repopackage name="libffi7"/>
-      <repopackage name="libffi7"/>
-      <repopackage name="libffi7"/>
       <repopackage name="libfipscheck1"/>
       <repopackage name="libfreebl3"/>
       <repopackage name="libfreetype6"/>
@@ -418,6 +421,9 @@
       <repopackage name="libgmp10"/>
       <repopackage name="libgmp10"/>
       <repopackage name="libgmp10"/>
+      <repopackage name="libgmpxx4"/>
+      <repopackage name="libgmpxx4"/>
+      <repopackage name="libgmpxx4"/>
       <repopackage name="libgnutls30"/>
       <repopackage name="libgnutls30"/>
       <repopackage name="libgnutls30"/>
@@ -504,6 +510,9 @@
       <repopackage name="libmount1"/>
       <repopackage name="libmount1"/>
       <repopackage name="libmspack0"/>
+      <repopackage name="libncurses5"/>
+      <repopackage name="libncurses5"/>
+      <repopackage name="libncurses5"/>
       <repopackage name="libncurses6"/>
       <repopackage name="libncurses6"/>
       <repopackage name="libncurses6"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index f3c66caa..a2c85d91 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -675,6 +675,7 @@
       <repopackage name="geronimo-specs-poms" arch="i586,i686"/>
       <repopackage name="gettext-runtime" arch="i586,i686"/>
       <repopackage name="gettext-tools" arch="i586,i686"/>
+      <repopackage name="ghc-bootstrap" arch="i586,i686"/>
       <repopackage name="ghex" arch="i586,i686"/>
       <repopackage name="ghex-lang" arch="i586,i686"/>
       <repopackage name="ghostscript" arch="i586,i686"/>
@@ -1778,7 +1779,6 @@
       <repopackage name="libfcitx-4_2_9" arch="i586,i686"/>
       <repopackage name="libfdisk1" arch="i586,i686"/>
       <repopackage name="libfdt1" arch="i586,i686"/>
-      <repopackage name="libffi7" arch="i586,i686"/>
       <repopackage name="libfftw3-3" arch="i586,i686"/>
       <repopackage name="libfftw3_threads3" arch="i586,i686"/>
       <repopackage name="libfind3_0" arch="i586,i686"/>
@@ -2384,6 +2384,7 @@
       <repopackage name="libmysqld19" arch="i586,i686"/>
       <repopackage name="libmythes-1_2-0" arch="i586,i686"/>
       <repopackage name="libnautilus-extension1" arch="i586,i686"/>
+      <repopackage name="libncurses5" arch="i586,i686"/>
       <repopackage name="libncurses6" arch="i586,i686"/>
       <repopackage name="libndp0" arch="i586,i686"/>
       <repopackage name="libndr-krb5pac0" arch="i586,i686"/>
@@ -2802,7 +2803,6 @@
       <repopackage name="libtasn1" arch="i586,i686"/>
       <repopackage name="libtasn1-6" arch="i586,i686"/>
       <repopackage name="libtbb2" arch="i586,i686"/>
-      <repopackage name="libtcmalloc4" arch="i586,i686"/>
       <repopackage name="libtcnative-1-0" arch="i586,i686"/>
       <repopackage name="libtdb1" arch="i586,i686"/>
       <repopackage name="libteamdctl0" arch="i586,i686"/>
@@ -4353,11 +4353,13 @@
       <repopackage name="ruby2.5-rubygem-coffee-script" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-coffee-script-source" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-colorator" arch="i586,i686"/>
+      <repopackage name="ruby2.5-rubygem-colored" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-commander" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-concurrent-ruby" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-cool.io" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-crack" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-crass" arch="i586,i686"/>
+      <repopackage name="ruby2.5-rubygem-cri" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-delayed_job" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-descendants_tracker" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-devise" arch="i586,i686"/>
@@ -4376,7 +4378,6 @@
       <repopackage name="ruby2.5-rubygem-excon" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-execjs" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-faraday" arch="i586,i686"/>
-      <repopackage name="ruby2.5-rubygem-faraday-0_12" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-fast_gettext" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-ffi" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-fluentd" arch="i586,i686"/>
@@ -4418,7 +4419,6 @@
       <repopackage name="ruby2.5-rubygem-json-schema" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-json_pure" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-jwt" arch="i586,i686"/>
-      <repopackage name="ruby2.5-rubygem-jwt-1_5" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-kgio" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-kramdown" arch="i586,i686"/>
       <repopackage name="ruby2.5-rubygem-libyui-rake" arch="i586,i686"/>
@@ -4460,10 +4460,6 @@
       <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-omniauth" arch="i586,i686"/>
-      <repopackage name="ruby2.5-rubygem-omniauth-gitlab" arch="i586,i686"/>
-      <repopackage name="ruby2.5-rubygem-omniauth-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"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
index e32f477d..9ba1e526 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -691,6 +691,7 @@
       <repopackage name="geronimo-specs-poms" arch="x86_64"/>
       <repopackage name="gettext-runtime" arch="x86_64"/>
       <repopackage name="gettext-tools" arch="x86_64"/>
+      <repopackage name="ghc-bootstrap" arch="x86_64"/>
       <repopackage name="ghex" arch="x86_64"/>
       <repopackage name="ghex-lang" arch="x86_64"/>
       <repopackage name="ghostscript" arch="x86_64"/>
@@ -1830,7 +1831,6 @@
       <repopackage name="libfcitx-4_2_9" arch="x86_64"/>
       <repopackage name="libfdisk1" arch="x86_64"/>
       <repopackage name="libfdt1" arch="x86_64"/>
-      <repopackage name="libffi7" arch="x86_64"/>
       <repopackage name="libffi7-32bit" arch="x86_64"/>
       <repopackage name="libfftw3-3" arch="x86_64"/>
       <repopackage name="libfftw3_threads3" arch="x86_64"/>
@@ -2478,6 +2478,7 @@
       <repopackage name="libmysqld19" arch="x86_64"/>
       <repopackage name="libmythes-1_2-0" arch="x86_64"/>
       <repopackage name="libnautilus-extension1" arch="x86_64"/>
+      <repopackage name="libncurses5" arch="x86_64"/>
       <repopackage name="libncurses6" arch="x86_64"/>
       <repopackage name="libndp0" arch="x86_64"/>
       <repopackage name="libndr-krb5pac0" arch="x86_64"/>
@@ -2937,7 +2938,6 @@
       <repopackage name="libtasn1-6" arch="x86_64"/>
       <repopackage name="libtasn1-6-32bit" arch="x86_64"/>
       <repopackage name="libtbb2" arch="x86_64"/>
-      <repopackage name="libtcmalloc4" arch="x86_64"/>
       <repopackage name="libtcnative-1-0" arch="x86_64"/>
       <repopackage name="libtdb1" arch="x86_64"/>
       <repopackage name="libtdb1-32bit" arch="x86_64"/>
@@ -4542,11 +4542,13 @@
       <repopackage name="ruby2.5-rubygem-coffee-script" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-coffee-script-source" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-colorator" arch="x86_64"/>
+      <repopackage name="ruby2.5-rubygem-colored" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-commander" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-concurrent-ruby" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-cool.io" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-crack" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-crass" arch="x86_64"/>
+      <repopackage name="ruby2.5-rubygem-cri" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-delayed_job" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-descendants_tracker" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-devise" arch="x86_64"/>
@@ -4565,7 +4567,6 @@
       <repopackage name="ruby2.5-rubygem-excon" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-execjs" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-faraday" arch="x86_64"/>
-      <repopackage name="ruby2.5-rubygem-faraday-0_12" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-fast_gettext" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-ffi" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-fluentd" arch="x86_64"/>
@@ -4607,7 +4608,6 @@
       <repopackage name="ruby2.5-rubygem-json-schema" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-json_pure" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-jwt" arch="x86_64"/>
-      <repopackage name="ruby2.5-rubygem-jwt-1_5" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-kgio" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-kramdown" arch="x86_64"/>
       <repopackage name="ruby2.5-rubygem-libyui-rake" arch="x86_64"/>
@@ -4649,10 +4649,6 @@
       <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-omniauth" arch="x86_64"/>
-      <repopackage name="ruby2.5-rubygem-omniauth-gitlab" arch="x86_64"/>
-      <repopackage name="ruby2.5-rubygem-omniauth-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"/>
diff --git a/openSUSE-Kubic-3.group b/openSUSE-Kubic-3.group
index 38df879d..cda01393 100644
--- a/openSUSE-Kubic-3.group
+++ b/openSUSE-Kubic-3.group
@@ -44,10 +44,12 @@
     <package name="fillup"/>
     <package name="findutils"/>
     <package name="gawk"/>
+    <package name="ghc-bootstrap"/>
     <package name="gio-branding-openSUSE"/>
     <package name="glib-networking"/>
     <package name="glib2-tools"/>
     <package name="glibc"/>
+    <package name="gmp-devel"/>
     <package name="gpg2"/>
     <package name="grep"/>
     <package name="gsettings-desktop-schemas"/>
@@ -95,7 +97,6 @@
     <package name="libexpat1"/>
     <package name="libext2fs2"/>
     <package name="libfdisk1"/>
-    <package name="libffi7"/>
     <package name="libgcc_s1"/>
     <package name="libgcrypt20"/>
     <package name="libgdbm5"/>
@@ -104,6 +105,7 @@
     <package name="libglib-2_0-0"/>
     <package name="libgmodule-2_0-0"/>
     <package name="libgmp10"/>
+    <package name="libgmpxx4"/>
     <package name="libgnutls30"/>
     <package name="libgobject-2_0-0"/>
     <package name="libgpg-error0"/>
@@ -129,6 +131,7 @@
     <package name="libmnl0"/>
     <package name="libmodman1"/>
     <package name="libmount1"/>
+    <package name="libncurses5"/>
     <package name="libncurses6"/>
     <package name="libnetfilter_conntrack3"/>
     <package name="libnettle6"/>
diff --git a/openSUSE-Kubic-DVD.group b/openSUSE-Kubic-DVD.group
index 1b66e059..43cef85a 100644
--- a/openSUSE-Kubic-DVD.group
+++ b/openSUSE-Kubic-DVD.group
@@ -43,11 +43,13 @@
     <package name="fillup"/>
     <package name="findutils"/>
     <package name="gawk"/>
+    <package name="ghc-bootstrap"/>
     <package name="gio-branding-openSUSE"/>
     <package name="glib-networking"/>
     <package name="glib2-tools"/>
     <package name="glibc"/>
     <package name="glibc-locale"/>
+    <package name="gmp-devel"/>
     <package name="gpg2"/>
     <package name="grep"/>
     <package name="gsettings-desktop-schemas"/>
@@ -101,7 +103,6 @@
     <package name="libexpat1"/>
     <package name="libext2fs2"/>
     <package name="libfdisk1"/>
-    <package name="libffi7"/>
     <package name="libfuse2"/>
     <package name="libgcc_s1"/>
     <package name="libgcrypt20"/>
@@ -111,6 +112,7 @@
     <package name="libglib-2_0-0"/>
     <package name="libgmodule-2_0-0"/>
     <package name="libgmp10"/>
+    <package name="libgmpxx4"/>
     <package name="libgnutls30"/>
     <package name="libgobject-2_0-0"/>
     <package name="libgpg-error0"/>
@@ -139,6 +141,7 @@
     <package name="libmodman1"/>
     <package name="libmount1"/>
     <package name="libmspack0"/>
+    <package name="libncurses5"/>
     <package name="libncurses6"/>
     <package name="libnetfilter_conntrack3"/>
     <package name="libnettle6"/>
diff --git a/openSUSE-Kubic.group b/openSUSE-Kubic.group
index 5c89e601..a26472c2 100644
--- a/openSUSE-Kubic.group
+++ b/openSUSE-Kubic.group
@@ -53,10 +53,12 @@
     <package name="fipscheck"/>
     <package name="gawk"/>
     <package name="gettext-runtime"/>
+    <package name="ghc-bootstrap"/>
     <package name="gio-branding-openSUSE"/>
     <package name="glib-networking"/>
     <package name="glib2-tools"/>
     <package name="glibc"/>
+    <package name="gmp-devel"/>
     <package name="gpg2"/>
     <package name="gptfdisk"/>
     <package name="grep"/>
@@ -139,7 +141,6 @@
     <package name="libext2fs2"/>
     <package name="libfastjson4"/>
     <package name="libfdisk1"/>
-    <package name="libffi7"/>
     <package name="libfipscheck1"/>
     <package name="libfreebl3"/>
     <package name="libfreetype6"/>
@@ -152,6 +153,7 @@
     <package name="libglib-2_0-0"/>
     <package name="libgmodule-2_0-0"/>
     <package name="libgmp10"/>
+    <package name="libgmpxx4"/>
     <package name="libgnutls30"/>
     <package name="libgobject-2_0-0"/>
     <package name="libgpg-error0"/>
@@ -185,6 +187,7 @@
     <package name="libmnl0"/>
     <package name="libmodman1"/>
     <package name="libmount1"/>
+    <package name="libncurses5"/>
     <package name="libncurses6"/>
     <package name="libnetfilter_conntrack3"/>
     <package name="libnettle6"/>