diff --git a/DVD5-i586.group b/DVD5-i586.group
index 830cdcf7..9da66ee9 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -223,7 +223,6 @@
     <package name="baobab-lang"/>
     <package name="bash"/>
     <package name="bash-completion"/>
-    <package name="bash-completion-devel"/>
     <package name="bash-doc"/>
     <package name="bash-lang"/>
     <package name="bbswitch-kmp-default"/>
@@ -612,7 +611,6 @@
     <package name="fillup"/>
     <package name="findutils"/>
     <package name="findutils-lang"/>
-    <package name="fipscheck"/>
     <package name="firewall-macros"/>
     <package name="firewalld"/>
     <package name="firewalld-lang"/>
@@ -1329,15 +1327,11 @@
     <package name="keditbookmarks"/>
     <package name="keditbookmarks-lang"/>
     <package name="kernel-default"/>
-    <package name="kernel-default-devel"/>
     <package name="kernel-devel"/>
     <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"/>
     <package name="kexec-tools"/>
     <package name="keyutils"/>
     <package name="kf5-kcm-fcitx"/>
@@ -2065,7 +2059,6 @@
     <package name="libedit0"/>
     <package name="libeditorconfig0"/>
     <package name="libefivar1"/>
-    <package name="libelf-devel"/>
     <package name="libelf1"/>
     <package name="libenca0"/>
     <package name="libenchant-2-2"/>
@@ -2109,7 +2102,6 @@
     <package name="libffi7"/>
     <package name="libfftw3-3"/>
     <package name="libfftw3_threads3"/>
-    <package name="libfipscheck1"/>
     <package name="libfl-devel"/>
     <package name="libfl2"/>
     <package name="libflatpak0"/>
@@ -3171,7 +3163,6 @@
     <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"/>
@@ -3276,7 +3267,6 @@
     <package name="mozilla-nspr"/>
     <package name="mozilla-nss"/>
     <package name="mozilla-nss-certs"/>
-    <package name="mozilla-nss-tools"/>
     <package name="mpfr-devel"/>
     <package name="mpg123-openal"/>
     <package name="mpg123-pulse"/>
@@ -3419,7 +3409,6 @@
     <package name="openafs"/>
     <package name="openafs-client"/>
     <package name="openafs-kmp-default"/>
-    <package name="openafs-kmp-pae"/>
     <package name="openal-soft"/>
     <package name="openbox"/>
     <package name="openbox-adwaita-ob-theme"/>
@@ -3860,8 +3849,6 @@
     <package name="perl-namespace-clean"/>
     <package name="perl-razor-agents"/>
     <package name="permissions"/>
-    <package name="pesign"/>
-    <package name="pesign-obs-integration"/>
     <package name="pfscalibration"/>
     <package name="pfstmo"/>
     <package name="pfstools"/>
@@ -4258,7 +4245,6 @@
     <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"/>
diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index aba48c55..b4468f9b 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -228,7 +228,6 @@
     <package name="baobab-lang"/>
     <package name="bash"/>
     <package name="bash-completion"/>
-    <package name="bash-completion-devel"/>
     <package name="bash-doc"/>
     <package name="bash-lang"/>
     <package name="bbswitch-kmp-default"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 2e2e8440..2cb965a3 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -223,7 +223,6 @@
       <repopackage name="baobab-lang" arch="i586,i686"/>
       <repopackage name="bash" arch="i586,i686"/>
       <repopackage name="bash-completion" arch="i586,i686"/>
-      <repopackage name="bash-completion-devel" arch="i586,i686"/>
       <repopackage name="bash-doc" arch="i586,i686"/>
       <repopackage name="bash-lang" arch="i586,i686"/>
       <repopackage name="bbswitch-kmp-default" arch="i586,i686"/>
@@ -613,7 +612,6 @@
       <repopackage name="fillup" arch="i586,i686"/>
       <repopackage name="findutils" arch="i586,i686"/>
       <repopackage name="findutils-lang" arch="i586,i686"/>
-      <repopackage name="fipscheck" arch="i586,i686"/>
       <repopackage name="firewall-macros" arch="i586,i686"/>
       <repopackage name="firewalld" arch="i586,i686"/>
       <repopackage name="firewalld-lang" arch="i586,i686"/>
