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 f46c7141..e7c8fe9c 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,6 +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="libssh4-32bit" arch="x86_64"/>
       <repopackage name="libstdc++41" onlyarch="skipit"/>
       <repopackage name="libstdc++41-32bit" onlyarch="skipit"/>
@@ -432,6 +433,7 @@
       <repopackage name="libunrar-devel"/>
       <repopackage name="libunrar5_6_5"/>
       <repopackage name="libvorbisenc2-32bit" arch="x86_64"/>
+      <repopackage name="libvulkan1"/>
       <repopackage name="libX11-xcb1-32bit" arch="x86_64"/>
       <repopackage name="libxcb-dri2-0-32bit" arch="x86_64"/>
       <repopackage name="libxcb-dri3-0-32bit" arch="x86_64"/>
@@ -550,6 +552,7 @@
       <repopackage name="ubuntu-fonts"/>
       <repopackage name="udev-mini" onlyarch="skipit"/>
       <repopackage name="unrar"/>
+      <repopackage name="vulkan"/>
       <repopackage name="xv"/>
       <repopackage name="yast2-all-packages" onlyarch="skipit"/>
       <repopackage name="yast2-branding-SLED" onlyarch="skipit"/>
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 a39e7959..87746c84 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
@@ -61,7 +61,6 @@
       <repopackage name="aaa_base"/>
       <repopackage name="apparmor-abstractions"/>
       <repopackage name="apparmor-parser"/>
-      <repopackage name="apparmor-parser"/>
       <repopackage name="apparmor-profiles"/>
       <repopackage name="apparmor-utils"/>
       <repopackage name="attr"/>
@@ -85,14 +84,14 @@
       <repopackage name="ca-certificates-mozilla"/>
       <repopackage name="caasp-tools"/>
       <repopackage name="catatonit"/>
-      <repopackage name="catatonit"/>
       <repopackage name="ceph-common"/>
       <repopackage name="chrony"/>
       <repopackage name="cloud-init"/>
       <repopackage name="cloud-init-config-caasp"/>
       <repopackage name="cni"/>
+      <repopackage name="cni"/>
+      <repopackage name="cni-plugins"/>
       <repopackage name="cni-plugins"/>
-      <repopackage name="containerd-kubic"/>
       <repopackage name="containerd-kubic"/>
       <repopackage name="coreutils"/>
       <repopackage name="coreutils"/>
@@ -103,6 +102,10 @@
       <repopackage name="cracklib-dict-full"/>
       <repopackage name="cracklib-dict-small"/>
       <repopackage name="cri-o"/>
+      <repopackage name="cri-o"/>
+      <repopackage name="cri-o-kubeadm-criconfig"/>
+      <repopackage name="cri-o-kubeadm-criconfig"/>
+      <repopackage name="cri-tools"/>
       <repopackage name="cri-tools"/>
       <repopackage name="curl"/>
       <repopackage name="cyrus-sasl"/>
@@ -115,10 +118,7 @@
       <repopackage name="diffutils"/>
       <repopackage name="dmidecode"/>
       <repopackage name="docker-kubic"/>
-      <repopackage name="docker-kubic"/>
       <repopackage name="docker-libnetwork-kubic"/>
-      <repopackage name="docker-libnetwork-kubic"/>
-      <repopackage name="docker-runc-kubic"/>
       <repopackage name="docker-runc-kubic"/>
       <repopackage name="dosfstools"/>
       <repopackage name="dracut"/>
@@ -127,10 +127,12 @@
       <repopackage name="e2fsprogs"/>
       <repopackage name="e2fsprogs"/>
       <repopackage name="ebtables"/>
+      <repopackage name="ebtables"/>
       <repopackage name="efibootmgr"/>
       <repopackage name="elfutils"/>
       <repopackage name="elfutils"/>
       <repopackage name="ethtool"/>
+      <repopackage name="ethtool"/>
       <repopackage name="evmctl"/>
       <repopackage name="fcoe-utils"/>
       <repopackage name="file"/>
@@ -148,14 +150,17 @@
       <repopackage name="gawk"/>
       <repopackage name="gettext-runtime"/>
       <repopackage name="gio-branding-openSUSE"/>
