diff --git a/dvd.group b/dvd.group
index 5ec90a6b..55bac224 100644
--- a/dvd.group
+++ b/dvd.group
@@ -306,7 +306,6 @@
     <package name="cpio-mt" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="cpp" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="cpp11" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="cpp12" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="cppcheck" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="cpupower" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="cpupower-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
@@ -528,9 +527,6 @@
     <package name="gcc11" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="gcc11-info" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="gcc11-locale" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
-    <package name="gcc12" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
-    <package name="gcc12-info" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
-    <package name="gcc12-locale" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="gcin" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="gcin-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="gcin-gtk2" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
@@ -1605,7 +1601,6 @@
     <package name="libargon2-1" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
     <package name="libaria2-0" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="libasan6" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
-    <package name="libasan8" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="libasm1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libasound2" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libass9" supportstatus="unsupported"/> <!-- reason: dvd:grub2 -->
@@ -1905,7 +1900,7 @@
     <package name="libgc1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="libgcab-1_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libgcc_s1" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
-    <package name="libgccjit0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
+    <package name="libgccjit0-gcc11" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="libgcin-im-client1" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libgck-1-0" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="libgck-modules-gnome-keyring" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5254,7 +5249,6 @@
     <package name="libtirpc3-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libtool" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
     <package name="libtsan0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
-    <package name="libtsan2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="libudev1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libunistring2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libuuid-devel" supportstatus="unsupported"/> <!-- reason: common_locks:expansion -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 035bd367..532010b4 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -303,7 +303,6 @@
       <repopackage name="cpio-mt"/>
       <repopackage name="cpp"/>
       <repopackage name="cpp11"/>
-      <repopackage name="cpp12"/>
       <repopackage name="cppcheck"/>
       <repopackage name="cpupower"/>
       <repopackage name="cpupower-lang"/>
@@ -524,9 +523,6 @@
       <repopackage name="gcc11"/>
       <repopackage name="gcc11-info"/>
       <repopackage name="gcc11-locale"/>
-      <repopackage name="gcc12"/>
-      <repopackage name="gcc12-info"/>
-      <repopackage name="gcc12-locale"/>
       <repopackage name="gcin"/>
       <repopackage name="gcin-branding-openSUSE"/>
       <repopackage name="gcin-gtk2"/>
@@ -1331,7 +1327,6 @@
       <repopackage name="libargon2-1"/>
       <repopackage name="libaria2-0"/>
       <repopackage name="libasan6"/>
-      <repopackage name="libasan8"/>
       <repopackage name="libasm1"/>
       <repopackage name="libasound2"/>
       <repopackage name="libass9"/>
@@ -1634,7 +1629,7 @@
       <repopackage name="libgc1"/>
       <repopackage name="libgcab-1_0-0"/>
       <repopackage name="libgcc_s1"/>
-      <repopackage name="libgccjit0"/>
+      <repopackage name="libgccjit0-gcc11"/>
       <repopackage name="libgcin-im-client1"/>
       <repopackage name="libgck-1-0"/>
       <repopackage name="libgck-modules-gnome-keyring"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index d6f7841f..a844e59b 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -320,7 +320,6 @@
       <repopackage name="cpio-mt"/>
       <repopackage name="cpp"/>
       <repopackage name="cpp11"/>
-      <repopackage name="cpp12"/>
       <repopackage name="cppcheck"/>
       <repopackage name="cpupower"/>
       <repopackage name="cpupower-lang"/>
@@ -556,9 +555,6 @@
       <repopackage name="gcc11"/>
       <repopackage name="gcc11-info"/>
       <repopackage name="gcc11-locale"/>
-      <repopackage name="gcc12"/>
-      <repopackage name="gcc12-info"/>
-      <repopackage name="gcc12-locale"/>
       <repopackage name="gcin"/>
       <repopackage name="gcin-branding-openSUSE"/>
       <repopackage name="gcin-gtk2"/>
@@ -1389,7 +1385,6 @@
       <repopackage name="libargon2-1-32bit" arch="x86_64"/>
       <repopackage name="libaria2-0"/>
       <repopackage name="libasan6"/>
-      <repopackage name="libasan8"/>
       <repopackage name="libasm1"/>
       <repopackage name="libasound2"/>
       <repopackage name="libasound2-32bit" arch="x86_64"/>
@@ -1742,7 +1737,7 @@
       <repopackage name="libgcab-1_0-0"/>
       <repopackage name="libgcc_s1"/>
       <repopackage name="libgcc_s1-32bit" arch="x86_64"/>
-      <repopackage name="libgccjit0"/>
+      <repopackage name="libgccjit0-gcc11"/>
       <repopackage name="libgcin-im-client1"/>
       <repopackage name="libgck-1-0"/>
       <repopackage name="libgck-modules-gnome-keyring"/>
@@ -2827,7 +2822,6 @@
       <repopackage name="libtre5"/>
       <repopackage name="libts0"/>
       <repopackage name="libtsan0" arch="x86_64"/>
-      <repopackage name="libtsan2" arch="x86_64"/>
       <repopackage name="libtss2-esys0"/>
       <repopackage name="libtss2-mu0"/>
       <repopackage name="libtss2-rc0"/>
diff --git a/unsorted.yml b/unsorted.yml
index 011f7860..ff900e84 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -2346,6 +2346,7 @@ unsorted:
   - cpluff 
   - cpmono_v07-fonts 
   - cpp10 
+  - cpp12 
   - cpp7 
   - cppcheck-gui 
   - cpphs: [x86_64] 
@@ -4174,6 +4175,7 @@ unsorted:
   - gcc11-objc 
   - gcc11-objc-32bit: [x86_64] 
   - gcc11-testresults 
+  - gcc12 
   - gcc12-32bit: [x86_64] 
   - gcc12-PIE 
   - gcc12-ada 
@@ -4187,6 +4189,8 @@ unsorted:
   - gcc12-fortran-32bit: [x86_64] 
   - gcc12-go 
   - gcc12-go-32bit: [x86_64] 
+  - gcc12-info 
+  - gcc12-locale 
   - gcc12-obj-c++ 
   - gcc12-obj-c++-32bit: [x86_64] 
   - gcc12-objc 
@@ -9741,6 +9745,7 @@ unsorted:
   - libasan6-32bit: [x86_64] 
   - libasan6-gcc10 
   - libasan6-gcc10-32bit: [x86_64] 
+  - libasan8 
   - libasan8-32bit: [x86_64] 
   - libasm-devel 
   - libasm1-32bit: [x86_64] 
@@ -11029,9 +11034,9 @@ unsorted:
   - libgcc_s1-gcc7 
   - libgcc_s1-gcc7-32bit: [x86_64] 
   - libgccjit-devel 
+  - libgccjit0 
   - libgccjit0-devel-gcc11 
   - libgccjit0-devel-gcc12 
-  - libgccjit0-gcc11 
   - libgci-1-0_0_0 
   - libgcin-im-client1-32bit: [x86_64] 
   - libgck-1-0-32bit: [x86_64] 
@@ -14317,6 +14322,7 @@ unsorted:
   - libts0-32bit: [x86_64] 
   - libtsan0-gcc10: [x86_64] 
   - libtsan0-gcc7: [x86_64] 
+  - libtsan2: [x86_64] 
   - libtsk19 
   - libtsm-devel 
   - libtsm4