diff --git a/groups.yml b/groups.yml
index 1b30412..934de3f 100644
--- a/groups.yml
+++ b/groups.yml
@@ -238,3 +238,8 @@ opensuse_kubic:
   - patterns-caasp-MicroOS
   - patterns-caasp-kubeadm
   - patterns-caasp-onlyDVD
+  - patterns-caasp-alt-onlyDVD
+  - patterns-caasp-container-runtime-config
+  - podman-cni-config
+  - docker-kubic-kubeadm-criconfig
+  - kernel-default-base
diff --git a/i686_kernel_ftp.group b/i686_kernel_ftp.group
new file mode 100644
index 0000000..55014b1
--- /dev/null
+++ b/i686_kernel_ftp.group
@@ -0,0 +1,22 @@
+
+<group name="i686_kernels_ftp">
+ <conditional name="i686_special" />
+ <packagelist relationship="requires">
+  <package name="kernel-debug-base"/>
+  <package name="kernel-debug-devel"/>
+  <package name="kernel-debug"/>
+<!--
+  <package name="kernel-ec2-base"/>
+  <package name="kernel-ec2-devel"/>
+  <package name="kernel-ec2"/>
+-->
+  <package name="kernel-vanilla-devel"/>
+  <package name="kernel-vanilla"/>
+<!--
+  <package name="kernel-xen-base"/>
+  <package name="kernel-xen-devel"/>
+  <package name="kernel-xen"/>
+-->
+ </packagelist>
+</group>
+
diff --git a/i686_list.group b/i686_list.group
new file mode 100644
index 0000000..462787c
--- /dev/null
+++ b/i686_list.group
@@ -0,0 +1,21 @@
+
+<group name="i586_additional">
+ <conditional name="i586_special" />
+ <packagelist relationship="requires">
+  <package name="glibc-devel" />
+  <package name="glibc" />
+ </packagelist>
+</group>
+
+<group name="i686_packages">
+  <conditional name="i686_replacement" />
+  <packagelist relationship="requires">
+    <package name="MozillaFirefox" />
+    <package name="MozillaFirefox-devel" />
+    <package name="MozillaFirefox-buildsymbols" />
+    <package name="MozillaFirefox-translations-common" />
+    <package name="MozillaFirefox-translations-other" />
+  </packagelist>
+</group>
+
+
diff --git a/openSUSE.product.in b/openSUSE.product.in
index e7efa38..407c478 100644
--- a/openSUSE.product.in
+++ b/openSUSE.product.in
@@ -83,7 +83,6 @@
   <repositories>
     <repository path="obs://openSUSE:Factory/standard"/>
     <repository path="obs://openSUSE:Factory:Live/standard"/>
-    <repository path="obs://openSUSE:Factory:Containers/container"/>
   </repositories>
 
   <xi:include href="defaults-archsets.include"/>
@@ -111,6 +110,10 @@
         <!-- package name="yast2-slide-show" / -->
       </metadata>
       <use group="NON_FTP_PACKAGES" create_pattern="false"/>
+      <use group="i586_additional" create_pattern="false" />
+      <use group="i686_packages" create_pattern="false" />
+      <use group="i686_kernels_ftp" create_pattern="false" />
+      <use group="kernel_pae_special" create_pattern="false" />
     </media>
 
     <!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! -->
@@ -180,13 +183,9 @@
 
   <xi:include href="NON_FTP_PACKAGES.group"/>
   <xi:include href="dvd.group"/>
+  <xi:include href="i686_list.group" />
+  <xi:include href="i686_kernel_ftp.group" />
 
-  <group name="drop_from_dvd9">
-    <conditional name="drop_from_medium"/>
-    <packagelist>
-      <package name="openSUSE-release-dvd"/>
-    </packagelist>
-  </group>
   <group name="kernel_pae_special">
     <conditional name="only_i686"/>
     <packagelist relationship="requires">