diff --git a/DVD5-i586.group b/DVD5-i586.group
index da898b60..44255369 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -223,7 +223,6 @@
     <package name="bash-doc"/>
     <package name="bash-lang"/>
     <package name="bbswitch-kmp-default"/>
-    <package name="bbswitch-kmp-pae"/>
     <package name="bc"/>
     <package name="bcm20702a1-firmware"/>
     <package name="bcm43xx-firmware"/>
@@ -1004,7 +1003,6 @@
     <package name="haveged"/>
     <package name="hddtemp"/>
     <package name="hdjmod-kmp-default"/>
-    <package name="hdjmod-kmp-pae"/>
     <package name="hdparm"/>
     <package name="health-checker"/>
     <package name="health-checker-plugins-MicroOS"/>
@@ -1304,7 +1302,6 @@
     <package name="kernel-docs"/>
     <package name="kernel-firmware"/>
     <package name="kernel-macros"/>
-    <package name="kernel-pae"/>
     <package name="kernel-pae-devel"/>
     <package name="kernel-source"/>
     <package name="kernel-syms"/>
@@ -2219,7 +2216,7 @@
     <package name="libgnomesu"/>
     <package name="libgnomesu-lang"/>
     <package name="libgnomesu0"/>
-    <package name="libgnustep-base1_25"/>
+    <package name="libgnustep-base1_26"/>
     <package name="libgnutls30"/>
     <package name="libgoa-1_0-0"/>
     <package name="libgoa-backend-1_0-1"/>
@@ -2458,7 +2455,7 @@
     <package name="liblognorm5"/>
     <package name="libloudmouth-1-0"/>
     <package name="liblouis-data"/>
-    <package name="liblouis16"/>
+    <package name="liblouis17"/>
     <package name="liblpsolve55-0"/>
     <package name="liblqr-1-0"/>
     <package name="liblrdf2"/>
@@ -3179,9 +3176,6 @@
     <package name="lsof"/>
     <package name="lsscsi"/>
     <package name="ltrace"/>
-    <package name="lttng-modules"/>
-    <package name="lttng-modules-kmp-default"/>
-    <package name="lttng-modules-kmp-pae"/>
     <package name="lua53"/>
     <package name="lua53-luasocket"/>
     <package name="luit"/>
@@ -3261,7 +3255,6 @@
     <package name="metatheme-sonar-common"/>
     <package name="mgopen-fonts"/>
     <package name="mhvtl-kmp-default"/>
-    <package name="mhvtl-kmp-pae"/>
     <package name="milou5"/>
     <package name="milou5-lang"/>
     <package name="minicom"/>
@@ -3428,9 +3421,6 @@
     <package name="openSUSE-release"/>
     <package name="openSUSE-release-dvd"/>
     <package name="openSUSE-xfce-icon-theme"/>
-    <package name="openafs"/>
-    <package name="openafs-client"/>
-    <package name="openafs-kmp-default"/>
     <package name="openal-soft"/>
     <package name="openbox"/>
     <package name="openbox-adwaita-ob-theme"/>
@@ -3574,7 +3564,6 @@
     <package name="pavucontrol"/>
     <package name="pavucontrol-lang"/>
     <package name="pcfclock-kmp-default"/>
-    <package name="pcfclock-kmp-pae"/>
     <package name="pciutils"/>
     <package name="pciutils-ids"/>
     <package name="pcmanfm"/>
@@ -4281,8 +4270,6 @@
     <package name="rsyslog"/>
     <package name="rt2860"/>
     <package name="rtkit"/>
-    <package name="rtl8812au-kmp-default"/>
-    <package name="rtl8812au-kmp-pae"/>
     <package name="ruby"/>
     <package name="ruby-common"/>
     <package name="ruby-devel"/>
@@ -4724,7 +4711,6 @@
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="sysdig-kmp-default"/>
-    <package name="sysdig-kmp-pae"/>
     <package name="sysfsutils"/>
     <package name="syslinux"/>
     <package name="syslog-service"/>
@@ -4971,14 +4957,12 @@
     <package name="util-macros-devel"/>
     <package name="v4l-conf"/>
     <package name="v4l2loopback-kmp-default"/>
-    <package name="v4l2loopback-kmp-pae"/>
     <package name="vacation"/>
     <package name="vala"/>
     <package name="valgrind"/>
     <package name="vdr"/>
     <package name="vdr-lang"/>
     <package name="vhba-kmp-default"/>