-      <repopackage name="git-core"/>
+      <repopackage name="gio-branding-openSUSE"/>
       <repopackage name="git-core"/>
       <repopackage name="glib-networking"/>
+      <repopackage name="glib-networking"/>
+      <repopackage name="glib2-tools"/>
       <repopackage name="glib2-tools"/>
       <repopackage name="glibc"/>
       <repopackage name="glibc"/>
       <repopackage name="glibc-locale"/>
       <repopackage name="gpg2"/>
+      <repopackage name="gpg2"/>
       <repopackage name="gptfdisk"/>
       <repopackage name="grep"/>
       <repopackage name="grep"/>
@@ -166,6 +171,7 @@
       <repopackage name="grub2-snapper-plugin"/>
       <repopackage name="grub2-x86_64-efi"/>
       <repopackage name="gsettings-desktop-schemas"/>
+      <repopackage name="gsettings-desktop-schemas"/>
       <repopackage name="gzip"/>
       <repopackage name="gzip"/>
       <repopackage name="hardlink"/>
@@ -208,9 +214,11 @@
       <repopackage name="krb5"/>
       <repopackage name="kubernetes-client"/>
       <repopackage name="kubernetes-common"/>
+      <repopackage name="kubernetes-common"/>
+      <repopackage name="kubernetes-kubeadm"/>
       <repopackage name="kubernetes-kubeadm"/>
       <repopackage name="kubernetes-kubelet"/>
-      <repopackage name="kubernetes-salt"/>
+      <repopackage name="kubernetes-kubelet"/>
       <repopackage name="kubic-locale-archive"/>
       <repopackage name="less"/>
       <repopackage name="less"/>
@@ -220,11 +228,13 @@
       <repopackage name="libapparmor1"/>
       <repopackage name="libapparmor1"/>
       <repopackage name="libarchive13"/>
+      <repopackage name="libarchive13"/>
       <repopackage name="libargon2-1"/>
       <repopackage name="libargon2-1"/>
       <repopackage name="libasm1"/>
       <repopackage name="libasm1"/>
       <repopackage name="libassuan0"/>
+      <repopackage name="libassuan0"/>
       <repopackage name="libattr1"/>
       <repopackage name="libattr1"/>
       <repopackage name="libaudit1"/>
@@ -251,8 +261,7 @@
       <repopackage name="libcom_err2"/>
       <repopackage name="libconfig11"/>
       <repopackage name="libcontainers-common"/>
-      <repopackage name="libcontainers-image"/>
-      <repopackage name="libcontainers-storage"/>
+      <repopackage name="libcontainers-common"/>
       <repopackage name="libcrack2"/>
       <repopackage name="libcrack2"/>
       <repopackage name="libcroco-0_6-3"/>
@@ -304,6 +313,7 @@
       <repopackage name="libgdbm_compat4"/>
       <repopackage name="libgdbm_compat4"/>
       <repopackage name="libgio-2_0-0"/>
+      <repopackage name="libgio-2_0-0"/>
       <repopackage name="libglib-2_0-0"/>
       <repopackage name="libglib-2_0-0"/>
       <repopackage name="libgmodule-2_0-0"/>
@@ -311,13 +321,16 @@
       <repopackage name="libgmp10"/>
       <repopackage name="libgmp10"/>
       <repopackage name="libgnutls30"/>
+      <repopackage name="libgnutls30"/>
       <repopackage name="libgobject-2_0-0"/>
       <repopackage name="libgobject-2_0-0"/>
       <repopackage name="libgpg-error0"/>
       <repopackage name="libgpg-error0"/>
       <repopackage name="libgpgme11"/>
+      <repopackage name="libgpgme11"/>
       <repopackage name="libhavege1"/>
       <repopackage name="libhogweed4"/>
+      <repopackage name="libhogweed4"/>
       <repopackage name="libibverbs"/>
       <repopackage name="libibverbs1"/>
       <repopackage name="libicu-suse62_1"/>
@@ -335,6 +348,7 @@
       <repopackage name="libkmod2"/>
       <repopackage name="libkmod2"/>
       <repopackage name="libksba8"/>
