diff --git a/DVD5-x86_64.group b/DVD5-x86_64.group
index b6c071eb..ef4e7485 100644
--- a/DVD5-x86_64.group
+++ b/DVD5-x86_64.group
@@ -913,8 +913,6 @@
     <package name="gstreamer-transcoder"/>
     <package name="gstreamer-utils"/>
     <package name="gstreamer-validate"/>
-    <package name="gtg"/>
-    <package name="gtg-lang"/>
     <package name="gthumb"/>
     <package name="gthumb-lang"/>
     <package name="gtk-vnc-lang"/>
@@ -2592,6 +2590,8 @@
     <package name="libnfnetlink0"/>
     <package name="libnfs11"/>
     <package name="libnfsidmap-sss"/>
+    <package name="libnftables0"/>
+    <package name="libnftnl7"/>
     <package name="libnghttp2-14"/>
     <package name="libnice10"/>
     <package name="libnl-config"/>
@@ -3459,6 +3459,7 @@
     <package name="nfs-doc"/>
     <package name="nfs-kernel-server"/>
     <package name="nfsidmap"/>
+    <package name="nftables"/>
     <package name="nkf"/>
     <package name="nma-data"/>
     <package name="nmap"/>
@@ -4165,9 +4166,6 @@
     <package name="python-gobject2"/>
     <package name="python-gtk"/>
     <package name="python-ipaddress"/>
-    <package name="python-liblarch"/>
-    <package name="python-liblarch_gtk"/>
-    <package name="python-notify"/>
     <package name="python-qt5-utils"/>
     <package name="python-rpm-macros"/>
     <package name="python-sip-common"/>
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 b0ef9048..fc8b3f60 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
@@ -81,8 +81,6 @@
       <repopackage name="btrfsprogs-udev-rules"/>
       <repopackage name="ca-certificates"/>
       <repopackage name="ca-certificates-mozilla"/>
-      <repopackage name="caasp-cli"/>
-      <repopackage name="caasp-container-manifests"/>
       <repopackage name="caasp-container-manifests"/>
       <repopackage name="caasp-tools"/>
       <repopackage name="catatonit"/>
@@ -92,8 +90,6 @@
       <repopackage name="cloud-init-config-caasp"/>
       <repopackage name="cni"/>
       <repopackage name="cni-plugins"/>
-      <repopackage name="conntrack-tools"/>
-      <repopackage name="container-feeder"/>
       <repopackage name="containerd-kubic"/>
       <repopackage name="coreutils"/>
       <repopackage name="coreutils"/>
@@ -123,11 +119,10 @@
       <repopackage name="dracut"/>
       <repopackage name="dracut-ima"/>
       <repopackage name="e2fsprogs"/>
+      <repopackage name="ebtables"/>
       <repopackage name="efibootmgr"/>
       <repopackage name="elfutils"/>
       <repopackage name="elfutils"/>
-      <repopackage name="etcd"/>
-      <repopackage name="etcdctl"/>
       <repopackage name="ethtool"/>
       <repopackage name="evmctl"/>
       <repopackage name="fcoe-utils"/>
@@ -170,7 +165,6 @@
       <repopackage name="haveged"/>
       <repopackage name="health-checker"/>
       <repopackage name="health-checker-plugins-caasp"/>
-      <repopackage name="helm"/>
       <repopackage name="hostname"/>
       <repopackage name="hostname"/>
       <repopackage name="hwinfo"/>
@@ -203,39 +197,23 @@
       <repopackage name="krb5"/>
       <repopackage name="kubernetes-client"/>
       <repopackage name="kubernetes-common"/>
+      <repopackage name="kubernetes-kubeadm"/>
       <repopackage name="kubernetes-kubelet"/>
-      <repopackage name="kubernetes-master"/>
-      <repopackage name="kubernetes-node"/>
       <repopackage name="kubernetes-salt"/>
       <repopackage name="kubic-caasp-dex-image"/>
-      <repopackage name="kubic-caasp-dex-image"/>
-      <repopackage name="kubic-dnsmasq-nanny-image"/>
       <repopackage name="kubic-dnsmasq-nanny-image"/>
       <repopackage name="kubic-flannel-image"/>
-      <repopackage name="kubic-flannel-image"/>
       <repopackage name="kubic-haproxy-image"/>
-      <repopackage name="kubic-haproxy-image"/>
-      <repopackage name="kubic-kubedns-image"/>
       <repopackage name="kubic-kubedns-image"/>
       <repopackage name="kubic-locale-archive"/>
       <repopackage name="kubic-mariadb-image"/>
-      <repopackage name="kubic-mariadb-image"/>
       <repopackage name="kubic-openldap-image"/>