-    <package name="vhba-kmp-pae"/>
     <package name="viewnior"/>
     <package name="viewnior-lang"/>
     <package name="viewres"/>
@@ -5301,7 +5285,6 @@
     <package name="xstdcmap"/>
     <package name="xstroke"/>
     <package name="xtables-addons-kmp-default"/>
-    <package name="xtables-addons-kmp-pae"/>
     <package name="xtables-plugins"/>
     <package name="xterm"/>
     <package name="xterm-bin"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index e3948888..75e45375 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -2278,7 +2278,7 @@
     <package name="libgnomesu"/>
     <package name="libgnomesu-lang"/>
     <package name="libgnomesu0"/>
-    <package name="libgnustep-base1_25"/>
+    <package name="libgnustep-base1_26"/>
     <package name="libgnutls-dane0"/>
     <package name="libgnutls30"/>
     <package name="libgnutls30-32bit"/>
@@ -2534,7 +2534,7 @@
     <package name="liblockdev1"/>
     <package name="libloudmouth-1-0"/>
     <package name="liblouis-data"/>
-    <package name="liblouis16"/>
+    <package name="liblouis17"/>
     <package name="liblpsolve55-0"/>
     <package name="liblqr-1-0"/>
     <package name="liblrdf2"/>
@@ -3325,8 +3325,6 @@
     <package name="lsof"/>
     <package name="lsscsi"/>
     <package name="ltrace"/>
-    <package name="lttng-modules"/>
-    <package name="lttng-modules-kmp-default"/>
     <package name="lua53"/>
     <package name="lua53-luasocket"/>
     <package name="luit"/>
@@ -3577,9 +3575,6 @@
     <package name="openSUSE-release"/>
     <package name="openSUSE-release-dvd"/>
     <package name="openSUSE-xfce-icon-theme"/>
-    <package name="openafs"/>
-    <package name="openafs-client"/>
-    <package name="openafs-kmp-default"/>
     <package name="openal-soft"/>
     <package name="openbox"/>
     <package name="openbox-adwaita-ob-theme"/>
@@ -4439,7 +4434,6 @@
     <package name="rsync"/>
     <package name="rt2860"/>
     <package name="rtkit"/>
-    <package name="rtl8812au-kmp-default"/>
     <package name="ruby"/>
     <package name="ruby-common"/>
     <package name="ruby-devel"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index d1233f3b..9c17921f 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -220,7 +220,6 @@
       <repopackage name="bash-doc" arch="i586,i686"/>
       <repopackage name="bash-lang" arch="i586,i686"/>
       <repopackage name="bbswitch-kmp-default" arch="i586,i686"/>
-      <repopackage name="bbswitch-kmp-pae" arch="i586,i686"/>
       <repopackage name="bc" arch="i586,i686"/>
       <repopackage name="bcm20702a1-firmware" arch="i586,i686"/>
       <repopackage name="bcm43xx-firmware" arch="i586,i686"/>
@@ -1006,7 +1005,6 @@
       <repopackage name="haveged" arch="i586,i686"/>
       <repopackage name="hddtemp" arch="i586,i686"/>
       <repopackage name="hdjmod-kmp-default" arch="i586,i686"/>
-      <repopackage name="hdjmod-kmp-pae" arch="i586,i686"/>
       <repopackage name="hdparm" arch="i586,i686"/>
       <repopackage name="health-checker" arch="i586,i686"/>
       <repopackage name="health-checker-plugins-MicroOS" arch="i586,i686"/>
@@ -1308,7 +1306,6 @@
       <repopackage name="kernel-docs" arch="i586,i686"/>
       <repopackage name="kernel-firmware" arch="i586,i686"/>
       <repopackage name="kernel-macros" arch="i586,i686"/>
-      <repopackage name="kernel-pae" arch="i586,i686"/>
       <repopackage name="kernel-pae" arch="i586,i686" onlyarch="i686"/>
       <repopackage name="kernel-pae-base" arch="i586,i686" onlyarch="i686"/>
       <repopackage name="kernel-pae-devel" arch="i586,i686"/>
@@ -1941,7 +1938,7 @@
       <repopackage name="libgnomesu" arch="i586,i686"/>
       <repopackage name="libgnomesu-lang" arch="i586,i686"/>
       <repopackage name="libgnomesu0" arch="i586,i686"/>