+      <repopackage name="libksba8"/>
       <repopackage name="libldap-2_4-2"/>
       <repopackage name="libldap-2_4-2"/>
       <repopackage name="libldb1"/>
@@ -342,7 +356,6 @@
       <repopackage name="liblogging0"/>
       <repopackage name="liblognorm5"/>
       <repopackage name="libltdl7"/>
-      <repopackage name="libltdl7"/>
       <repopackage name="liblttng-ust0"/>
       <repopackage name="liblua5_3-5"/>
       <repopackage name="liblua5_3-5"/>
@@ -361,6 +374,7 @@
       <repopackage name="libmnl0"/>
       <repopackage name="libmnl0"/>
       <repopackage name="libmodman1"/>
+      <repopackage name="libmodman1"/>
       <repopackage name="libmount1"/>
       <repopackage name="libmount1"/>
       <repopackage name="libmspack0"/>
@@ -369,6 +383,7 @@
       <repopackage name="libnetfilter_conntrack3"/>
       <repopackage name="libnetfilter_conntrack3"/>
       <repopackage name="libnettle6"/>
+      <repopackage name="libnettle6"/>
       <repopackage name="libnfnetlink0"/>
       <repopackage name="libnfnetlink0"/>
       <repopackage name="libnghttp2-14"/>
@@ -378,6 +393,7 @@
       <repopackage name="libnl3-200"/>
       <repopackage name="libnl3-200"/>
       <repopackage name="libnpth0"/>
+      <repopackage name="libnpth0"/>
       <repopackage name="libnsl2"/>
       <repopackage name="libnsl2"/>
       <repopackage name="libnss_usrfiles2"/>
@@ -387,6 +403,7 @@
       <repopackage name="libopenssl1_1"/>
       <repopackage name="libopenssl1_1"/>
       <repopackage name="libostree-1-1"/>
+      <repopackage name="libostree-1-1"/>
       <repopackage name="libp11-kit0"/>
       <repopackage name="libp11-kit0"/>
       <repopackage name="libparted0"/>
@@ -397,13 +414,13 @@
       <repopackage name="libpcre1"/>
       <repopackage name="libpcre2-8-0"/>
       <repopackage name="libpcre2-8-0"/>
-      <repopackage name="libpgm-5_2-0"/>
       <repopackage name="libpng16-16"/>
       <repopackage name="libpopt0"/>
       <repopackage name="libpopt0"/>
       <repopackage name="libprocps7"/>
       <repopackage name="libprocps7"/>
       <repopackage name="libproxy1"/>
+      <repopackage name="libproxy1"/>
       <repopackage name="libpsl5"/>
       <repopackage name="libpsl5"/>
       <repopackage name="libpython3_6m1_0"/>
@@ -430,15 +447,14 @@
       <repopackage name="libsepol1"/>
       <repopackage name="libsgutils2-1_43-2"/>
       <repopackage name="libsha1detectcoll1"/>
-      <repopackage name="libsha1detectcoll1"/>
       <repopackage name="libsmartcols1"/>
       <repopackage name="libsmartcols1"/>
       <repopackage name="libsnapper4"/>
       <repopackage name="libsnappy1"/>
-      <repopackage name="libsodium23"/>
       <repopackage name="libsoftokn3"/>
       <repopackage name="libsolv-tools"/>
       <repopackage name="libsoup-2_4-1"/>
+      <repopackage name="libsoup-2_4-1"/>
       <repopackage name="libsqlite3-0"/>
       <repopackage name="libsqlite3-0"/>
       <repopackage name="libssh4"/>
@@ -466,9 +482,9 @@
       <repopackage name="libudev1"/>
       <repopackage name="libunistring2"/>
       <repopackage name="libunistring2"/>
-      <repopackage name="libunwind"/>
       <repopackage name="liburcu6"/>
       <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="libutempter0"/>
@@ -480,6 +496,7 @@
       <repopackage name="libvmtools0"/>
       <repopackage name="libwicked-0-6"/>
       <repopackage name="libwrap0"/>