-      <repopackage name="kubic-openldap-image"/>
-      <repopackage name="kubic-pause-image"/>
-      <repopackage name="kubic-pv-recycler-node-image"/>
       <repopackage name="kubic-pv-recycler-node-image"/>
       <repopackage name="kubic-salt-api-image"/>
-      <repopackage name="kubic-salt-api-image"/>
-      <repopackage name="kubic-salt-master-image"/>
       <repopackage name="kubic-salt-master-image"/>
       <repopackage name="kubic-salt-minion-image"/>
-      <repopackage name="kubic-salt-minion-image"/>
-      <repopackage name="kubic-sidecar-image"/>
       <repopackage name="kubic-sidecar-image"/>
       <repopackage name="kubic-tiller-image"/>
-      <repopackage name="kubic-tiller-image"/>
-      <repopackage name="kubic-velum-image"/>
       <repopackage name="kubic-velum-image"/>
       <repopackage name="less"/>
       <repopackage name="libacl1"/>
@@ -386,8 +364,6 @@
       <repopackage name="libncurses6"/>
       <repopackage name="libncurses6"/>
       <repopackage name="libnetfilter_conntrack3"/>
-      <repopackage name="libnetfilter_cthelper0"/>
-      <repopackage name="libnetfilter_cttimeout1"/>
       <repopackage name="libnettle6"/>
       <repopackage name="libnfnetlink0"/>
       <repopackage name="libnghttp2-14"/>
@@ -548,13 +524,12 @@
       <repopackage name="pam-config"/>
       <repopackage name="parted"/>
       <repopackage name="patterns-caasp-apparmor"/>
-      <repopackage name="patterns-caasp-container-runtime"/>
       <repopackage name="patterns-caasp-hardware"/>
       <repopackage name="patterns-caasp-ima_evm"/>
+      <repopackage name="patterns-caasp-kubeadm"/>
       <repopackage name="patterns-caasp-MicroOS"/>
       <repopackage name="patterns-caasp-onlyDVD"/>
       <repopackage name="patterns-caasp-sssd-ldap"/>
-      <repopackage name="patterns-caasp-Stack"/>
       <repopackage name="pciutils"/>
       <repopackage name="pciutils-ids"/>
       <repopackage name="perl"/>
@@ -644,8 +619,6 @@
       <repopackage name="rsyslog"/>
       <repopackage name="runc"/>
       <repopackage name="salt"/>
-      <repopackage name="salt-minion"/>
-      <repopackage name="screen"/>
       <repopackage name="sed"/>
       <repopackage name="sed"/>
       <repopackage name="sg3_utils"/>
@@ -704,7 +677,6 @@
       <repopackage name="util-linux"/>
       <repopackage name="util-linux"/>
       <repopackage name="util-linux-systemd"/>
-      <repopackage name="velum-branding"/>
       <repopackage name="vim"/>
       <repopackage name="vim-data-common"/>
       <repopackage name="vlan"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
index 97267eaf..8508239e 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -918,8 +918,6 @@
       <repopackage name="gstreamer-transcoder" arch="x86_64"/>
       <repopackage name="gstreamer-utils" arch="x86_64"/>
       <repopackage name="gstreamer-validate" arch="x86_64"/>
-      <repopackage name="gtg" arch="x86_64"/>
-      <repopackage name="gtg-lang" arch="x86_64"/>
       <repopackage name="gthumb" arch="x86_64"/>
       <repopackage name="gthumb-lang" arch="x86_64"/>
       <repopackage name="gtk-vnc-lang" arch="x86_64"/>
@@ -2485,6 +2483,8 @@
       <repopackage name="libnfnetlink0" arch="x86_64"/>
       <repopackage name="libnfs11" arch="x86_64"/>
       <repopackage name="libnfsidmap-sss" arch="x86_64"/>
+      <repopackage name="libnftables0" arch="x86_64"/>
+      <repopackage name="libnftnl7" arch="x86_64"/>
       <repopackage name="libnghttp2-14" arch="x86_64"/>
       <repopackage name="libnice10" arch="x86_64"/>
       <repopackage name="libnl-config" arch="x86_64"/>
@@ -3502,6 +3502,7 @@
       <repopackage name="nfs-doc" arch="x86_64"/>
       <repopackage name="nfs-kernel-server" arch="x86_64"/>
       <repopackage name="nfsidmap" arch="x86_64"/>
+      <repopackage name="nftables" arch="x86_64"/>
       <repopackage name="nkf" arch="x86_64"/>
       <repopackage name="nma-data" arch="x86_64"/>
       <repopackage name="nmap" arch="x86_64"/>
@@ -4218,9 +4219,6 @@
       <repopackage name="python-gobject2" arch="x86_64"/>
       <repopackage name="python-gtk" arch="x86_64"/>
       <repopackage name="python-ipaddress" arch="x86_64"/>
