diff --git a/groups.yml b/groups.yml
index 934de3f..be2ae91 100644
--- a/groups.yml
+++ b/groups.yml
@@ -197,7 +197,7 @@ dvd:
   - java-12-openjdk-headless
   - lifecycle-data-openSUSE
   - lttng-modules
-  - mokutil
+  - mokutil: [x86_64]
   - mtd-utils
   - nut
   - nut-cgi
@@ -232,14 +232,13 @@ dvd:
 
 opensuse_kubic:
   - dummy-release: [locked]
-  - kernel-vanilla-base: [silent]
   - openSUSE-Tumbleweed-Kubic-release
   - kernel-default
-  - 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
+  - patterns-caasp-MicroOS: [x86_64]
+  - patterns-caasp-kubeadm: [x86_64]
+  - patterns-caasp-onlyDVD: [x86_64]
+  - patterns-caasp-alt-onlyDVD: [x86_64]
+  - patterns-caasp-container-runtime-config: [x86_64]
+  - podman-cni-config: [x86_64]
+  - docker-kubic-kubeadm-criconfig: [x86_64]
+  - kernel-default-base: [x86_64]
diff --git a/openSUSE-Tumbleweed-Kubic.product.in b/openSUSE-Tumbleweed-Kubic.product.in
index 7b03f28..36ea9ed 100644
--- a/openSUSE-Tumbleweed-Kubic.product.in
+++ b/openSUSE-Tumbleweed-Kubic.product.in
@@ -75,6 +75,7 @@
         <package name="skelcd-openSUSE"/>
       </metadata>
       <use group="opensuse_kubic" create_pattern="false"/>
+      <use group="opensuse_kubic.x86_64" create_pattern="false"/>
     </media>
   </mediasets>
 
diff --git a/openSUSE.product.in b/openSUSE.product.in
index 407c478..6f168f7 100644
--- a/openSUSE.product.in
+++ b/openSUSE.product.in
@@ -137,6 +137,8 @@
            run_media_check="true" use_required="true" use_recommended="true" use_suggested="false">
 
       <use group="dvd" create_pattern="false"/>
+      <use group="dvd.i586" create_pattern="false"/>
+      <use group="dvd.x86_64" create_pattern="false"/>
 
       <archsets>
         <!-- for this we generate a medium -->