+      <repopackage name="libwrap0"/>
       <repopackage name="libx86emu2"/>
       <repopackage name="libxml2-2"/>
       <repopackage name="libxml2-2"/>
@@ -495,7 +512,6 @@
       <repopackage name="libz1"/>
       <repopackage name="libzio1"/>
       <repopackage name="libzio1"/>
-      <repopackage name="libzmq5"/>
       <repopackage name="libzstd1"/>
       <repopackage name="libzypp"/>
       <repopackage name="logrotate"/>
@@ -529,6 +545,7 @@
       <repopackage name="openssl"/>
       <repopackage name="openssl-1_1"/>
       <repopackage name="openssl-1_1"/>
+      <repopackage name="openSUSE-build-key"/>
       <repopackage name="openSUSE-Tumbleweed-Kubic-release"/>
       <repopackage name="openSUSE-Tumbleweed-Kubic-release"/>
       <repopackage name="openSUSE-Tumbleweed-Kubic-release-dvd"/>
@@ -542,6 +559,7 @@
       <repopackage name="pam-config"/>
       <repopackage name="pam-config"/>
       <repopackage name="parted"/>
+      <repopackage name="patterns-caasp-alt-container-runtime"/>
       <repopackage name="patterns-caasp-apparmor"/>
       <repopackage name="patterns-caasp-container-runtime"/>
       <repopackage name="patterns-caasp-hardware"/>
@@ -560,7 +578,6 @@
       <repopackage name="perl-Bootloader"/>
       <repopackage name="perl-Bootloader"/>
       <repopackage name="perl-Error"/>
-      <repopackage name="perl-Error"/>
       <repopackage name="perl-HTML-Parser"/>
       <repopackage name="perl-HTML-Tagset"/>
       <repopackage name="perl-JSON"/>
@@ -569,6 +586,7 @@
       <repopackage name="pigz"/>
       <repopackage name="pigz"/>
       <repopackage name="pinentry"/>
+      <repopackage name="pinentry"/>
       <repopackage name="pkg-config"/>
       <repopackage name="pkg-config"/>
       <repopackage name="podman"/>
@@ -592,43 +610,30 @@
       <repopackage name="python3-chardet"/>
       <repopackage name="python3-configobj"/>
       <repopackage name="python3-cryptography"/>
-      <repopackage name="python3-dnspython"/>
       <repopackage name="python3-ecdsa"/>
-      <repopackage name="python3-etcd"/>
       <repopackage name="python3-idna"/>
       <repopackage name="python3-Jinja2"/>
       <repopackage name="python3-jsonpatch"/>
       <repopackage name="python3-jsonpointer"/>
       <repopackage name="python3-jsonschema"/>
-      <repopackage name="python3-M2Crypto"/>
       <repopackage name="python3-MarkupSafe"/>
-      <repopackage name="python3-msgpack"/>
       <repopackage name="python3-oauthlib"/>
       <repopackage name="python3-packaging"/>
       <repopackage name="python3-PrettyTable"/>
-      <repopackage name="python3-psutil"/>
       <repopackage name="python3-py"/>
       <repopackage name="python3-pyasn1"/>
       <repopackage name="python3-pycparser"/>
-      <repopackage name="python3-pycryptodome"/>
       <repopackage name="python3-PyJWT"/>
-      <repopackage name="python3-pyOpenSSL"/>
       <repopackage name="python3-pyparsing"/>
-      <repopackage name="python3-pyroute2"/>
       <repopackage name="python3-pyserial"/>
       <repopackage name="python3-pytz"/>
       <repopackage name="python3-PyYAML"/>
-      <repopackage name="python3-pyzmq"/>
       <repopackage name="python3-rados"/>
       <repopackage name="python3-rbd"/>
       <repopackage name="python3-requests"/>
       <repopackage name="python3-rgw"/>
-      <repopackage name="python3-rpm"/>
-      <repopackage name="python3-salt"/>
       <repopackage name="python3-setuptools"/>
-      <repopackage name="python3-simplejson"/>
       <repopackage name="python3-six"/>