@@ -1336,18 +1334,14 @@
       <repopackage name="keditbookmarks" arch="i586,i686"/>
       <repopackage name="keditbookmarks-lang" arch="i586,i686"/>
       <repopackage name="kernel-default" arch="i586,i686"/>
-      <repopackage name="kernel-default-devel" arch="i586,i686"/>
       <repopackage name="kernel-devel" arch="i586,i686"/>
       <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"/>
       <repopackage name="kernel-pae-devel" arch="i586,i686" onlyarch="i686"/>
       <repopackage name="kernel-source" arch="i586,i686"/>
-      <repopackage name="kernel-syms" arch="i586,i686"/>
       <repopackage name="kexec-tools" arch="i586,i686"/>
       <repopackage name="keyutils" arch="i586,i686"/>
       <repopackage name="kf5-kcm-fcitx" arch="i586,i686"/>
@@ -1797,7 +1791,6 @@
       <repopackage name="libedit0" arch="i586,i686"/>
       <repopackage name="libeditorconfig0" arch="i586,i686"/>
       <repopackage name="libefivar1" arch="i586,i686"/>
-      <repopackage name="libelf-devel" arch="i586,i686"/>
       <repopackage name="libelf1" arch="i586,i686"/>
       <repopackage name="libenca0" arch="i586,i686"/>
       <repopackage name="libenchant-2-2" arch="i586,i686"/>
@@ -1841,7 +1834,6 @@
       <repopackage name="libffi7" arch="i586,i686"/>
       <repopackage name="libfftw3-3" arch="i586,i686"/>
       <repopackage name="libfftw3_threads3" arch="i586,i686"/>
-      <repopackage name="libfipscheck1" arch="i586,i686"/>
       <repopackage name="libfl-devel" arch="i586,i686"/>
       <repopackage name="libfl2" arch="i586,i686"/>
       <repopackage name="libFLAC++6" arch="i586,i686"/>
@@ -3181,7 +3173,6 @@
       <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"/>
@@ -3298,7 +3289,6 @@
       <repopackage name="mozilla-nspr" arch="i586,i686"/>
       <repopackage name="mozilla-nss" arch="i586,i686"/>
       <repopackage name="mozilla-nss-certs" arch="i586,i686"/>
-      <repopackage name="mozilla-nss-tools" arch="i586,i686"/>
       <repopackage name="MozillaFirefox" arch="i586,i686"/>
       <repopackage name="MozillaFirefox-branding-openSUSE" arch="i586,i686"/>
       <repopackage name="MozillaFirefox-translations-common" arch="i586,i686"/>
@@ -3460,7 +3450,6 @@
       <repopackage name="openafs" arch="i586,i686"/>
       <repopackage name="openafs-client" arch="i586,i686"/>
       <repopackage name="openafs-kmp-default" arch="i586,i686"/>
-      <repopackage name="openafs-kmp-pae" 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"/>
@@ -3915,8 +3904,6 @@
       <repopackage name="perl-YAML" arch="i586,i686"/>
       <repopackage name="perl-YAML-LibYAML" arch="i586,i686"/>
       <repopackage name="permissions" arch="i586,i686"/>
-      <repopackage name="pesign" arch="i586,i686"/>
-      <repopackage name="pesign-obs-integration" arch="i586,i686"/>
       <repopackage name="pfscalibration" arch="i586,i686"/>
       <repopackage name="pfstmo" arch="i586,i686"/>
       <repopackage name="pfstools" arch="i586,i686"/>
@@ -4313,7 +4300,6 @@
       <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"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
index da3df76a..990c7c55 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -230,7 +230,6 @@
       <repopackage name="baobab-lang" arch="x86_64"/>
       <repopackage name="bash" arch="x86_64"/>
       <repopackage name="bash-completion" arch="x86_64"/>
-      <repopackage name="bash-completion-devel" arch="x86_64"/>
       <repopackage name="bash-doc" arch="x86_64"/>
       <repopackage name="bash-lang" arch="x86_64"/>
       <repopackage name="bbswitch-kmp-default" arch="x86_64"/>