-      <repopackage name="libgnustep-base1_25" arch="i586,i686"/>
+      <repopackage name="libgnustep-base1_26" arch="i586,i686"/>
       <repopackage name="libgnutls30" arch="i586,i686"/>
       <repopackage name="libgoa-1_0-0" arch="i586,i686"/>
       <repopackage name="libgoa-backend-1_0-1" arch="i586,i686"/>
@@ -2356,7 +2353,7 @@
       <repopackage name="liblognorm5" arch="i586,i686"/>
       <repopackage name="libloudmouth-1-0" arch="i586,i686"/>
       <repopackage name="liblouis-data" arch="i586,i686"/>
-      <repopackage name="liblouis16" arch="i586,i686"/>
+      <repopackage name="liblouis17" arch="i586,i686"/>
       <repopackage name="liblpsolve55-0" arch="i586,i686"/>
       <repopackage name="liblqr-1-0" arch="i586,i686"/>
       <repopackage name="liblrdf2" arch="i586,i686"/>
@@ -3186,9 +3183,6 @@
       <repopackage name="lsof" arch="i586,i686"/>
       <repopackage name="lsscsi" arch="i586,i686"/>
       <repopackage name="ltrace" arch="i586,i686"/>
-      <repopackage name="lttng-modules" arch="i586,i686"/>
-      <repopackage name="lttng-modules-kmp-default" arch="i586,i686"/>
-      <repopackage name="lttng-modules-kmp-pae" arch="i586,i686"/>
       <repopackage name="lua53" arch="i586,i686"/>
       <repopackage name="lua53-luasocket" arch="i586,i686"/>
       <repopackage name="luit" arch="i586,i686"/>
@@ -3278,7 +3272,6 @@
       <repopackage name="metatheme-sonar-common" arch="i586,i686"/>
       <repopackage name="mgopen-fonts" arch="i586,i686"/>
       <repopackage name="mhvtl-kmp-default" arch="i586,i686"/>
-      <repopackage name="mhvtl-kmp-pae" arch="i586,i686"/>
       <repopackage name="milou5" arch="i586,i686"/>
       <repopackage name="milou5-lang" arch="i586,i686"/>
       <repopackage name="minicom" arch="i586,i686"/>
@@ -3467,9 +3460,6 @@
       <repopackage name="open-iscsi" arch="i586,i686"/>
       <repopackage name="open-vm-tools" arch="i586,i686"/>
       <repopackage name="open-vm-tools-desktop" arch="i586,i686"/>
-      <repopackage name="openafs" arch="i586,i686"/>
-      <repopackage name="openafs-client" arch="i586,i686"/>
-      <repopackage name="openafs-kmp-default" arch="i586,i686"/>
       <repopackage name="openal-soft" arch="i586,i686"/>
       <repopackage name="openbox" arch="i586,i686"/>
       <repopackage name="openbox-adwaita-ob-theme" arch="i586,i686"/>
@@ -3626,7 +3616,6 @@
       <repopackage name="pavucontrol" arch="i586,i686"/>
       <repopackage name="pavucontrol-lang" arch="i586,i686"/>
       <repopackage name="pcfclock-kmp-default" arch="i586,i686"/>
-      <repopackage name="pcfclock-kmp-pae" arch="i586,i686"/>
       <repopackage name="pciutils" arch="i586,i686"/>
       <repopackage name="pciutils-ids" arch="i586,i686"/>
       <repopackage name="pcmanfm" arch="i586,i686"/>
@@ -4333,8 +4322,6 @@
       <repopackage name="rsyslog" arch="i586,i686"/>
       <repopackage name="rt2860" arch="i586,i686"/>
       <repopackage name="rtkit" arch="i586,i686"/>
-      <repopackage name="rtl8812au-kmp-default" arch="i586,i686"/>
-      <repopackage name="rtl8812au-kmp-pae" arch="i586,i686"/>
       <repopackage name="ruby" arch="i586,i686"/>
       <repopackage name="ruby-common" arch="i586,i686"/>
       <repopackage name="ruby-devel" arch="i586,i686"/>
@@ -4777,7 +4764,6 @@
       <repopackage name="sysconfig" arch="i586,i686"/>
       <repopackage name="sysconfig-netconfig" arch="i586,i686"/>
       <repopackage name="sysdig-kmp-default" arch="i586,i686"/>
-      <repopackage name="sysdig-kmp-pae" arch="i586,i686"/>
       <repopackage name="sysfsutils" arch="i586,i686"/>
       <repopackage name="syslinux" arch="i586,i686"/>
       <repopackage name="syslog-service" arch="i586,i686"/>