-      <repopackage name="python3-tornado"/>
       <repopackage name="python3-urllib3"/>
       <repopackage name="python3-zypp-plugin"/>
       <repopackage name="rdma-core"/>
@@ -643,22 +648,23 @@
       <repopackage name="rsync"/>
       <repopackage name="rsyslog"/>
       <repopackage name="runc"/>
-      <repopackage name="salt"/>
+      <repopackage name="runc"/>
       <repopackage name="sed"/>
       <repopackage name="sed"/>
       <repopackage name="sg3_utils"/>
       <repopackage name="shadow"/>
       <repopackage name="shadow"/>
       <repopackage name="shared-mime-info"/>
+      <repopackage name="shared-mime-info"/>
       <repopackage name="shim"/>
       <repopackage name="snapper"/>
       <repopackage name="socat"/>
+      <repopackage name="socat"/>
       <repopackage name="sssd"/>
       <repopackage name="sssd-krb5-common"/>
       <repopackage name="sssd-ldap"/>
       <repopackage name="sudo"/>
       <repopackage name="supportutils"/>
-      <repopackage name="suse-build-key"/>
       <repopackage name="suse-module-tools"/>
       <repopackage name="suse-module-tools"/>
       <repopackage name="sysconfig"/>
diff --git a/openSUSE-Addon-NonOss-Deps.group b/openSUSE-Addon-NonOss-Deps.group
index ede6e4c2..294ff13e 100644
--- a/openSUSE-Addon-NonOss-Deps.group
+++ b/openSUSE-Addon-NonOss-Deps.group
@@ -17,6 +17,7 @@
     <package name="glu-devel"/>
     <package name="libOSMesa-devel"/>
     <package name="libOSMesa8"/>
+    <package name="libSPIRV-Tools-suse6"/>
     <package name="libXdamage-devel"/>
     <package name="libXxf86vm-devel"/>
     <package name="libenet7"/>
@@ -25,11 +26,13 @@
     <package name="libglvnd-devel"/>
     <package name="libopenssl1_0_0-steam"/>
     <package name="libregina3"/>
+    <package name="libvulkan1"/>
     <package name="lksctp-tools"/>
     <package name="openttd-data"/>
     <package name="openttd-opengfx"/>
     <package name="steamtricks"/>
     <package name="steamtricks-data"/>
     <package name="ubuntu-fonts"/>
+    <package name="vulkan"/>
   </packagelist>
 </group>
diff --git a/openSUSE-Kubic-DVD.group b/openSUSE-Kubic-DVD.group
index 0ca63f2f..9edd2b7f 100644
--- a/openSUSE-Kubic-DVD.group
+++ b/openSUSE-Kubic-DVD.group
@@ -13,11 +13,16 @@
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
     <package name="catatonit"/>
+    <package name="cni"/>
+    <package name="cni-plugins"/>
     <package name="containerd-kubic"/>
     <package name="coreutils"/>
     <package name="cpio"/>
     <package name="cracklib"/>
     <package name="cracklib-dict-full"/>
+    <package name="cri-o"/>
+    <package name="cri-o-kubeadm-criconfig"/>
+    <package name="cri-tools"/>
     <package name="cyrus-sasl"/>
     <package name="cyrus-sasl-gssapi"/>
     <package name="dbus-1"/>
@@ -28,7 +33,9 @@
     <package name="dracut"/>
     <package name="dracut-ima"/>
     <package name="e2fsprogs"/>
+    <package name="ebtables"/>
     <package name="elfutils"/>
+    <package name="ethtool"/>
     <package name="evmctl"/>
     <package name="file"/>
     <package name="file-magic"/>
@@ -36,10 +43,15 @@
     <package name="fillup"/>
     <package name="findutils"/>
     <package name="gawk"/>
+    <package name="gio-branding-openSUSE"/>
     <package name="git-core"/>
+    <package name="glib-networking"/>
+    <package name="glib2-tools"/>
     <package name="glibc"/>
     <package name="glibc-locale"/>
+    <package name="gpg2"/>
     <package name="grep"/>
+    <package name="gsettings-desktop-schemas"/>
     <package name="gzip"/>
     <package name="hardlink"/>
     <package name="hostname"/>