-      <repopackage name="python-liblarch" arch="x86_64"/>
-      <repopackage name="python-liblarch_gtk" arch="x86_64"/>
-      <repopackage name="python-notify" arch="x86_64"/>
       <repopackage name="python-qt5-utils" arch="x86_64"/>
       <repopackage name="python-rpm-macros" arch="x86_64"/>
       <repopackage name="python-sip-common" arch="x86_64"/>
diff --git a/openSUSE-Kubic.group b/openSUSE-Kubic.group
index 7402989a..95701108 100644
--- a/openSUSE-Kubic.group
+++ b/openSUSE-Kubic.group
@@ -18,8 +18,6 @@
     <package name="btrfsprogs-udev-rules"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="caasp-cli"/>
-    <package name="caasp-container-manifests"/>
     <package name="caasp-tools"/>
     <package name="catatonit"/>
     <package name="ceph-common"/>
@@ -28,8 +26,6 @@
     <package name="cloud-init-config-caasp"/>
     <package name="cni"/>
     <package name="cni-plugins"/>
-    <package name="conntrack-tools"/>
-    <package name="container-feeder"/>
     <package name="containerd-kubic"/>
     <package name="coreutils"/>
     <package name="cpio"/>
@@ -49,10 +45,9 @@
     <package name="dosfstools"/>
     <package name="dracut"/>
     <package name="e2fsprogs"/>
+    <package name="ebtables"/>
     <package name="efibootmgr"/>
     <package name="elfutils"/>
-    <package name="etcd"/>
-    <package name="etcdctl"/>
     <package name="ethtool"/>
     <package name="fcoe-utils"/>
     <package name="file"/>
@@ -83,7 +78,6 @@
     <package name="haveged"/>
     <package name="health-checker"/>
     <package name="health-checker-plugins-caasp"/>
-    <package name="helm"/>
     <package name="hostname"/>
     <package name="hwinfo"/>
     <package name="info"/>
@@ -104,26 +98,10 @@
     <package name="krb5"/>
     <package name="kubernetes-client"/>
     <package name="kubernetes-common"/>
+    <package name="kubernetes-kubeadm"/>
     <package name="kubernetes-kubelet"/>
-    <package name="kubernetes-master"/>
-    <package name="kubernetes-node"/>
     <package name="kubernetes-salt"/>
-    <package name="kubic-caasp-dex-image"/>
-    <package name="kubic-dnsmasq-nanny-image"/>
-    <package name="kubic-flannel-image"/>
-    <package name="kubic-haproxy-image"/>
-    <package name="kubic-kubedns-image"/>
     <package name="kubic-locale-archive"/>
-    <package name="kubic-mariadb-image"/>
-    <package name="kubic-openldap-image"/>
-    <package name="kubic-pause-image"/>
-    <package name="kubic-pv-recycler-node-image"/>
-    <package name="kubic-salt-api-image"/>
-    <package name="kubic-salt-master-image"/>
-    <package name="kubic-salt-minion-image"/>
-    <package name="kubic-sidecar-image"/>
-    <package name="kubic-tiller-image"/>
-    <package name="kubic-velum-image"/>
     <package name="less"/>
     <package name="libacl1"/>
     <package name="libaio1"/>
@@ -218,8 +196,6 @@
     <package name="libmount1"/>
     <package name="libncurses6"/>
     <package name="libnetfilter_conntrack3"/>
-    <package name="libnetfilter_cthelper0"/>
-    <package name="libnetfilter_cttimeout1"/>
     <package name="libnettle6"/>
     <package name="libnfnetlink0"/>
     <package name="libnghttp2-14"/>
@@ -327,8 +303,7 @@
     <package name="pam-config"/>
     <package name="parted"/>
     <package name="patterns-caasp-MicroOS"/>
-    <package name="patterns-caasp-Stack"/>
-    <package name="patterns-caasp-container-runtime"/>
+    <package name="patterns-caasp-kubeadm"/>
     <package name="pciutils"/>
     <package name="pciutils-ids"/>
     <package name="perl"/>
@@ -406,8 +381,6 @@
     <package name="rsyslog"/>
     <package name="runc"/>
     <package name="salt"/>
-    <package name="salt-minion"/>
-    <package name="screen"/>
     <package name="sed"/>
     <package name="sg3_utils"/>
     <package name="shadow"/>
@@ -443,7 +416,6 @@
     <package name="update-alternatives"/>
     <package name="util-linux"/>
     <package name="util-linux-systemd"/>
-    <package name="velum-branding"/>
     <package name="vim"/>
     <package name="vim-data-common"/>
     <package name="vlan"/>