@@ -5024,14 +5010,12 @@
       <repopackage name="util-macros-devel" arch="i586,i686"/>
       <repopackage name="v4l-conf" arch="i586,i686"/>
       <repopackage name="v4l2loopback-kmp-default" arch="i586,i686"/>
-      <repopackage name="v4l2loopback-kmp-pae" arch="i586,i686"/>
       <repopackage name="vacation" arch="i586,i686"/>
       <repopackage name="vala" arch="i586,i686"/>
       <repopackage name="valgrind" arch="i586,i686"/>
       <repopackage name="vdr" arch="i586,i686"/>
       <repopackage name="vdr-lang" arch="i586,i686"/>
       <repopackage name="vhba-kmp-default" arch="i586,i686"/>
-      <repopackage name="vhba-kmp-pae" arch="i586,i686"/>
       <repopackage name="viewnior" arch="i586,i686"/>
       <repopackage name="viewnior-lang" arch="i586,i686"/>
       <repopackage name="viewres" arch="i586,i686"/>
@@ -5357,7 +5341,6 @@
       <repopackage name="xstdcmap" arch="i586,i686"/>
       <repopackage name="xstroke" arch="i586,i686"/>
       <repopackage name="xtables-addons-kmp-default" arch="i586,i686"/>
-      <repopackage name="xtables-addons-kmp-pae" arch="i586,i686"/>
       <repopackage name="xtables-plugins" arch="i586,i686"/>
       <repopackage name="xterm" arch="i586,i686"/>
       <repopackage name="xterm-bin" 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 a89deba1..4b04db69 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1981,7 +1981,7 @@
       <repopackage name="libgnomesu" arch="x86_64"/>
       <repopackage name="libgnomesu-lang" arch="x86_64"/>
       <repopackage name="libgnomesu0" arch="x86_64"/>
-      <repopackage name="libgnustep-base1_25" arch="x86_64"/>
+      <repopackage name="libgnustep-base1_26" arch="x86_64"/>
       <repopackage name="libgnutls-dane0" arch="x86_64"/>
       <repopackage name="libgnutls30" arch="x86_64"/>
       <repopackage name="libgnutls30-32bit" arch="x86_64"/>
@@ -2415,7 +2415,7 @@
       <repopackage name="liblockdev1" arch="x86_64"/>
       <repopackage name="libloudmouth-1-0" arch="x86_64"/>
       <repopackage name="liblouis-data" arch="x86_64"/>
-      <repopackage name="liblouis16" arch="x86_64"/>
+      <repopackage name="liblouis17" arch="x86_64"/>
       <repopackage name="liblpsolve55-0" arch="x86_64"/>
       <repopackage name="liblqr-1-0" arch="x86_64"/>
       <repopackage name="liblrdf2" arch="x86_64"/>
@@ -3330,8 +3330,6 @@
       <repopackage name="lsof" arch="x86_64"/>
       <repopackage name="lsscsi" arch="x86_64"/>
       <repopackage name="ltrace" arch="x86_64"/>
-      <repopackage name="lttng-modules" arch="x86_64"/>
-      <repopackage name="lttng-modules-kmp-default" arch="x86_64"/>
       <repopackage name="lua53" arch="x86_64"/>
       <repopackage name="lua53-luasocket" arch="x86_64"/>
       <repopackage name="luit" arch="x86_64"/>
@@ -3614,9 +3612,6 @@
       <repopackage name="open-iscsi" arch="x86_64"/>
       <repopackage name="open-vm-tools" arch="x86_64"/>
       <repopackage name="open-vm-tools-desktop" arch="x86_64"/>
-      <repopackage name="openafs" arch="x86_64"/>
-      <repopackage name="openafs-client" arch="x86_64"/>
-      <repopackage name="openafs-kmp-default" arch="x86_64"/>
       <repopackage name="openal-soft" arch="x86_64"/>
       <repopackage name="openbox" arch="x86_64"/>
       <repopackage name="openbox-adwaita-ob-theme" arch="x86_64"/>
@@ -4489,7 +4484,6 @@
       <repopackage name="rsync" arch="x86_64"/>
       <repopackage name="rt2860" arch="x86_64"/>
       <repopackage name="rtkit" arch="x86_64"/>
-      <repopackage name="rtl8812au-kmp-default" arch="x86_64"/>
       <repopackage name="ruby" arch="x86_64"/>
       <repopackage name="ruby-common" arch="x86_64"/>
       <repopackage name="ruby-devel" arch="x86_64"/>