@@ -57,11 +69,16 @@
     <package name="kmod"/>
     <package name="kmod-compat"/>
     <package name="krb5"/>
+    <package name="kubernetes-common"/>
+    <package name="kubernetes-kubeadm"/>
+    <package name="kubernetes-kubelet"/>
     <package name="less"/>
     <package name="libacl1"/>
     <package name="libapparmor1"/>
+    <package name="libarchive13"/>
     <package name="libargon2-1"/>
     <package name="libasm1"/>
+    <package name="libassuan0"/>
     <package name="libattr1"/>
     <package name="libaudit1"/>
     <package name="libbasicobjects0"/>
@@ -72,6 +89,7 @@
     <package name="libcares2"/>
     <package name="libcollection4"/>
     <package name="libcom_err2"/>
+    <package name="libcontainers-common"/>
     <package name="libcrack2"/>
     <package name="libcryptsetup12"/>
     <package name="libcurl4"/>
@@ -93,11 +111,15 @@
     <package name="libgcrypt20"/>
     <package name="libgdbm5"/>
     <package name="libgdbm_compat4"/>
+    <package name="libgio-2_0-0"/>
     <package name="libglib-2_0-0"/>
     <package name="libgmodule-2_0-0"/>
     <package name="libgmp10"/>
+    <package name="libgnutls30"/>
     <package name="libgobject-2_0-0"/>
     <package name="libgpg-error0"/>
+    <package name="libgpgme11"/>
+    <package name="libhogweed4"/>
     <package name="libicu-suse62_1"/>
     <package name="libicu62_1-ledata"/>
     <package name="libidn2-0"/>
@@ -107,6 +129,7 @@
     <package name="libjson-c4"/>
     <package name="libkeyutils1"/>
     <package name="libkmod2"/>
+    <package name="libksba8"/>
     <package name="libldap-2_4-2"/>
     <package name="libldb1"/>
     <package name="libltdl7"/>
@@ -115,22 +138,27 @@
     <package name="liblzma5"/>
     <package name="libmagic1"/>
     <package name="libmnl0"/>
+    <package name="libmodman1"/>
     <package name="libmount1"/>
     <package name="libmspack0"/>
     <package name="libncurses6"/>
     <package name="libnetfilter_conntrack3"/>
+    <package name="libnettle6"/>
     <package name="libnfnetlink0"/>
     <package name="libnghttp2-14"/>
     <package name="libnl-config"/>
     <package name="libnl3-200"/>
+    <package name="libnpth0"/>
     <package name="libnsl2"/>
     <package name="libopenssl1_1"/>
+    <package name="libostree-1-1"/>
     <package name="libp11-kit0"/>
     <package name="libpath_utils1"/>
     <package name="libpcre1"/>
     <package name="libpcre2-8-0"/>
     <package name="libpopt0"/>
     <package name="libprocps7"/>
+    <package name="libproxy1"/>
     <package name="libpsl5"/>
     <package name="libpython3_6m1_0"/>
     <package name="libqrencode4"/>
@@ -143,6 +171,7 @@
     <package name="libsepol1"/>
     <package name="libsha1detectcoll1"/>
     <package name="libsmartcols1"/>
+    <package name="libsoup-2_4-1"/>
     <package name="libsqlite3-0"/>
     <package name="libssh4"/>
     <package name="libsss_certmap0"/>
@@ -160,11 +189,13 @@
     <package name="libtirpc3"/>
     <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"/>
     <package name="libvmtools0"/>
+    <package name="libwrap0"/>
     <package name="libxml2-2"/>
     <package name="libxmlsec1-1"/>
     <package name="libxmlsec1-openssl1"/>
@@ -187,6 +218,7 @@
     <package name="p11-kit-tools"/>
     <package name="pam"/>
     <package name="pam-config"/>
+    <package name="patterns-caasp-alt-container-runtime"/>
     <package name="patterns-caasp-apparmor"/>
     <package name="patterns-caasp-container-runtime"/>
     <package name="patterns-caasp-hardware"/>
@@ -200,7 +232,9 @@
     <package name="perl-base"/>
     <package name="permissions"/>
     <package name="pigz"/>
