diff --git a/dvd.group b/dvd.group
index 48fb45c9..deb01fe5 100644
--- a/dvd.group
+++ b/dvd.group
@@ -1279,6 +1279,7 @@
     <package name="kqtquickcharts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_edutainment -->
     <package name="kquickcharts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="krb5" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="krb5-client" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="krename" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="kreversi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="kreversi-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -5057,7 +5058,9 @@
     <package name="libpng12-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="nodejs10" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="npm10" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <!-- openafs-client uninstallable: nothing provides kernel-uname-r = 5.10.16-1-default needed by openafs-kmp-default-1.8.7_k5.10.16_1-4.1.i586-->
+    <package name="openafs" supportstatus="unsupported"/> <!-- reason: dvd:openafs-client -->
+    <package name="openafs-client" supportstatus="unsupported"/> <!-- reason: dvd:openafs-client -->
+    <package name="openafs-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:openafs-client -->
   </packagelist>
 </group>
 <group name="dvd.x86_64">
@@ -5121,7 +5124,6 @@
     <package name="jhbuild" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="jhbuild-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="krb5-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="krb5-client" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="krdc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="krdc-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="krfb" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 75b5d95b..b8eee1e3 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -1284,6 +1284,7 @@
       <repopackage name="kqtquickcharts"/>
       <repopackage name="kquickcharts"/>
       <repopackage name="krb5"/>
+      <repopackage name="krb5-client"/>
       <repopackage name="krename"/>
       <repopackage name="kreversi"/>
       <repopackage name="kreversi-lang"/>
@@ -3215,6 +3216,9 @@
       <repopackage name="open-iscsi"/>
       <repopackage name="open-vm-tools"/>
       <repopackage name="open-vm-tools-desktop"/>
+      <repopackage name="openafs" arch="i586,i686"/>
+      <repopackage name="openafs-client" arch="i586,i686"/>
+      <repopackage name="openafs-kmp-default" arch="i586,i686"/>
       <repopackage name="openal-soft-data"/>
       <repopackage name="opencc-data"/>
       <repopackage name="openconnect"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index f37a851e..4a1f07dd 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1340,7 +1340,7 @@
       <repopackage name="kquickcharts"/>
       <repopackage name="krb5"/>
       <repopackage name="krb5-32bit" arch="x86_64"/>
-      <repopackage name="krb5-client" arch="x86_64"/>
+      <repopackage name="krb5-client"/>
       <repopackage name="krdc" arch="x86_64"/>
       <repopackage name="krdc-lang" arch="x86_64"/>
       <repopackage name="krename"/>
diff --git a/unsorted.yml b/unsorted.yml
index c4b4bfc3..fa08a4a9 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -7913,7 +7913,6 @@ unsorted:
   - kraft 
   - krb5-auth-dialog 
   - krb5-auth-dialog-lang 
-  - krb5-client: [i586] 
   - krb5-devel 
   - krb5-devel-32bit: [x86_64] 
   - krb5-mini 
@@ -17437,14 +17436,14 @@ unsorted:
   - openSUSE-release-usb-kde 
   - openSUSE-release-usb-x11 
   - openSUSEway 
-  - openafs 
+  - openafs: [x86_64] 
   - openafs-authlibs 
   - openafs-authlibs-devel 
-  - openafs-client 
+  - openafs-client: [x86_64] 
   - openafs-devel 
   - openafs-fuse_client 
   - openafs-kernel-source 
-  - openafs-kmp-default 
+  - openafs-kmp-default: [x86_64] 
   - openafs-server 
   - openal-soft-devel 
   - openal-soft-devel-32bit: [x86_64]