diff --git a/dvd.group b/dvd.group
index bf4d0ff5..4ff8605c 100644
--- a/dvd.group
+++ b/dvd.group
@@ -4461,12 +4461,14 @@
     <package name="yast2-auth-client" supportstatus="unsupported"/> <!-- reason: dvd:patterns-yast-yast2_server -->
     <package name="yast2-auth-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-yast-yast2_server -->
     <package name="yast2-bootloader" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="yast2-configuration-management" supportstatus="unsupported"/> <!-- reason: dvd:yast2-firstboot -->
     <package name="yast2-control-center" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_yast -->
     <package name="yast2-control-center-qt" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_yast -->
     <package name="yast2-core" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_yast -->
     <package name="yast2-country" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="yast2-country-data" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="yast2-firewall" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="yast2-firstboot" supportstatus="unsupported"/> <!-- reason: dvd:yast2-firstboot -->
     <package name="yast2-ftp-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="yast2-hardware-detection" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_yast -->
     <package name="yast2-installation" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 72a8d1f2..780bab82 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -4513,12 +4513,14 @@
       <repopackage name="yast2-auth-client"/>
       <repopackage name="yast2-auth-server"/>
       <repopackage name="yast2-bootloader"/>
+      <repopackage name="yast2-configuration-management"/>
       <repopackage name="yast2-control-center"/>
       <repopackage name="yast2-control-center-qt"/>
       <repopackage name="yast2-core"/>
       <repopackage name="yast2-country"/>
       <repopackage name="yast2-country-data"/>
       <repopackage name="yast2-firewall"/>
+      <repopackage name="yast2-firstboot"/>
       <repopackage name="yast2-ftp-server"/>
       <repopackage name="yast2-hardware-detection"/>
       <repopackage name="yast2-installation"/>
diff --git a/unsorted.yml b/unsorted.yml
index 7bfea324..dabaa6fd 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -50902,14 +50902,12 @@ unsorted:
   - yast2-buildtools 
   - yast2-caasp 
   - yast2-cluster 
-  - yast2-configuration-management 
   - yast2-core-devel 
   - yast2-devtools 
   - yast2-dns-manager 
   - yast2-docker 
   - yast2-drbd 
   - yast2-fcoe-client 
-  - yast2-firstboot 
   - yast2-firstboot-wsl 
   - yast2-geo-cluster 
   - yast2-gpmc