+    <package name="pinentry"/>
     <package name="pkg-config"/>
+    <package name="podman"/>
     <package name="procps"/>
     <package name="python-rpm-macros"/>
     <package name="python3"/>
@@ -209,8 +243,11 @@
     <package name="rpm"/>
     <package name="rpm-config-SUSE"/>
     <package name="rsync"/>
+    <package name="runc"/>
     <package name="sed"/>
     <package name="shadow"/>
+    <package name="shared-mime-info"/>
+    <package name="socat"/>
     <package name="sssd"/>
     <package name="sssd-krb5-common"/>
     <package name="sssd-ldap"/>
diff --git a/openSUSE-Kubic.group b/openSUSE-Kubic.group
index b5ecb7a3..c8598081 100644
--- a/openSUSE-Kubic.group
+++ b/openSUSE-Kubic.group
@@ -3,7 +3,6 @@
 <group name="openSUSE-Kubic">
   <packagelist>
     <package name="aaa_base"/>
-    <package name="apparmor-parser"/>
     <package name="attr"/>
     <package name="audit"/>
     <package name="autofs"/>
@@ -19,19 +18,18 @@
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
     <package name="caasp-tools"/>
-    <package name="catatonit"/>
     <package name="ceph-common"/>
     <package name="chrony"/>
     <package name="cloud-init"/>
     <package name="cloud-init-config-caasp"/>
     <package name="cni"/>
     <package name="cni-plugins"/>
-    <package name="containerd-kubic"/>
     <package name="coreutils"/>
     <package name="cpio"/>
     <package name="cracklib"/>
     <package name="cracklib-dict-small"/>
     <package name="cri-o"/>
+    <package name="cri-o-kubeadm-criconfig"/>
     <package name="cri-tools"/>
     <package name="curl"/>
     <package name="dbus-1"/>
@@ -39,9 +37,6 @@
     <package name="device-mapper"/>
     <package name="diffutils"/>
     <package name="dmidecode"/>
-    <package name="docker-kubic"/>
-    <package name="docker-libnetwork-kubic"/>
-    <package name="docker-runc-kubic"/>
     <package name="dosfstools"/>
     <package name="dracut"/>
     <package name="e2fsprogs"/>
@@ -59,7 +54,6 @@
     <package name="gawk"/>
     <package name="gettext-runtime"/>
     <package name="gio-branding-openSUSE"/>
-    <package name="git-core"/>
     <package name="glib-networking"/>
     <package name="glib2-tools"/>
     <package name="glibc"/>
@@ -100,7 +94,6 @@
     <package name="kubernetes-common"/>
     <package name="kubernetes-kubeadm"/>
     <package name="kubernetes-kubelet"/>
-    <package name="kubernetes-salt"/>
     <package name="kubic-locale-archive"/>
     <package name="less"/>
     <package name="libacl1"/>
@@ -126,8 +119,6 @@
     <package name="libcom_err2"/>
     <package name="libconfig11"/>
     <package name="libcontainers-common"/>
-    <package name="libcontainers-image"/>
-    <package name="libcontainers-storage"/>
     <package name="libcrack2"/>
     <package name="libcroco-0_6-3"/>
     <package name="libcryptsetup12"/>
@@ -179,7 +170,6 @@
     <package name="liblldp_clif1"/>
     <package name="liblogging0"/>
     <package name="liblognorm5"/>
-    <package name="libltdl7"/>
     <package name="liblttng-ust0"/>
     <package name="liblua5_3-5"/>
     <package name="liblvm2app2_2"/>
@@ -215,7 +205,6 @@
     <package name="libpciaccess0"/>
     <package name="libpcre1"/>
     <package name="libpcre2-8-0"/>
-    <package name="libpgm-5_2-0"/>
     <package name="libpng16-16"/>
     <package name="libpopt0"/>
     <package name="libprocps7"/>
@@ -235,11 +224,9 @@
     <package name="libsemanage1"/>
     <package name="libsepol1"/>
     <package name="libsgutils2-1_43-2"/>
-    <package name="libsha1detectcoll1"/>
     <package name="libsmartcols1"/>
     <package name="libsnapper4"/>
     <package name="libsnappy1"/>
-    <package name="libsodium23"/>
     <package name="libsoftokn3"/>
     <package name="libsolv-tools"/>
     <package name="libsoup-2_4-1"/>
@@ -253,7 +240,6 @@
     <package name="libtirpc3"/>
     <package name="libudev1"/>
     <package name="libunistring2"/>
-    <package name="libunwind"/>
     <package name="liburcu6"/>
     <package name="libusb-1_0-0"/>
     <package name="libustr-1_0-1"/>
@@ -270,7 +256,6 @@
     <package name="libyaml-0-2"/>
     <package name="libz1"/>
     <package name="libzio1"/>
-    <package name="libzmq5"/>
     <package name="libzstd1"/>
     <package name="libzypp"/>
     <package name="logrotate"/>
@@ -293,6 +278,7 @@
     <package name="open-lldp"/>
     <package name="openSUSE-Tumbleweed-Kubic-release"/>
     <package name="openSUSE-Tumbleweed-Kubic-release-dvd"/>
+    <package name="openSUSE-build-key"/>
     <package name="openslp"/>
     <package name="openssh"/>
     <package name="openssl"/>
@@ -308,7 +294,6 @@
     <package name="pciutils-ids"/>
     <package name="perl"/>
     <package name="perl-Bootloader"/>
-    <package name="perl-Error"/>
     <package name="perl-HTML-Parser"/>
     <package name="perl-HTML-Tagset"/>
     <package name="perl-JSON"/>
@@ -317,14 +302,12 @@
     <package name="pigz"/>
     <package name="pinentry"/>
     <package name="pkg-config"/>
-    <package name="podman"/>
     <package name="procps"/>
     <package name="psmisc"/>
     <package name="python-rpm-macros"/>
     <package name="python3"/>
     <package name="python3-Babel"/>
     <package name="python3-Jinja2"/>
-    <package name="python3-M2Crypto"/>
     <package name="python3-MarkupSafe"/>
     <package name="python3-PrettyTable"/>
     <package name="python3-PyJWT"/>
@@ -339,37 +322,25 @@
     <package name="python3-chardet"/>
     <package name="python3-configobj"/>
     <package name="python3-cryptography"/>
-    <package name="python3-dnspython"/>
     <package name="python3-ecdsa"/>
-    <package name="python3-etcd"/>
     <package name="python3-idna"/>
     <package name="python3-jsonpatch"/>
     <package name="python3-jsonpointer"/>
     <package name="python3-jsonschema"/>
-    <package name="python3-msgpack"/>
     <package name="python3-oauthlib"/>
     <package name="python3-packaging"/>
-    <package name="python3-psutil"/>
     <package name="python3-py"/>
-    <package name="python3-pyOpenSSL"/>
     <package name="python3-pyasn1"/>
     <package name="python3-pycparser"/>
-    <package name="python3-pycryptodome"/>
     <package name="python3-pyparsing"/>
-    <package name="python3-pyroute2"/>
     <package name="python3-pyserial"/>
     <package name="python3-pytz"/>
-    <package name="python3-pyzmq"/>
     <package name="python3-rados"/>
     <package name="python3-rbd"/>
     <package name="python3-requests"/>
     <package name="python3-rgw"/>
-    <package name="python3-rpm"/>
-    <package name="python3-salt"/>
     <package name="python3-setuptools"/>
-    <package name="python3-simplejson"/>
     <package name="python3-six"/>
-    <package name="python3-tornado"/>
     <package name="python3-urllib3"/>
     <package name="python3-zypp-plugin"/>
     <package name="rdma-core"/>
@@ -381,7 +352,6 @@
     <package name="rsync"/>
     <package name="rsyslog"/>
     <package name="runc"/>
-    <package name="salt"/>
     <package name="sed"/>
     <package name="sg3_utils"/>
     <package name="shadow"/>
@@ -391,7 +361,6 @@
     <package name="socat"/>
     <package name="sudo"/>
     <package name="supportutils"/>
-    <package name="suse-build-key"/>
     <package name="suse-module-tools"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>