From b9841ade9759508a4270143802e0fd993faf96b93e798ce700e16d7d8b474098 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 13 Feb 2024 11:09:44 +0000
Subject: [PATCH] Accepting request 1146371 from
 home:favogt:branches:openSUSE:Factory:Live

- Switch to kiwi schema v7.4:
  * Remove hybrid="true"
  * Switch from <package replaces="..."/> to <!-- OBS-IgnorePackage: ... -->

OBS-URL: https://build.opensuse.org/request/show/1146371
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=163
---
 livecd-leap-gnome.kiwi       | 432 ++++++++++++++++-----------------
 livecd-leap-kde.kiwi         | 388 +++++++++++++++---------------
 livecd-leap-x11.kiwi         | 446 +++++++++++++++++-----------------
 livecd-leap-xfce.kiwi        | 354 +++++++++++++--------------
 livecd-openSUSE.changes      |   7 +
 livecd-tumbleweed-gnome.kiwi | 430 ++++++++++++++++-----------------
 livecd-tumbleweed-kde.kiwi   | 388 +++++++++++++++---------------
 livecd-tumbleweed-x11.kiwi   | 448 +++++++++++++++++------------------
 livecd-tumbleweed-xfce.kiwi  | 352 +++++++++++++--------------
 livecd.kiwi.in               |   6 +-
 pre-checkin.sh               |   9 +-
 11 files changed, 1631 insertions(+), 1629 deletions(-)

diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 37de208..df91a6e 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-GNOME-Live" displayname="openSUSE Leap %OS_VERSION_ID% GNOME Live">
+<image schemaversion="7.4" name="openSUSE-Leap-%OS_VERSION_ID%-GNOME-Live" displayname="openSUSE Leap %OS_VERSION_ID% GNOME Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -57,289 +57,289 @@
     <archive name="livecd-udev.tar.xz"/>
     
     <!-- list-common.sh -->
-    <package name="aaa_base" replaces="poppler-data"/>
+    <!-- OBS-IgnorePackage: poppler-data -->
     <ignore name="poppler-data"/>
-    <package name="aaa_base" replaces="tin"/>
+    <!-- OBS-IgnorePackage: tin -->
     <ignore name="tin"/>
-    <package name="aaa_base" replaces="desktop-translations"/>
+    <!-- OBS-IgnorePackage: desktop-translations -->
     <ignore name="desktop-translations"/>
-    <package name="aaa_base" replaces="ft2demos"/>
+    <!-- OBS-IgnorePackage: ft2demos -->
     <ignore name="ft2demos"/>
-    <package name="aaa_base" replaces="gimp-help"/>
+    <!-- OBS-IgnorePackage: gimp-help -->
     <ignore name="gimp-help"/>
-    <package name="aaa_base" replaces="gimp-lang"/>
+    <!-- OBS-IgnorePackage: gimp-lang -->
     <ignore name="gimp-lang"/>
-    <package name="aaa_base" replaces="libreoffice-base"/>
+    <!-- OBS-IgnorePackage: libreoffice-base -->
     <ignore name="libreoffice-base"/>
-    <package name="aaa_base" replaces="libreoffice-mailmerge"/>
+    <!-- OBS-IgnorePackage: libreoffice-mailmerge -->
     <ignore name="libreoffice-mailmerge"/>
-    <package name="aaa_base" replaces="libreoffice-math"/>
+    <!-- OBS-IgnorePackage: libreoffice-math -->
     <ignore name="libreoffice-math"/>
-    <package name="aaa_base" replaces="libreoffice-filters-optional"/>
+    <!-- OBS-IgnorePackage: libreoffice-filters-optional -->
     <ignore name="libreoffice-filters-optional"/>
-    <package name="aaa_base" replaces="libreoffice-pyuno"/>
+    <!-- OBS-IgnorePackage: libreoffice-pyuno -->
     <ignore name="libreoffice-pyuno"/>
-    <package name="aaa_base" replaces="readline-doc"/>
+    <!-- OBS-IgnorePackage: readline-doc -->
     <ignore name="readline-doc"/>
-    <package name="aaa_base" replaces="graphviz"/>
+    <!-- OBS-IgnorePackage: graphviz -->
     <ignore name="graphviz"/>
-    <package name="aaa_base" replaces="linux-kernel-headers"/>
+    <!-- OBS-IgnorePackage: linux-kernel-headers -->
     <ignore name="linux-kernel-headers"/>
-    <package name="aaa_base" replaces="bash-doc"/>
+    <!-- OBS-IgnorePackage: bash-doc -->
     <ignore name="bash-doc"/>
-    <package name="aaa_base" replaces="gimp-plugins-python"/>
+    <!-- OBS-IgnorePackage: gimp-plugins-python -->
     <ignore name="gimp-plugins-python"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_basis_opt -->
     <ignore name="patterns-openSUSE-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_admin -->
     <ignore name="patterns-openSUSE-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_multimedia_opt -->
     <ignore name="patterns-openSUSE-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_imaging_opt -->
     <ignore name="patterns-openSUSE-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_office_opt -->
     <ignore name="patterns-openSUSE-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-apparmor_opt -->
     <ignore name="patterns-openSUSE-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-enhanced_base_opt -->
     <ignore name="patterns-openSUSE-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-fonts_opt -->
     <ignore name="patterns-openSUSE-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-imaging_opt -->
     <ignore name="patterns-openSUSE-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-kde_utilities_opt -->
     <ignore name="patterns-openSUSE-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-multimedia_opt -->
     <ignore name="patterns-openSUSE-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-office_opt -->
     <ignore name="patterns-openSUSE-office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-x11_opt -->
     <ignore name="patterns-openSUSE-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_basis_opt -->
     <ignore name="patterns-gnome-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-gmome-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-gmome-gnome_admin -->
     <ignore name="patterns-gmome-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_multimedia_opt -->
     <ignore name="patterns-gnome-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_imaging_opt -->
     <ignore name="patterns-gnome-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_office_opt -->
     <ignore name="patterns-gnome-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-apparmor_opt -->
     <ignore name="patterns-base-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-base-documentation"/>
+    <!-- OBS-IgnorePackage: patterns-base-documentation -->
     <ignore name="patterns-base-documentation"/>
-    <package name="aaa_base" replaces="patterns-base-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-enhanced_base_opt -->
     <ignore name="patterns-base-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-fonts-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-fonts-fonts_opt -->
     <ignore name="patterns-fonts-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-imaging_opt -->
     <ignore name="patterns-desktop-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_utilities_opt -->
     <ignore name="patterns-kde-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-multimedia_opt -->
     <ignore name="patterns-desktop-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-office-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-office-office_opt -->
     <ignore name="patterns-office-office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_opt -->
     <ignore name="patterns-base-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_enhanced"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_enhanced -->
     <ignore name="patterns-base-x11_enhanced"/>
-    <package name="aaa_base" replaces="make"/>
+    <!-- OBS-IgnorePackage: make -->
     <ignore name="make"/>
-    <package name="aaa_base" replaces="netpbm"/>
+    <!-- OBS-IgnorePackage: netpbm -->
     <ignore name="netpbm"/>
-    <package name="aaa_base" replaces="p7zip-full"/>
+    <!-- OBS-IgnorePackage: p7zip-full -->
     <ignore name="p7zip-full"/>
-    <package name="aaa_base" replaces="busybox-static"/>
+    <!-- OBS-IgnorePackage: busybox-static -->
     <ignore name="busybox-static"/>
-    <package name="aaa_base" replaces="inxi"/>
+    <!-- OBS-IgnorePackage: inxi -->
     <ignore name="inxi"/>
-    <package name="aaa_base" replaces="sane-backends"/>
+    <!-- OBS-IgnorePackage: sane-backends -->
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="aaa_base" replaces="glibc-32bit"/>
+    <!-- OBS-IgnorePackage: glibc-32bit -->
     <ignore name="glibc-32bit"/>
-    <package name="aaa_base" replaces="libvdpau_r300"/>
+    <!-- OBS-IgnorePackage: libvdpau_r300 -->
     <ignore name="libvdpau_r300"/>
-    <package name="aaa_base" replaces="libvdpau_radeonsi"/>
+    <!-- OBS-IgnorePackage: libvdpau_radeonsi -->
     <ignore name="libvdpau_radeonsi"/>
-    <package name="aaa_base" replaces="libvdpau_r600"/>
+    <!-- OBS-IgnorePackage: libvdpau_r600 -->
     <ignore name="libvdpau_r600"/>
-    <package name="aaa_base" replaces="pavucontrol"/>
+    <!-- OBS-IgnorePackage: pavucontrol -->
     <ignore name="pavucontrol"/>
-    <package name="aaa_base" replaces="libqmi-tools"/>
+    <!-- OBS-IgnorePackage: libqmi-tools -->
     <ignore name="libqmi-tools"/>
-    <package name="aaa_base" replaces="python*-pip"/>
+    <!-- OBS-IgnorePackage: python*-pip -->
     <ignore name="python*-pip"/>
-    <package name="aaa_base" replaces="multipath-tools-rbd"/>
+    <!-- OBS-IgnorePackage: multipath-tools-rbd -->
     <ignore name="multipath-tools-rbd"/>
-    <package name="aaa_base" replaces="acpica"/>
+    <!-- OBS-IgnorePackage: acpica -->
     <ignore name="acpica"/>
-    <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
+    <!-- OBS-IgnorePackage: xorg-x11-Xvnc -->
     <ignore name="xorg-x11-Xvnc"/>
-    <package name="aaa_base" replaces="cabextract"/>
+    <!-- OBS-IgnorePackage: cabextract -->
     <ignore name="cabextract"/>
-    <package name="aaa_base" replaces="sssd"/>
+    <!-- OBS-IgnorePackage: sssd -->
     <ignore name="sssd"/>
-    <package name="aaa_base" replaces="db-utils"/>
+    <!-- OBS-IgnorePackage: db-utils -->
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="dnsmasq"/>
+    <!-- OBS-IgnorePackage: dnsmasq -->
     <ignore name="dnsmasq"/>
-    <package name="aaa_base" replaces="fribidi"/>
+    <!-- OBS-IgnorePackage: fribidi -->
     <ignore name="fribidi"/>
-    <package name="aaa_base" replaces="ipmitool"/>
+    <!-- OBS-IgnorePackage: ipmitool -->
     <ignore name="ipmitool"/>
-    <package name="aaa_base" replaces="irda"/>
+    <!-- OBS-IgnorePackage: irda -->
     <ignore name="irda"/>
-    <package name="aaa_base" replaces="lomoco"/>
+    <!-- OBS-IgnorePackage: lomoco -->
     <ignore name="lomoco"/>
-    <package name="aaa_base" replaces="mksh"/>
+    <!-- OBS-IgnorePackage: mksh -->
     <ignore name="mksh"/>
-    <package name="aaa_base" replaces="cifs-utils"/>
+    <!-- OBS-IgnorePackage: cifs-utils -->
     <ignore name="cifs-utils"/>
-    <package name="aaa_base" replaces="gvfs-backend-samba"/>
+    <!-- OBS-IgnorePackage: gvfs-backend-samba -->
     <ignore name="gvfs-backend-samba"/>
-    <package name="aaa_base" replaces="xorg-x11"/>
+    <!-- OBS-IgnorePackage: xorg-x11 -->
     <ignore name="xorg-x11"/>
-    <package name="aaa_base" replaces="xorg-x11-essentials"/>
+    <!-- OBS-IgnorePackage: xorg-x11-essentials -->
     <ignore name="xorg-x11-essentials"/>
-    <package name="aaa_base" replaces="xorg-x11-server-extra"/>
+    <!-- OBS-IgnorePackage: xorg-x11-server-extra -->
     <ignore name="xorg-x11-server-extra"/>
     <package name="xdm"/>
     <package name="sysvinit-tools"/>
-    <package name="aaa_base" replaces="icewm"/>
+    <!-- OBS-IgnorePackage: icewm -->
     <ignore name="icewm"/>
-    <package name="aaa_base" replaces="baekmuk-ttf-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-ttf-fonts -->
     <ignore name="baekmuk-ttf-fonts"/>
-    <package name="aaa_base" replaces="google-droid-fonts"/>
+    <!-- OBS-IgnorePackage: google-droid-fonts -->
     <ignore name="google-droid-fonts"/>
-    <package name="aaa_base" replaces="efont-unicode-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: efont-unicode-bitmap-fonts -->
     <ignore name="efont-unicode-bitmap-fonts"/>
-    <package name="aaa_base" replaces="baekmuk-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-bitmap-fonts -->
     <ignore name="baekmuk-bitmap-fonts"/>
-    <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: intlfonts-chinese-big-bitmap-fonts -->
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-legacy -->
     <ignore name="xorg-x11-fonts-legacy"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-converted -->
     <ignore name="xorg-x11-fonts-converted"/>
-    <package name="aaa_base" replaces="strace"/>
+    <!-- OBS-IgnorePackage: strace -->
     <ignore name="strace"/>
-    <package name="aaa_base" replaces="tcsh"/>
+    <!-- OBS-IgnorePackage: tcsh -->
     <ignore name="tcsh"/>
-    <package name="aaa_base" replaces="usbmuxd"/>
+    <!-- OBS-IgnorePackage: usbmuxd -->
     <ignore name="usbmuxd"/>
-    <package name="aaa_base" replaces="gnome-keyring-pam"/>
+    <!-- OBS-IgnorePackage: gnome-keyring-pam -->
     <ignore name="gnome-keyring-pam"/>
-    <package name="aaa_base" replaces="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
-    <package name="aaa_base" replaces="apparmor-docs"/>
+    <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
-    <package name="aaa_base" replaces="mutt-doc"/>
+    <!-- OBS-IgnorePackage: mutt-doc -->
     <ignore name="mutt-doc"/>
-    <package name="aaa_base" replaces="coreutils-doc"/>
+    <!-- OBS-IgnorePackage: coreutils-doc -->
     <ignore name="coreutils-doc"/>
-    <package name="aaa_base" replaces="unar"/>
+    <!-- OBS-IgnorePackage: unar -->
     <ignore name="unar"/>
-    <package name="aaa_base" replaces="jing"/>
+    <!-- OBS-IgnorePackage: jing -->
     <ignore name="jing"/>
-    <package name="aaa_base" replaces="icedtea-web"/>
+    <!-- OBS-IgnorePackage: icedtea-web -->
     <ignore name="icedtea-web"/>
-    <package name="aaa_base" replaces="tigervnc"/>
+    <!-- OBS-IgnorePackage: tigervnc -->
     <ignore name="tigervnc"/>
-    <package name="aaa_base" replaces="autofs"/>
+    <!-- OBS-IgnorePackage: autofs -->
     <ignore name="autofs"/>
-    <package name="aaa_base" replaces="expect"/>
+    <!-- OBS-IgnorePackage: expect -->
     <ignore name="expect"/>
-    <package name="aaa_base" replaces="m4"/>
+    <!-- OBS-IgnorePackage: m4 -->
     <ignore name="m4"/>
-    <package name="aaa_base" replaces="mutt"/>
+    <!-- OBS-IgnorePackage: mutt -->
     <ignore name="mutt"/>
-    <package name="aaa_base" replaces="net-snmp"/>
+    <!-- OBS-IgnorePackage: net-snmp -->
     <ignore name="net-snmp"/>
-    <package name="aaa_base" replaces="procmail"/>
+    <!-- OBS-IgnorePackage: procmail -->
     <ignore name="procmail"/>
-    <package name="aaa_base" replaces="recode"/>
+    <!-- OBS-IgnorePackage: recode -->
     <ignore name="recode"/>
-    <package name="aaa_base" replaces="spax"/>
+    <!-- OBS-IgnorePackage: spax -->
     <ignore name="spax"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="espeak"/>
+    <!-- OBS-IgnorePackage: espeak -->
     <ignore name="espeak"/>
-    <package name="aaa_base" replaces="pam_mount"/>
+    <!-- OBS-IgnorePackage: pam_mount -->
     <ignore name="pam_mount"/>
-    <package name="aaa_base" replaces="groff-full"/>
+    <!-- OBS-IgnorePackage: groff-full -->
     <ignore name="groff-full"/>
-    <package name="aaa_base" replaces="tuned"/>
+    <!-- OBS-IgnorePackage: tuned -->
     <ignore name="tuned"/>
-    <package name="aaa_base" replaces="cups"/>
+    <!-- OBS-IgnorePackage: cups -->
     <ignore name="cups"/>
-    <package name="aaa_base" replaces="cups-client"/>
+    <!-- OBS-IgnorePackage: cups-client -->
     <ignore name="cups-client"/>
-    <package name="aaa_base" replaces="system-config-printer"/>
+    <!-- OBS-IgnorePackage: system-config-printer -->
     <ignore name="system-config-printer"/>
-    <package name="aaa_base" replaces="ghostscript"/>
+    <!-- OBS-IgnorePackage: ghostscript -->
     <ignore name="ghostscript"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-std"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-std -->
     <ignore name="ghostscript-fonts-std"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-other"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-other -->
     <ignore name="ghostscript-fonts-other"/>
-    <package name="aaa_base" replaces="manufacturer-PPDs"/>
+    <!-- OBS-IgnorePackage: manufacturer-PPDs -->
     <ignore name="manufacturer-PPDs"/>
-    <package name="aaa_base" replaces="gutenprint"/>
+    <!-- OBS-IgnorePackage: gutenprint -->
     <ignore name="gutenprint"/>
-    <package name="aaa_base" replaces="hplip-hpijs"/>
+    <!-- OBS-IgnorePackage: hplip-hpijs -->
     <ignore name="hplip-hpijs"/>
-    <package name="aaa_base" replaces="hplip"/>
+    <!-- OBS-IgnorePackage: hplip -->
     <ignore name="hplip"/>
-    <package name="aaa_base" replaces="system-config-printer-applet"/>
+    <!-- OBS-IgnorePackage: system-config-printer-applet -->
     <ignore name="system-config-printer-applet"/>
-    <package name="aaa_base" replaces="udev-configure-printer"/>
+    <!-- OBS-IgnorePackage: udev-configure-printer -->
     <ignore name="udev-configure-printer"/>
-    <package name="aaa_base" replaces="systemd-coredump"/>
+    <!-- OBS-IgnorePackage: systemd-coredump -->
     <ignore name="systemd-coredump"/>
-    <package name="aaa_base" replaces="systemd-doc"/>
+    <!-- OBS-IgnorePackage: systemd-doc -->
     <ignore name="systemd-doc"/>
-    <package name="aaa_base" replaces="man-pages"/>
+    <!-- OBS-IgnorePackage: man-pages -->
     <ignore name="man-pages"/>
-    <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
+    <!-- OBS-IgnorePackage: NetworkManager-vpnc-gnome -->
     <ignore name="NetworkManager-vpnc-gnome"/>
-    <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-vpnc -->
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <!-- OBS-IgnorePackage: busybox-sendmail -->
     <ignore name="busybox-sendmail"/>
-    <package name="aaa_base" replaces="exim"/>
+    <!-- OBS-IgnorePackage: exim -->
     <ignore name="exim"/>
-    <package name="aaa_base" replaces="msmtp-mta"/>
+    <!-- OBS-IgnorePackage: msmtp-mta -->
     <ignore name="msmtp-mta"/>
-    <package name="aaa_base" replaces="postfix"/>
+    <!-- OBS-IgnorePackage: postfix -->
     <ignore name="postfix"/>
-    <package name="aaa_base" replaces="postfix-bdb"/>
+    <!-- OBS-IgnorePackage: postfix-bdb -->
     <ignore name="postfix-bdb"/>
-    <package name="aaa_base" replaces="sendmail"/>
+    <!-- OBS-IgnorePackage: sendmail -->
     <ignore name="sendmail"/>
-    <package name="aaa_base" replaces="virtualbox-guest-tools"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-tools -->
     <ignore name="virtualbox-guest-tools"/>
-    <package name="aaa_base" replaces="virtualbox-guest-x11"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-x11 -->
     <ignore name="virtualbox-guest-x11"/>
-    <package name="aaa_base" replaces="intel-gpu-tools"/>
+    <!-- OBS-IgnorePackage: intel-gpu-tools -->
     <ignore name="intel-gpu-tools"/>
     <package name="spice-vdagent"/>
-    <package name="aaa_base" replaces="open-vm-tools"/>
+    <!-- OBS-IgnorePackage: open-vm-tools -->
     <ignore name="open-vm-tools"/>
-    <package name="aaa_base" replaces="usb_modeswitch"/>
+    <!-- OBS-IgnorePackage: usb_modeswitch -->
     <ignore name="usb_modeswitch"/>
-    <package name="aaa_base" replaces="gstreamer-plugins-rs"/>
+    <!-- OBS-IgnorePackage: gstreamer-plugins-rs -->
     <ignore name="gstreamer-plugins-rs"/>
-    <package name="aaa_base" replaces="vim-data"/>
+    <!-- OBS-IgnorePackage: vim-data -->
     <ignore name="vim-data"/>
-    <package name="aaa_base" replaces="vim"/>
+    <!-- OBS-IgnorePackage: vim -->
     <ignore name="vim"/>
     <package name="vim-small"/>
     <package name="kernel-default"/>
@@ -411,80 +411,80 @@
     <package name="xz"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
-    <package name="aaa_base" replaces="ntp"/>
+    <!-- OBS-IgnorePackage: ntp -->
     <ignore name="ntp"/>
-    <package name="aaa_base" replaces="wicked"/>
+    <!-- OBS-IgnorePackage: wicked -->
     <ignore name="wicked"/>
     <package name="ucode-amd" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="ucode-intel"/>
+    <!-- OBS-IgnorePackage: ucode-intel -->
     <ignore name="ucode-intel"/>
 
     <!-- list-gnome.sh -->
-    <package name="aaa_base" replaces="libreoffice-calc"/>
+    <!-- OBS-IgnorePackage: libreoffice-calc -->
     <ignore name="libreoffice-calc"/>
-    <package name="aaa_base" replaces="libreoffice-draw"/>
+    <!-- OBS-IgnorePackage: libreoffice-draw -->
     <ignore name="libreoffice-draw"/>
-    <package name="aaa_base" replaces="libreoffice-impress"/>
+    <!-- OBS-IgnorePackage: libreoffice-impress -->
     <ignore name="libreoffice-impress"/>
-    <package name="aaa_base" replaces="libreoffice-icon-themes"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-themes -->
     <ignore name="libreoffice-icon-themes"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-breeze"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-breeze -->
     <ignore name="libreoffice-icon-theme-breeze"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-sifr"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-sifr -->
     <ignore name="libreoffice-icon-theme-sifr"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-hicontrast"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-hicontrast -->
     <ignore name="libreoffice-icon-theme-hicontrast"/>
-    <package name="aaa_base" replaces="colord"/>
+    <!-- OBS-IgnorePackage: colord -->
     <ignore name="colord"/>
-    <package name="aaa_base" replaces="apparmor-utils"/>
+    <!-- OBS-IgnorePackage: apparmor-utils -->
     <ignore name="apparmor-utils"/>
-    <package name="aaa_base" replaces="java-11-openjdk-headless"/>
+    <!-- OBS-IgnorePackage: java-11-openjdk-headless -->
     <ignore name="java-11-openjdk-headless"/>
     <package name="branding-openSUSE"/>
     <package name="adobe-sourcecodepro-fonts"/>
-    <package name="aaa_base" replaces="google-carlito-fonts"/>
+    <!-- OBS-IgnorePackage: google-carlito-fonts -->
     <ignore name="google-carlito-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-fonts -->
     <ignore name="google-noto-sans-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-cjk-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-cjk-fonts -->
     <ignore name="google-noto-sans-cjk-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-sc-bold-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-sc-bold-fonts -->
     <ignore name="google-noto-sans-sc-bold-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-sc-regular-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-sc-regular-fonts -->
     <ignore name="google-noto-sans-sc-regular-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-tc-bold-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-tc-bold-fonts -->
     <ignore name="google-noto-sans-tc-bold-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-tc-regular-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-tc-regular-fonts -->
     <ignore name="google-noto-sans-tc-regular-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-jp-bold-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-jp-bold-fonts -->
     <ignore name="google-noto-sans-jp-bold-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-jp-regular-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-jp-regular-fonts -->
     <ignore name="google-noto-sans-jp-regular-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-kr-bold-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-kr-bold-fonts -->
     <ignore name="google-noto-sans-kr-bold-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-kr-regular-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-kr-regular-fonts -->
     <ignore name="google-noto-sans-kr-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-fonts -->
     <ignore name="noto-sans-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-cjk-fonts -->
     <ignore name="noto-sans-cjk-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-sc-bold-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-sc-bold-fonts -->
     <ignore name="noto-sans-sc-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-sc-regular-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-sc-regular-fonts -->
     <ignore name="noto-sans-sc-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-tc-bold-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-tc-bold-fonts -->
     <ignore name="noto-sans-tc-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-tc-regular-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-tc-regular-fonts -->
     <ignore name="noto-sans-tc-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-jp-bold-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-jp-bold-fonts -->
     <ignore name="noto-sans-jp-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-jp-regular-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-jp-regular-fonts -->
     <ignore name="noto-sans-jp-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-kr-bold-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-kr-bold-fonts -->
     <ignore name="noto-sans-kr-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-kr-regular-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-kr-regular-fonts -->
     <ignore name="noto-sans-kr-regular-fonts"/>
-    <package name="aaa_base" replaces="libreoffice"/>
+    <!-- OBS-IgnorePackage: libreoffice -->
     <ignore name="libreoffice"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
@@ -494,15 +494,15 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
-    <package name="aaa_base" replaces="yast2-samba-client"/>
+    <!-- OBS-IgnorePackage: yast2-samba-client -->
     <ignore name="yast2-samba-client"/>
-    <package name="aaa_base" replaces="yast2-vpn"/>
+    <!-- OBS-IgnorePackage: yast2-vpn -->
     <ignore name="yast2-vpn"/>
-    <package name="aaa_base" replaces="yast2-journal"/>
+    <!-- OBS-IgnorePackage: yast2-journal -->
     <ignore name="yast2-journal"/>
-    <package name="aaa_base" replaces="yast2-auth-client"/>
+    <!-- OBS-IgnorePackage: yast2-auth-client -->
     <ignore name="yast2-auth-client"/>
-    <package name="aaa_base" replaces="yast2-sudo"/>
+    <!-- OBS-IgnorePackage: yast2-sudo -->
     <ignore name="yast2-sudo"/>
     <package name="yast2-trans-de"/>
     <package name="yast2-trans-cs"/>
@@ -523,64 +523,64 @@
     <package name="lklug-fonts"/>
     <package name="indic-fonts"/>
     <package name="arabic-kacst-fonts"/>
-    <package name="aaa_base" replaces="simple-scan"/>
+    <!-- OBS-IgnorePackage: simple-scan -->
     <ignore name="simple-scan"/>
-    <package name="aaa_base" replaces="ghostscript"/>
+    <!-- OBS-IgnorePackage: ghostscript -->
     <ignore name="ghostscript"/>
-    <package name="aaa_base" replaces="myspell-en_US"/>
+    <!-- OBS-IgnorePackage: myspell-en_US -->
     <ignore name="myspell-en_US"/>
-    <package name="aaa_base" replaces="orca"/>
+    <!-- OBS-IgnorePackage: orca -->
     <ignore name="orca"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_games"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_games -->
     <ignore name="patterns-gnome-gnome_games"/>
-    <package name="aaa_base" replaces="gnome-software"/>
+    <!-- OBS-IgnorePackage: gnome-software -->
     <ignore name="gnome-software"/>
-    <package name="aaa_base" replaces="gnome-control-center-color"/>
+    <!-- OBS-IgnorePackage: gnome-control-center-color -->
     <ignore name="gnome-control-center-color"/>
-    <package name="aaa_base" replaces="gnome-control-center-user-faces"/>
+    <!-- OBS-IgnorePackage: gnome-control-center-user-faces -->
     <ignore name="gnome-control-center-user-faces"/>
-    <package name="aaa_base" replaces="libgweather-lang"/>
+    <!-- OBS-IgnorePackage: libgweather-lang -->
     <ignore name="libgweather-lang"/>
-    <package name="aaa_base" replaces="gnome-user-docs"/>
+    <!-- OBS-IgnorePackage: gnome-user-docs -->
     <ignore name="gnome-user-docs"/>
-    <package name="aaa_base" replaces="gnome-user-docs-lang"/>
+    <!-- OBS-IgnorePackage: gnome-user-docs-lang -->
     <ignore name="gnome-user-docs-lang"/>
-    <package name="aaa_base" replaces="eog-lang"/>
+    <!-- OBS-IgnorePackage: eog-lang -->
     <ignore name="eog-lang"/>
-    <package name="aaa_base" replaces="evolution-lang"/>
+    <!-- OBS-IgnorePackage: evolution-lang -->
     <ignore name="evolution-lang"/>
-    <package name="aaa_base" replaces="evolution-data-server-lang"/>
+    <!-- OBS-IgnorePackage: evolution-data-server-lang -->
     <ignore name="evolution-data-server-lang"/>
-    <package name="aaa_base" replaces="zenity-lang"/>
+    <!-- OBS-IgnorePackage: zenity-lang -->
     <ignore name="zenity-lang"/>
-    <package name="aaa_base" replaces="amavisd-new"/>
+    <!-- OBS-IgnorePackage: amavisd-new -->
     <ignore name="amavisd-new"/>
-    <package name="aaa_base" replaces="inkscape"/>
+    <!-- OBS-IgnorePackage: inkscape -->
     <ignore name="inkscape"/>
-    <package name="aaa_base" replaces="deja-dup"/>
+    <!-- OBS-IgnorePackage: deja-dup -->
     <ignore name="deja-dup"/>
-    <package name="aaa_base" replaces="libpython2_7-1_0"/>
+    <!-- OBS-IgnorePackage: libpython2_7-1_0 -->
     <ignore name="libpython2_7-1_0"/>
-    <package name="aaa_base" replaces="gimp"/>
+    <!-- OBS-IgnorePackage: gimp -->
     <ignore name="gimp"/>
-    <package name="aaa_base" replaces="noto-coloremoji-fonts"/>
+    <!-- OBS-IgnorePackage: noto-coloremoji-fonts -->
     <ignore name="noto-coloremoji-fonts"/>
-    <package name="aaa_base" replaces="gnome-weather"/>
+    <!-- OBS-IgnorePackage: gnome-weather -->
     <ignore name="gnome-weather"/>
     <package name="gparted"/>
-    <package name="aaa_base" replaces="gparted-lang"/>
+    <!-- OBS-IgnorePackage: gparted-lang -->
     <ignore name="gparted-lang"/>
-    <package name="aaa_base" replaces="vinagre-lang"/>
+    <!-- OBS-IgnorePackage: vinagre-lang -->
     <ignore name="vinagre-lang"/>
-    <package name="aaa_base" replaces="gedit-lang"/>
+    <!-- OBS-IgnorePackage: gedit-lang -->
     <ignore name="gedit-lang"/>
-    <package name="aaa_base" replaces="fwupd-lang"/>
+    <!-- OBS-IgnorePackage: fwupd-lang -->
     <ignore name="fwupd-lang"/>
-    <package name="aaa_base" replaces="gnome-photos"/>
+    <!-- OBS-IgnorePackage: gnome-photos -->
     <ignore name="gnome-photos"/>
-    <package name="aaa_base" replaces="gnome-backgrounds"/>
+    <!-- OBS-IgnorePackage: gnome-backgrounds -->
     <ignore name="gnome-backgrounds"/>
-    <package name="aaa_base" replaces="cyrus-sasl"/>
+    <!-- OBS-IgnorePackage: cyrus-sasl -->
     <ignore name="cyrus-sasl"/>
     <package name="NetworkManager-applet"/>
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
@@ -603,13 +603,13 @@
     <package name="gnome-mines"/>
     <package name="gnome-sudoku"/>
     <package name="quadrapassel"/>
-    <package name="aaa_base" replaces="opensuse-welcome"/>
+    <!-- OBS-IgnorePackage: opensuse-welcome -->
     <ignore name="opensuse-welcome"/>
-    <package name="aaa_base" replaces="yelp"/>
+    <!-- OBS-IgnorePackage: yelp -->
     <ignore name="yelp"/>
-    <package name="aaa_base" replaces="sushi"/>
+    <!-- OBS-IgnorePackage: sushi -->
     <ignore name="sushi"/>
-    <package name="aaa_base" replaces="libgtk-2_0-0"/>
+    <!-- OBS-IgnorePackage: libgtk-2_0-0 -->
     <ignore name="libgtk-2_0-0"/>
   </packages>
   <packages type="bootstrap">
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 657e2ad..fdd13ae 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-KDE-Live" displayname="openSUSE Leap %OS_VERSION_ID% KDE Live">
+<image schemaversion="7.4" name="openSUSE-Leap-%OS_VERSION_ID%-KDE-Live" displayname="openSUSE Leap %OS_VERSION_ID% KDE Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -57,289 +57,289 @@
     <archive name="livecd-udev.tar.xz"/>
     
     <!-- list-common.sh -->
-    <package name="aaa_base" replaces="poppler-data"/>
+    <!-- OBS-IgnorePackage: poppler-data -->
     <ignore name="poppler-data"/>
-    <package name="aaa_base" replaces="tin"/>
+    <!-- OBS-IgnorePackage: tin -->
     <ignore name="tin"/>
-    <package name="aaa_base" replaces="desktop-translations"/>
+    <!-- OBS-IgnorePackage: desktop-translations -->
     <ignore name="desktop-translations"/>
-    <package name="aaa_base" replaces="ft2demos"/>
+    <!-- OBS-IgnorePackage: ft2demos -->
     <ignore name="ft2demos"/>
-    <package name="aaa_base" replaces="gimp-help"/>
+    <!-- OBS-IgnorePackage: gimp-help -->
     <ignore name="gimp-help"/>
-    <package name="aaa_base" replaces="gimp-lang"/>
+    <!-- OBS-IgnorePackage: gimp-lang -->
     <ignore name="gimp-lang"/>
-    <package name="aaa_base" replaces="libreoffice-base"/>
+    <!-- OBS-IgnorePackage: libreoffice-base -->
     <ignore name="libreoffice-base"/>
-    <package name="aaa_base" replaces="libreoffice-mailmerge"/>
+    <!-- OBS-IgnorePackage: libreoffice-mailmerge -->
     <ignore name="libreoffice-mailmerge"/>
-    <package name="aaa_base" replaces="libreoffice-math"/>
+    <!-- OBS-IgnorePackage: libreoffice-math -->
     <ignore name="libreoffice-math"/>
-    <package name="aaa_base" replaces="libreoffice-filters-optional"/>
+    <!-- OBS-IgnorePackage: libreoffice-filters-optional -->
     <ignore name="libreoffice-filters-optional"/>
-    <package name="aaa_base" replaces="libreoffice-pyuno"/>
+    <!-- OBS-IgnorePackage: libreoffice-pyuno -->
     <ignore name="libreoffice-pyuno"/>
-    <package name="aaa_base" replaces="readline-doc"/>
+    <!-- OBS-IgnorePackage: readline-doc -->
     <ignore name="readline-doc"/>
-    <package name="aaa_base" replaces="graphviz"/>
+    <!-- OBS-IgnorePackage: graphviz -->
     <ignore name="graphviz"/>
-    <package name="aaa_base" replaces="linux-kernel-headers"/>
+    <!-- OBS-IgnorePackage: linux-kernel-headers -->
     <ignore name="linux-kernel-headers"/>
-    <package name="aaa_base" replaces="bash-doc"/>
+    <!-- OBS-IgnorePackage: bash-doc -->
     <ignore name="bash-doc"/>
-    <package name="aaa_base" replaces="gimp-plugins-python"/>
+    <!-- OBS-IgnorePackage: gimp-plugins-python -->
     <ignore name="gimp-plugins-python"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_basis_opt -->
     <ignore name="patterns-openSUSE-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_admin -->
     <ignore name="patterns-openSUSE-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_multimedia_opt -->
     <ignore name="patterns-openSUSE-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_imaging_opt -->
     <ignore name="patterns-openSUSE-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_office_opt -->
     <ignore name="patterns-openSUSE-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-apparmor_opt -->
     <ignore name="patterns-openSUSE-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-enhanced_base_opt -->
     <ignore name="patterns-openSUSE-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-fonts_opt -->
     <ignore name="patterns-openSUSE-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-imaging_opt -->
     <ignore name="patterns-openSUSE-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-kde_utilities_opt -->
     <ignore name="patterns-openSUSE-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-multimedia_opt -->
     <ignore name="patterns-openSUSE-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-office_opt -->
     <ignore name="patterns-openSUSE-office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-x11_opt -->
     <ignore name="patterns-openSUSE-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_basis_opt -->
     <ignore name="patterns-gnome-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-gmome-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-gmome-gnome_admin -->
     <ignore name="patterns-gmome-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_multimedia_opt -->
     <ignore name="patterns-gnome-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_imaging_opt -->
     <ignore name="patterns-gnome-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_office_opt -->
     <ignore name="patterns-gnome-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-apparmor_opt -->
     <ignore name="patterns-base-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-base-documentation"/>
+    <!-- OBS-IgnorePackage: patterns-base-documentation -->
     <ignore name="patterns-base-documentation"/>
-    <package name="aaa_base" replaces="patterns-base-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-enhanced_base_opt -->
     <ignore name="patterns-base-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-fonts-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-fonts-fonts_opt -->
     <ignore name="patterns-fonts-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-imaging_opt -->
     <ignore name="patterns-desktop-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_utilities_opt -->
     <ignore name="patterns-kde-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-multimedia_opt -->
     <ignore name="patterns-desktop-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-office-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-office-office_opt -->
     <ignore name="patterns-office-office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_opt -->
     <ignore name="patterns-base-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_enhanced"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_enhanced -->
     <ignore name="patterns-base-x11_enhanced"/>
-    <package name="aaa_base" replaces="make"/>
+    <!-- OBS-IgnorePackage: make -->
     <ignore name="make"/>
-    <package name="aaa_base" replaces="netpbm"/>
+    <!-- OBS-IgnorePackage: netpbm -->
     <ignore name="netpbm"/>
-    <package name="aaa_base" replaces="p7zip-full"/>
+    <!-- OBS-IgnorePackage: p7zip-full -->
     <ignore name="p7zip-full"/>
-    <package name="aaa_base" replaces="busybox-static"/>
+    <!-- OBS-IgnorePackage: busybox-static -->
     <ignore name="busybox-static"/>
-    <package name="aaa_base" replaces="inxi"/>
+    <!-- OBS-IgnorePackage: inxi -->
     <ignore name="inxi"/>
-    <package name="aaa_base" replaces="sane-backends"/>
+    <!-- OBS-IgnorePackage: sane-backends -->
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="aaa_base" replaces="glibc-32bit"/>
+    <!-- OBS-IgnorePackage: glibc-32bit -->
     <ignore name="glibc-32bit"/>
-    <package name="aaa_base" replaces="libvdpau_r300"/>
+    <!-- OBS-IgnorePackage: libvdpau_r300 -->
     <ignore name="libvdpau_r300"/>
-    <package name="aaa_base" replaces="libvdpau_radeonsi"/>
+    <!-- OBS-IgnorePackage: libvdpau_radeonsi -->
     <ignore name="libvdpau_radeonsi"/>
-    <package name="aaa_base" replaces="libvdpau_r600"/>
+    <!-- OBS-IgnorePackage: libvdpau_r600 -->
     <ignore name="libvdpau_r600"/>
-    <package name="aaa_base" replaces="pavucontrol"/>
+    <!-- OBS-IgnorePackage: pavucontrol -->
     <ignore name="pavucontrol"/>
-    <package name="aaa_base" replaces="libqmi-tools"/>
+    <!-- OBS-IgnorePackage: libqmi-tools -->
     <ignore name="libqmi-tools"/>
-    <package name="aaa_base" replaces="python*-pip"/>
+    <!-- OBS-IgnorePackage: python*-pip -->
     <ignore name="python*-pip"/>
-    <package name="aaa_base" replaces="multipath-tools-rbd"/>
+    <!-- OBS-IgnorePackage: multipath-tools-rbd -->
     <ignore name="multipath-tools-rbd"/>
-    <package name="aaa_base" replaces="acpica"/>
+    <!-- OBS-IgnorePackage: acpica -->
     <ignore name="acpica"/>
-    <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
+    <!-- OBS-IgnorePackage: xorg-x11-Xvnc -->
     <ignore name="xorg-x11-Xvnc"/>
-    <package name="aaa_base" replaces="cabextract"/>
+    <!-- OBS-IgnorePackage: cabextract -->
     <ignore name="cabextract"/>
-    <package name="aaa_base" replaces="sssd"/>
+    <!-- OBS-IgnorePackage: sssd -->
     <ignore name="sssd"/>
-    <package name="aaa_base" replaces="db-utils"/>
+    <!-- OBS-IgnorePackage: db-utils -->
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="dnsmasq"/>
+    <!-- OBS-IgnorePackage: dnsmasq -->
     <ignore name="dnsmasq"/>
-    <package name="aaa_base" replaces="fribidi"/>
+    <!-- OBS-IgnorePackage: fribidi -->
     <ignore name="fribidi"/>
-    <package name="aaa_base" replaces="ipmitool"/>
+    <!-- OBS-IgnorePackage: ipmitool -->
     <ignore name="ipmitool"/>
-    <package name="aaa_base" replaces="irda"/>
+    <!-- OBS-IgnorePackage: irda -->
     <ignore name="irda"/>
-    <package name="aaa_base" replaces="lomoco"/>
+    <!-- OBS-IgnorePackage: lomoco -->
     <ignore name="lomoco"/>
-    <package name="aaa_base" replaces="mksh"/>
+    <!-- OBS-IgnorePackage: mksh -->
     <ignore name="mksh"/>
-    <package name="aaa_base" replaces="cifs-utils"/>
+    <!-- OBS-IgnorePackage: cifs-utils -->
     <ignore name="cifs-utils"/>
-    <package name="aaa_base" replaces="gvfs-backend-samba"/>
+    <!-- OBS-IgnorePackage: gvfs-backend-samba -->
     <ignore name="gvfs-backend-samba"/>
-    <package name="aaa_base" replaces="xorg-x11"/>
+    <!-- OBS-IgnorePackage: xorg-x11 -->
     <ignore name="xorg-x11"/>
-    <package name="aaa_base" replaces="xorg-x11-essentials"/>
+    <!-- OBS-IgnorePackage: xorg-x11-essentials -->
     <ignore name="xorg-x11-essentials"/>
-    <package name="aaa_base" replaces="xorg-x11-server-extra"/>
+    <!-- OBS-IgnorePackage: xorg-x11-server-extra -->
     <ignore name="xorg-x11-server-extra"/>
     <package name="xdm"/>
     <package name="sysvinit-tools"/>
-    <package name="aaa_base" replaces="icewm"/>
+    <!-- OBS-IgnorePackage: icewm -->
     <ignore name="icewm"/>
-    <package name="aaa_base" replaces="baekmuk-ttf-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-ttf-fonts -->
     <ignore name="baekmuk-ttf-fonts"/>
-    <package name="aaa_base" replaces="google-droid-fonts"/>
+    <!-- OBS-IgnorePackage: google-droid-fonts -->
     <ignore name="google-droid-fonts"/>
-    <package name="aaa_base" replaces="efont-unicode-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: efont-unicode-bitmap-fonts -->
     <ignore name="efont-unicode-bitmap-fonts"/>
-    <package name="aaa_base" replaces="baekmuk-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-bitmap-fonts -->
     <ignore name="baekmuk-bitmap-fonts"/>
-    <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: intlfonts-chinese-big-bitmap-fonts -->
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-legacy -->
     <ignore name="xorg-x11-fonts-legacy"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-converted -->
     <ignore name="xorg-x11-fonts-converted"/>
-    <package name="aaa_base" replaces="strace"/>
+    <!-- OBS-IgnorePackage: strace -->
     <ignore name="strace"/>
-    <package name="aaa_base" replaces="tcsh"/>
+    <!-- OBS-IgnorePackage: tcsh -->
     <ignore name="tcsh"/>
-    <package name="aaa_base" replaces="usbmuxd"/>
+    <!-- OBS-IgnorePackage: usbmuxd -->
     <ignore name="usbmuxd"/>
-    <package name="aaa_base" replaces="gnome-keyring-pam"/>
+    <!-- OBS-IgnorePackage: gnome-keyring-pam -->
     <ignore name="gnome-keyring-pam"/>
-    <package name="aaa_base" replaces="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
-    <package name="aaa_base" replaces="apparmor-docs"/>
+    <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
-    <package name="aaa_base" replaces="mutt-doc"/>
+    <!-- OBS-IgnorePackage: mutt-doc -->
     <ignore name="mutt-doc"/>
-    <package name="aaa_base" replaces="coreutils-doc"/>
+    <!-- OBS-IgnorePackage: coreutils-doc -->
     <ignore name="coreutils-doc"/>
-    <package name="aaa_base" replaces="unar"/>
+    <!-- OBS-IgnorePackage: unar -->
     <ignore name="unar"/>
-    <package name="aaa_base" replaces="jing"/>
+    <!-- OBS-IgnorePackage: jing -->
     <ignore name="jing"/>
-    <package name="aaa_base" replaces="icedtea-web"/>
+    <!-- OBS-IgnorePackage: icedtea-web -->
     <ignore name="icedtea-web"/>
-    <package name="aaa_base" replaces="tigervnc"/>
+    <!-- OBS-IgnorePackage: tigervnc -->
     <ignore name="tigervnc"/>
-    <package name="aaa_base" replaces="autofs"/>
+    <!-- OBS-IgnorePackage: autofs -->
     <ignore name="autofs"/>
-    <package name="aaa_base" replaces="expect"/>
+    <!-- OBS-IgnorePackage: expect -->
     <ignore name="expect"/>
-    <package name="aaa_base" replaces="m4"/>
+    <!-- OBS-IgnorePackage: m4 -->
     <ignore name="m4"/>
-    <package name="aaa_base" replaces="mutt"/>
+    <!-- OBS-IgnorePackage: mutt -->
     <ignore name="mutt"/>
-    <package name="aaa_base" replaces="net-snmp"/>
+    <!-- OBS-IgnorePackage: net-snmp -->
     <ignore name="net-snmp"/>
-    <package name="aaa_base" replaces="procmail"/>
+    <!-- OBS-IgnorePackage: procmail -->
     <ignore name="procmail"/>
-    <package name="aaa_base" replaces="recode"/>
+    <!-- OBS-IgnorePackage: recode -->
     <ignore name="recode"/>
-    <package name="aaa_base" replaces="spax"/>
+    <!-- OBS-IgnorePackage: spax -->
     <ignore name="spax"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="espeak"/>
+    <!-- OBS-IgnorePackage: espeak -->
     <ignore name="espeak"/>
-    <package name="aaa_base" replaces="pam_mount"/>
+    <!-- OBS-IgnorePackage: pam_mount -->
     <ignore name="pam_mount"/>
-    <package name="aaa_base" replaces="groff-full"/>
+    <!-- OBS-IgnorePackage: groff-full -->
     <ignore name="groff-full"/>
-    <package name="aaa_base" replaces="tuned"/>
+    <!-- OBS-IgnorePackage: tuned -->
     <ignore name="tuned"/>
-    <package name="aaa_base" replaces="cups"/>
+    <!-- OBS-IgnorePackage: cups -->
     <ignore name="cups"/>
-    <package name="aaa_base" replaces="cups-client"/>
+    <!-- OBS-IgnorePackage: cups-client -->
     <ignore name="cups-client"/>
-    <package name="aaa_base" replaces="system-config-printer"/>
+    <!-- OBS-IgnorePackage: system-config-printer -->
     <ignore name="system-config-printer"/>
-    <package name="aaa_base" replaces="ghostscript"/>
+    <!-- OBS-IgnorePackage: ghostscript -->
     <ignore name="ghostscript"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-std"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-std -->
     <ignore name="ghostscript-fonts-std"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-other"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-other -->
     <ignore name="ghostscript-fonts-other"/>
-    <package name="aaa_base" replaces="manufacturer-PPDs"/>
+    <!-- OBS-IgnorePackage: manufacturer-PPDs -->
     <ignore name="manufacturer-PPDs"/>
-    <package name="aaa_base" replaces="gutenprint"/>
+    <!-- OBS-IgnorePackage: gutenprint -->
     <ignore name="gutenprint"/>
-    <package name="aaa_base" replaces="hplip-hpijs"/>
+    <!-- OBS-IgnorePackage: hplip-hpijs -->
     <ignore name="hplip-hpijs"/>
-    <package name="aaa_base" replaces="hplip"/>
+    <!-- OBS-IgnorePackage: hplip -->
     <ignore name="hplip"/>
-    <package name="aaa_base" replaces="system-config-printer-applet"/>
+    <!-- OBS-IgnorePackage: system-config-printer-applet -->
     <ignore name="system-config-printer-applet"/>
-    <package name="aaa_base" replaces="udev-configure-printer"/>
+    <!-- OBS-IgnorePackage: udev-configure-printer -->
     <ignore name="udev-configure-printer"/>
-    <package name="aaa_base" replaces="systemd-coredump"/>
+    <!-- OBS-IgnorePackage: systemd-coredump -->
     <ignore name="systemd-coredump"/>
-    <package name="aaa_base" replaces="systemd-doc"/>
+    <!-- OBS-IgnorePackage: systemd-doc -->
     <ignore name="systemd-doc"/>
-    <package name="aaa_base" replaces="man-pages"/>
+    <!-- OBS-IgnorePackage: man-pages -->
     <ignore name="man-pages"/>
-    <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
+    <!-- OBS-IgnorePackage: NetworkManager-vpnc-gnome -->
     <ignore name="NetworkManager-vpnc-gnome"/>
-    <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-vpnc -->
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <!-- OBS-IgnorePackage: busybox-sendmail -->
     <ignore name="busybox-sendmail"/>
-    <package name="aaa_base" replaces="exim"/>
+    <!-- OBS-IgnorePackage: exim -->
     <ignore name="exim"/>
-    <package name="aaa_base" replaces="msmtp-mta"/>
+    <!-- OBS-IgnorePackage: msmtp-mta -->
     <ignore name="msmtp-mta"/>
-    <package name="aaa_base" replaces="postfix"/>
+    <!-- OBS-IgnorePackage: postfix -->
     <ignore name="postfix"/>
-    <package name="aaa_base" replaces="postfix-bdb"/>
+    <!-- OBS-IgnorePackage: postfix-bdb -->
     <ignore name="postfix-bdb"/>
-    <package name="aaa_base" replaces="sendmail"/>
+    <!-- OBS-IgnorePackage: sendmail -->
     <ignore name="sendmail"/>
-    <package name="aaa_base" replaces="virtualbox-guest-tools"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-tools -->
     <ignore name="virtualbox-guest-tools"/>
-    <package name="aaa_base" replaces="virtualbox-guest-x11"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-x11 -->
     <ignore name="virtualbox-guest-x11"/>
-    <package name="aaa_base" replaces="intel-gpu-tools"/>
+    <!-- OBS-IgnorePackage: intel-gpu-tools -->
     <ignore name="intel-gpu-tools"/>
     <package name="spice-vdagent"/>
-    <package name="aaa_base" replaces="open-vm-tools"/>
+    <!-- OBS-IgnorePackage: open-vm-tools -->
     <ignore name="open-vm-tools"/>
-    <package name="aaa_base" replaces="usb_modeswitch"/>
+    <!-- OBS-IgnorePackage: usb_modeswitch -->
     <ignore name="usb_modeswitch"/>
-    <package name="aaa_base" replaces="gstreamer-plugins-rs"/>
+    <!-- OBS-IgnorePackage: gstreamer-plugins-rs -->
     <ignore name="gstreamer-plugins-rs"/>
-    <package name="aaa_base" replaces="vim-data"/>
+    <!-- OBS-IgnorePackage: vim-data -->
     <ignore name="vim-data"/>
-    <package name="aaa_base" replaces="vim"/>
+    <!-- OBS-IgnorePackage: vim -->
     <ignore name="vim"/>
     <package name="vim-small"/>
     <package name="kernel-default"/>
@@ -411,57 +411,57 @@
     <package name="xz"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
-    <package name="aaa_base" replaces="ntp"/>
+    <!-- OBS-IgnorePackage: ntp -->
     <ignore name="ntp"/>
-    <package name="aaa_base" replaces="wicked"/>
+    <!-- OBS-IgnorePackage: wicked -->
     <ignore name="wicked"/>
     <package name="ucode-amd" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="ucode-intel"/>
+    <!-- OBS-IgnorePackage: ucode-intel -->
     <ignore name="ucode-intel"/>
 
     <!-- list-kde.sh -->
-    <package name="aaa_base" replaces="gvfs"/>
+    <!-- OBS-IgnorePackage: gvfs -->
     <ignore name="gvfs"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-galaxy"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-galaxy -->
     <ignore name="libreoffice-icon-theme-galaxy"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-hicontrast"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-hicontrast -->
     <ignore name="libreoffice-icon-theme-hicontrast"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-tango"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-tango -->
     <ignore name="libreoffice-icon-theme-tango"/>
-    <package name="aaa_base" replaces="libreoffice-base-drivers-mysql"/>
+    <!-- OBS-IgnorePackage: libreoffice-base-drivers-mysql -->
     <ignore name="libreoffice-base-drivers-mysql"/>
-    <package name="aaa_base" replaces="libreoffice-pyuno"/>
+    <!-- OBS-IgnorePackage: libreoffice-pyuno -->
     <ignore name="libreoffice-pyuno"/>
-    <package name="aaa_base" replaces="cairomm"/>
+    <!-- OBS-IgnorePackage: cairomm -->
     <ignore name="cairomm"/>
-    <package name="aaa_base" replaces="evolution-data-server"/>
+    <!-- OBS-IgnorePackage: evolution-data-server -->
     <ignore name="evolution-data-server"/>
-    <package name="aaa_base" replaces="notification-daemon"/>
+    <!-- OBS-IgnorePackage: notification-daemon -->
     <ignore name="notification-daemon"/>
-    <package name="aaa_base" replaces="gdm"/>
+    <!-- OBS-IgnorePackage: gdm -->
     <ignore name="gdm"/>
-    <package name="aaa_base" replaces="akregator"/>
+    <!-- OBS-IgnorePackage: akregator -->
     <ignore name="akregator"/>
-    <package name="aaa_base" replaces="ImageMagick"/>
+    <!-- OBS-IgnorePackage: ImageMagick -->
     <ignore name="ImageMagick"/>
     <package name="patterns-kde-kde"/>
     <namedCollection name="kde"/>
     <package name="plasma5-workspace-branding-openSUSE"/>
     <package name="baloo5-tools"/>
     <package name="NetworkManager"/>
-    <package name="aaa_base" replaces="libreoffice"/>
+    <!-- OBS-IgnorePackage: libreoffice -->
     <ignore name="libreoffice"/>
-    <package name="aaa_base" replaces="libreoffice-icon-themes"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-themes -->
     <ignore name="libreoffice-icon-themes"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-breeze"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-breeze -->
     <ignore name="libreoffice-icon-theme-breeze"/>
-    <package name="aaa_base" replaces="kdenetwork4-filesharing"/>
+    <!-- OBS-IgnorePackage: kdenetwork4-filesharing -->
     <ignore name="kdenetwork4-filesharing"/>
-    <package name="aaa_base" replaces="gnome-keyring"/>
+    <!-- OBS-IgnorePackage: gnome-keyring -->
     <ignore name="gnome-keyring"/>
-    <package name="aaa_base" replaces="openssh-askpass-gnome"/>
+    <!-- OBS-IgnorePackage: openssh-askpass-gnome -->
     <ignore name="openssh-askpass-gnome"/>
-    <package name="aaa_base" replaces="libgtk-2_0-0"/>
+    <!-- OBS-IgnorePackage: libgtk-2_0-0 -->
     <ignore name="libgtk-2_0-0"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
@@ -471,15 +471,15 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
-    <package name="aaa_base" replaces="yast2-samba-client"/>
+    <!-- OBS-IgnorePackage: yast2-samba-client -->
     <ignore name="yast2-samba-client"/>
-    <package name="aaa_base" replaces="yast2-vpn"/>
+    <!-- OBS-IgnorePackage: yast2-vpn -->
     <ignore name="yast2-vpn"/>
-    <package name="aaa_base" replaces="yast2-journal"/>
+    <!-- OBS-IgnorePackage: yast2-journal -->
     <ignore name="yast2-journal"/>
-    <package name="aaa_base" replaces="yast2-auth-client"/>
+    <!-- OBS-IgnorePackage: yast2-auth-client -->
     <ignore name="yast2-auth-client"/>
-    <package name="aaa_base" replaces="yast2-sudo"/>
+    <!-- OBS-IgnorePackage: yast2-sudo -->
     <ignore name="yast2-sudo"/>
     <package name="yast2-trans-de"/>
     <package name="yast2-trans-cs"/>
@@ -500,60 +500,60 @@
     <package name="lklug-fonts"/>
     <package name="indic-fonts"/>
     <package name="arabic-kacst-fonts"/>
-    <package name="aaa_base" replaces="oxygen5-icon-theme-large"/>
+    <!-- OBS-IgnorePackage: oxygen5-icon-theme-large -->
     <ignore name="oxygen5-icon-theme-large"/>
-    <package name="aaa_base" replaces="plasma5-desktop-emojier"/>
+    <!-- OBS-IgnorePackage: plasma5-desktop-emojier -->
     <ignore name="plasma5-desktop-emojier"/>
     <package name="plasma-nm5"/>
     <package name="phonon4qt5-backend-vlc"/>
-    <package name="aaa_base" replaces="ispell"/>
+    <!-- OBS-IgnorePackage: ispell -->
     <ignore name="ispell"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_games"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_games -->
     <ignore name="patterns-kde-kde_games"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_pim"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_pim -->
     <ignore name="patterns-kde-kde_pim"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_utilities"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_utilities -->
     <ignore name="patterns-kde-kde_utilities"/>
     <package name="kcharselect"/>
-    <package name="aaa_base" replaces="plasma-nm5-openconnect"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-openconnect -->
     <ignore name="plasma-nm5-openconnect"/>
-    <package name="aaa_base" replaces="plasma-nm5-openvpn"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-openvpn -->
     <ignore name="plasma-nm5-openvpn"/>
-    <package name="aaa_base" replaces="kdoctools"/>
+    <!-- OBS-IgnorePackage: kdoctools -->
     <ignore name="kdoctools"/>
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="digikam"/>
+    <!-- OBS-IgnorePackage: digikam -->
     <ignore name="digikam"/>
-    <package name="aaa_base" replaces="gdb"/>
+    <!-- OBS-IgnorePackage: gdb -->
     <ignore name="gdb"/>
-    <package name="aaa_base" replaces="hugin"/>
+    <!-- OBS-IgnorePackage: hugin -->
     <ignore name="hugin"/>
-    <package name="aaa_base" replaces="icewm"/>
+    <!-- OBS-IgnorePackage: icewm -->
     <ignore name="icewm"/>
-    <package name="aaa_base" replaces="kmahjongg-lang"/>
+    <!-- OBS-IgnorePackage: kmahjongg-lang -->
     <ignore name="kmahjongg-lang"/>
-    <package name="aaa_base" replaces="konversation-lang"/>
+    <!-- OBS-IgnorePackage: konversation-lang -->
     <ignore name="konversation-lang"/>
-    <package name="aaa_base" replaces="libproxy1-pacrunner-webkit"/>
+    <!-- OBS-IgnorePackage: libproxy1-pacrunner-webkit -->
     <ignore name="libproxy1-pacrunner-webkit"/>
-    <package name="aaa_base" replaces="vlc"/>
+    <!-- OBS-IgnorePackage: vlc -->
     <ignore name="vlc"/>
-    <package name="aaa_base" replaces="vlc-qt"/>
+    <!-- OBS-IgnorePackage: vlc-qt -->
     <ignore name="vlc-qt"/>
-    <package name="aaa_base" replaces="vlc-lang"/>
+    <!-- OBS-IgnorePackage: vlc-lang -->
     <ignore name="vlc-lang"/>
-    <package name="aaa_base" replaces="kipi-plugins"/>
+    <!-- OBS-IgnorePackage: kipi-plugins -->
     <ignore name="kipi-plugins"/>
-    <package name="aaa_base" replaces="breeze5-wallpapers"/>
+    <!-- OBS-IgnorePackage: breeze5-wallpapers -->
     <ignore name="breeze5-wallpapers"/>
     <package name="partitionmanager"/>
-    <package name="aaa_base" replaces="cyrus-sasl"/>
+    <!-- OBS-IgnorePackage: cyrus-sasl -->
     <ignore name="cyrus-sasl"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts -->
     <ignore name="xorg-x11-fonts"/>
     <package name="alsa-firmware"/>
     <package name="opensuse-welcome"/>
-    <package name="aaa_base" replaces="bluedevil5"/>
+    <!-- OBS-IgnorePackage: bluedevil5 -->
     <ignore name="bluedevil5"/>
   </packages>
   <packages type="bootstrap">
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 2af0b05..c6e3e11 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-Rescue-CD" displayname="openSUSE Leap %OS_VERSION_ID% Rescue CD">
+<image schemaversion="7.4" name="openSUSE-Leap-%OS_VERSION_ID%-Rescue-CD" displayname="openSUSE Leap %OS_VERSION_ID% Rescue CD">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -57,289 +57,289 @@
     <archive name="livecd-udev.tar.xz"/>
     
     <!-- list-common.sh -->
-    <package name="aaa_base" replaces="poppler-data"/>
+    <!-- OBS-IgnorePackage: poppler-data -->
     <ignore name="poppler-data"/>
-    <package name="aaa_base" replaces="tin"/>
+    <!-- OBS-IgnorePackage: tin -->
     <ignore name="tin"/>
-    <package name="aaa_base" replaces="desktop-translations"/>
+    <!-- OBS-IgnorePackage: desktop-translations -->
     <ignore name="desktop-translations"/>
-    <package name="aaa_base" replaces="ft2demos"/>
+    <!-- OBS-IgnorePackage: ft2demos -->
     <ignore name="ft2demos"/>
-    <package name="aaa_base" replaces="gimp-help"/>
+    <!-- OBS-IgnorePackage: gimp-help -->
     <ignore name="gimp-help"/>
-    <package name="aaa_base" replaces="gimp-lang"/>
+    <!-- OBS-IgnorePackage: gimp-lang -->
     <ignore name="gimp-lang"/>
-    <package name="aaa_base" replaces="libreoffice-base"/>
+    <!-- OBS-IgnorePackage: libreoffice-base -->
     <ignore name="libreoffice-base"/>
-    <package name="aaa_base" replaces="libreoffice-mailmerge"/>
+    <!-- OBS-IgnorePackage: libreoffice-mailmerge -->
     <ignore name="libreoffice-mailmerge"/>
-    <package name="aaa_base" replaces="libreoffice-math"/>
+    <!-- OBS-IgnorePackage: libreoffice-math -->
     <ignore name="libreoffice-math"/>
-    <package name="aaa_base" replaces="libreoffice-filters-optional"/>
+    <!-- OBS-IgnorePackage: libreoffice-filters-optional -->
     <ignore name="libreoffice-filters-optional"/>
-    <package name="aaa_base" replaces="libreoffice-pyuno"/>
+    <!-- OBS-IgnorePackage: libreoffice-pyuno -->
     <ignore name="libreoffice-pyuno"/>
-    <package name="aaa_base" replaces="readline-doc"/>
+    <!-- OBS-IgnorePackage: readline-doc -->
     <ignore name="readline-doc"/>
-    <package name="aaa_base" replaces="graphviz"/>
+    <!-- OBS-IgnorePackage: graphviz -->
     <ignore name="graphviz"/>
-    <package name="aaa_base" replaces="linux-kernel-headers"/>
+    <!-- OBS-IgnorePackage: linux-kernel-headers -->
     <ignore name="linux-kernel-headers"/>
-    <package name="aaa_base" replaces="bash-doc"/>
+    <!-- OBS-IgnorePackage: bash-doc -->
     <ignore name="bash-doc"/>
-    <package name="aaa_base" replaces="gimp-plugins-python"/>
+    <!-- OBS-IgnorePackage: gimp-plugins-python -->
     <ignore name="gimp-plugins-python"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_basis_opt -->
     <ignore name="patterns-openSUSE-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_admin -->
     <ignore name="patterns-openSUSE-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_multimedia_opt -->
     <ignore name="patterns-openSUSE-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_imaging_opt -->
     <ignore name="patterns-openSUSE-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_office_opt -->
     <ignore name="patterns-openSUSE-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-apparmor_opt -->
     <ignore name="patterns-openSUSE-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-enhanced_base_opt -->
     <ignore name="patterns-openSUSE-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-fonts_opt -->
     <ignore name="patterns-openSUSE-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-imaging_opt -->
     <ignore name="patterns-openSUSE-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-kde_utilities_opt -->
     <ignore name="patterns-openSUSE-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-multimedia_opt -->
     <ignore name="patterns-openSUSE-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-office_opt -->
     <ignore name="patterns-openSUSE-office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-x11_opt -->
     <ignore name="patterns-openSUSE-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_basis_opt -->
     <ignore name="patterns-gnome-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-gmome-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-gmome-gnome_admin -->
     <ignore name="patterns-gmome-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_multimedia_opt -->
     <ignore name="patterns-gnome-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_imaging_opt -->
     <ignore name="patterns-gnome-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_office_opt -->
     <ignore name="patterns-gnome-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-apparmor_opt -->
     <ignore name="patterns-base-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-base-documentation"/>
+    <!-- OBS-IgnorePackage: patterns-base-documentation -->
     <ignore name="patterns-base-documentation"/>
-    <package name="aaa_base" replaces="patterns-base-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-enhanced_base_opt -->
     <ignore name="patterns-base-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-fonts-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-fonts-fonts_opt -->
     <ignore name="patterns-fonts-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-imaging_opt -->
     <ignore name="patterns-desktop-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_utilities_opt -->
     <ignore name="patterns-kde-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-multimedia_opt -->
     <ignore name="patterns-desktop-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-office-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-office-office_opt -->
     <ignore name="patterns-office-office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_opt -->
     <ignore name="patterns-base-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_enhanced"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_enhanced -->
     <ignore name="patterns-base-x11_enhanced"/>
-    <package name="aaa_base" replaces="make"/>
+    <!-- OBS-IgnorePackage: make -->
     <ignore name="make"/>
-    <package name="aaa_base" replaces="netpbm"/>
+    <!-- OBS-IgnorePackage: netpbm -->
     <ignore name="netpbm"/>
-    <package name="aaa_base" replaces="p7zip-full"/>
+    <!-- OBS-IgnorePackage: p7zip-full -->
     <ignore name="p7zip-full"/>
-    <package name="aaa_base" replaces="busybox-static"/>
+    <!-- OBS-IgnorePackage: busybox-static -->
     <ignore name="busybox-static"/>
-    <package name="aaa_base" replaces="inxi"/>
+    <!-- OBS-IgnorePackage: inxi -->
     <ignore name="inxi"/>
-    <package name="aaa_base" replaces="sane-backends"/>
+    <!-- OBS-IgnorePackage: sane-backends -->
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="aaa_base" replaces="glibc-32bit"/>
+    <!-- OBS-IgnorePackage: glibc-32bit -->
     <ignore name="glibc-32bit"/>
-    <package name="aaa_base" replaces="libvdpau_r300"/>
+    <!-- OBS-IgnorePackage: libvdpau_r300 -->
     <ignore name="libvdpau_r300"/>
-    <package name="aaa_base" replaces="libvdpau_radeonsi"/>
+    <!-- OBS-IgnorePackage: libvdpau_radeonsi -->
     <ignore name="libvdpau_radeonsi"/>
-    <package name="aaa_base" replaces="libvdpau_r600"/>
+    <!-- OBS-IgnorePackage: libvdpau_r600 -->
     <ignore name="libvdpau_r600"/>
-    <package name="aaa_base" replaces="pavucontrol"/>
+    <!-- OBS-IgnorePackage: pavucontrol -->
     <ignore name="pavucontrol"/>
-    <package name="aaa_base" replaces="libqmi-tools"/>
+    <!-- OBS-IgnorePackage: libqmi-tools -->
     <ignore name="libqmi-tools"/>
-    <package name="aaa_base" replaces="python*-pip"/>
+    <!-- OBS-IgnorePackage: python*-pip -->
     <ignore name="python*-pip"/>
-    <package name="aaa_base" replaces="multipath-tools-rbd"/>
+    <!-- OBS-IgnorePackage: multipath-tools-rbd -->
     <ignore name="multipath-tools-rbd"/>
-    <package name="aaa_base" replaces="acpica"/>
+    <!-- OBS-IgnorePackage: acpica -->
     <ignore name="acpica"/>
-    <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
+    <!-- OBS-IgnorePackage: xorg-x11-Xvnc -->
     <ignore name="xorg-x11-Xvnc"/>
-    <package name="aaa_base" replaces="cabextract"/>
+    <!-- OBS-IgnorePackage: cabextract -->
     <ignore name="cabextract"/>
-    <package name="aaa_base" replaces="sssd"/>
+    <!-- OBS-IgnorePackage: sssd -->
     <ignore name="sssd"/>
-    <package name="aaa_base" replaces="db-utils"/>
+    <!-- OBS-IgnorePackage: db-utils -->
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="dnsmasq"/>
+    <!-- OBS-IgnorePackage: dnsmasq -->
     <ignore name="dnsmasq"/>
-    <package name="aaa_base" replaces="fribidi"/>
+    <!-- OBS-IgnorePackage: fribidi -->
     <ignore name="fribidi"/>
-    <package name="aaa_base" replaces="ipmitool"/>
+    <!-- OBS-IgnorePackage: ipmitool -->
     <ignore name="ipmitool"/>
-    <package name="aaa_base" replaces="irda"/>
+    <!-- OBS-IgnorePackage: irda -->
     <ignore name="irda"/>
-    <package name="aaa_base" replaces="lomoco"/>
+    <!-- OBS-IgnorePackage: lomoco -->
     <ignore name="lomoco"/>
-    <package name="aaa_base" replaces="mksh"/>
+    <!-- OBS-IgnorePackage: mksh -->
     <ignore name="mksh"/>
-    <package name="aaa_base" replaces="cifs-utils"/>
+    <!-- OBS-IgnorePackage: cifs-utils -->
     <ignore name="cifs-utils"/>
-    <package name="aaa_base" replaces="gvfs-backend-samba"/>
+    <!-- OBS-IgnorePackage: gvfs-backend-samba -->
     <ignore name="gvfs-backend-samba"/>
-    <package name="aaa_base" replaces="xorg-x11"/>
+    <!-- OBS-IgnorePackage: xorg-x11 -->
     <ignore name="xorg-x11"/>
-    <package name="aaa_base" replaces="xorg-x11-essentials"/>
+    <!-- OBS-IgnorePackage: xorg-x11-essentials -->
     <ignore name="xorg-x11-essentials"/>
-    <package name="aaa_base" replaces="xorg-x11-server-extra"/>
+    <!-- OBS-IgnorePackage: xorg-x11-server-extra -->
     <ignore name="xorg-x11-server-extra"/>
     <package name="xdm"/>
     <package name="sysvinit-tools"/>
-    <package name="aaa_base" replaces="icewm"/>
+    <!-- OBS-IgnorePackage: icewm -->
     <ignore name="icewm"/>
-    <package name="aaa_base" replaces="baekmuk-ttf-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-ttf-fonts -->
     <ignore name="baekmuk-ttf-fonts"/>
-    <package name="aaa_base" replaces="google-droid-fonts"/>
+    <!-- OBS-IgnorePackage: google-droid-fonts -->
     <ignore name="google-droid-fonts"/>
-    <package name="aaa_base" replaces="efont-unicode-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: efont-unicode-bitmap-fonts -->
     <ignore name="efont-unicode-bitmap-fonts"/>
-    <package name="aaa_base" replaces="baekmuk-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-bitmap-fonts -->
     <ignore name="baekmuk-bitmap-fonts"/>
-    <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: intlfonts-chinese-big-bitmap-fonts -->
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-legacy -->
     <ignore name="xorg-x11-fonts-legacy"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-converted -->
     <ignore name="xorg-x11-fonts-converted"/>
-    <package name="aaa_base" replaces="strace"/>
+    <!-- OBS-IgnorePackage: strace -->
     <ignore name="strace"/>
-    <package name="aaa_base" replaces="tcsh"/>
+    <!-- OBS-IgnorePackage: tcsh -->
     <ignore name="tcsh"/>
-    <package name="aaa_base" replaces="usbmuxd"/>
+    <!-- OBS-IgnorePackage: usbmuxd -->
     <ignore name="usbmuxd"/>
-    <package name="aaa_base" replaces="gnome-keyring-pam"/>
+    <!-- OBS-IgnorePackage: gnome-keyring-pam -->
     <ignore name="gnome-keyring-pam"/>
-    <package name="aaa_base" replaces="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
-    <package name="aaa_base" replaces="apparmor-docs"/>
+    <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
-    <package name="aaa_base" replaces="mutt-doc"/>
+    <!-- OBS-IgnorePackage: mutt-doc -->
     <ignore name="mutt-doc"/>
-    <package name="aaa_base" replaces="coreutils-doc"/>
+    <!-- OBS-IgnorePackage: coreutils-doc -->
     <ignore name="coreutils-doc"/>
-    <package name="aaa_base" replaces="unar"/>
+    <!-- OBS-IgnorePackage: unar -->
     <ignore name="unar"/>
-    <package name="aaa_base" replaces="jing"/>
+    <!-- OBS-IgnorePackage: jing -->
     <ignore name="jing"/>
-    <package name="aaa_base" replaces="icedtea-web"/>
+    <!-- OBS-IgnorePackage: icedtea-web -->
     <ignore name="icedtea-web"/>
-    <package name="aaa_base" replaces="tigervnc"/>
+    <!-- OBS-IgnorePackage: tigervnc -->
     <ignore name="tigervnc"/>
-    <package name="aaa_base" replaces="autofs"/>
+    <!-- OBS-IgnorePackage: autofs -->
     <ignore name="autofs"/>
-    <package name="aaa_base" replaces="expect"/>
+    <!-- OBS-IgnorePackage: expect -->
     <ignore name="expect"/>
-    <package name="aaa_base" replaces="m4"/>
+    <!-- OBS-IgnorePackage: m4 -->
     <ignore name="m4"/>
-    <package name="aaa_base" replaces="mutt"/>
+    <!-- OBS-IgnorePackage: mutt -->
     <ignore name="mutt"/>
-    <package name="aaa_base" replaces="net-snmp"/>
+    <!-- OBS-IgnorePackage: net-snmp -->
     <ignore name="net-snmp"/>
-    <package name="aaa_base" replaces="procmail"/>
+    <!-- OBS-IgnorePackage: procmail -->
     <ignore name="procmail"/>
-    <package name="aaa_base" replaces="recode"/>
+    <!-- OBS-IgnorePackage: recode -->
     <ignore name="recode"/>
-    <package name="aaa_base" replaces="spax"/>
+    <!-- OBS-IgnorePackage: spax -->
     <ignore name="spax"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="espeak"/>
+    <!-- OBS-IgnorePackage: espeak -->
     <ignore name="espeak"/>
-    <package name="aaa_base" replaces="pam_mount"/>
+    <!-- OBS-IgnorePackage: pam_mount -->
     <ignore name="pam_mount"/>
-    <package name="aaa_base" replaces="groff-full"/>
+    <!-- OBS-IgnorePackage: groff-full -->
     <ignore name="groff-full"/>
-    <package name="aaa_base" replaces="tuned"/>
+    <!-- OBS-IgnorePackage: tuned -->
     <ignore name="tuned"/>
-    <package name="aaa_base" replaces="cups"/>
+    <!-- OBS-IgnorePackage: cups -->
     <ignore name="cups"/>
-    <package name="aaa_base" replaces="cups-client"/>
+    <!-- OBS-IgnorePackage: cups-client -->
     <ignore name="cups-client"/>
-    <package name="aaa_base" replaces="system-config-printer"/>
+    <!-- OBS-IgnorePackage: system-config-printer -->
     <ignore name="system-config-printer"/>
-    <package name="aaa_base" replaces="ghostscript"/>
+    <!-- OBS-IgnorePackage: ghostscript -->
     <ignore name="ghostscript"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-std"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-std -->
     <ignore name="ghostscript-fonts-std"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-other"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-other -->
     <ignore name="ghostscript-fonts-other"/>
-    <package name="aaa_base" replaces="manufacturer-PPDs"/>
+    <!-- OBS-IgnorePackage: manufacturer-PPDs -->
     <ignore name="manufacturer-PPDs"/>
-    <package name="aaa_base" replaces="gutenprint"/>
+    <!-- OBS-IgnorePackage: gutenprint -->
     <ignore name="gutenprint"/>
-    <package name="aaa_base" replaces="hplip-hpijs"/>
+    <!-- OBS-IgnorePackage: hplip-hpijs -->
     <ignore name="hplip-hpijs"/>
-    <package name="aaa_base" replaces="hplip"/>
+    <!-- OBS-IgnorePackage: hplip -->
     <ignore name="hplip"/>
-    <package name="aaa_base" replaces="system-config-printer-applet"/>
+    <!-- OBS-IgnorePackage: system-config-printer-applet -->
     <ignore name="system-config-printer-applet"/>
-    <package name="aaa_base" replaces="udev-configure-printer"/>
+    <!-- OBS-IgnorePackage: udev-configure-printer -->
     <ignore name="udev-configure-printer"/>
-    <package name="aaa_base" replaces="systemd-coredump"/>
+    <!-- OBS-IgnorePackage: systemd-coredump -->
     <ignore name="systemd-coredump"/>
-    <package name="aaa_base" replaces="systemd-doc"/>
+    <!-- OBS-IgnorePackage: systemd-doc -->
     <ignore name="systemd-doc"/>
-    <package name="aaa_base" replaces="man-pages"/>
+    <!-- OBS-IgnorePackage: man-pages -->
     <ignore name="man-pages"/>
-    <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
+    <!-- OBS-IgnorePackage: NetworkManager-vpnc-gnome -->
     <ignore name="NetworkManager-vpnc-gnome"/>
-    <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-vpnc -->
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <!-- OBS-IgnorePackage: busybox-sendmail -->
     <ignore name="busybox-sendmail"/>
-    <package name="aaa_base" replaces="exim"/>
+    <!-- OBS-IgnorePackage: exim -->
     <ignore name="exim"/>
-    <package name="aaa_base" replaces="msmtp-mta"/>
+    <!-- OBS-IgnorePackage: msmtp-mta -->
     <ignore name="msmtp-mta"/>
-    <package name="aaa_base" replaces="postfix"/>
+    <!-- OBS-IgnorePackage: postfix -->
     <ignore name="postfix"/>
-    <package name="aaa_base" replaces="postfix-bdb"/>
+    <!-- OBS-IgnorePackage: postfix-bdb -->
     <ignore name="postfix-bdb"/>
-    <package name="aaa_base" replaces="sendmail"/>
+    <!-- OBS-IgnorePackage: sendmail -->
     <ignore name="sendmail"/>
-    <package name="aaa_base" replaces="virtualbox-guest-tools"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-tools -->
     <ignore name="virtualbox-guest-tools"/>
-    <package name="aaa_base" replaces="virtualbox-guest-x11"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-x11 -->
     <ignore name="virtualbox-guest-x11"/>
-    <package name="aaa_base" replaces="intel-gpu-tools"/>
+    <!-- OBS-IgnorePackage: intel-gpu-tools -->
     <ignore name="intel-gpu-tools"/>
     <package name="spice-vdagent"/>
-    <package name="aaa_base" replaces="open-vm-tools"/>
+    <!-- OBS-IgnorePackage: open-vm-tools -->
     <ignore name="open-vm-tools"/>
-    <package name="aaa_base" replaces="usb_modeswitch"/>
+    <!-- OBS-IgnorePackage: usb_modeswitch -->
     <ignore name="usb_modeswitch"/>
-    <package name="aaa_base" replaces="gstreamer-plugins-rs"/>
+    <!-- OBS-IgnorePackage: gstreamer-plugins-rs -->
     <ignore name="gstreamer-plugins-rs"/>
-    <package name="aaa_base" replaces="vim-data"/>
+    <!-- OBS-IgnorePackage: vim-data -->
     <ignore name="vim-data"/>
-    <package name="aaa_base" replaces="vim"/>
+    <!-- OBS-IgnorePackage: vim -->
     <ignore name="vim"/>
     <package name="vim-small"/>
     <package name="kernel-default"/>
@@ -411,168 +411,168 @@
     <package name="xz"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
-    <package name="aaa_base" replaces="ntp"/>
+    <!-- OBS-IgnorePackage: ntp -->
     <ignore name="ntp"/>
-    <package name="aaa_base" replaces="wicked"/>
+    <!-- OBS-IgnorePackage: wicked -->
     <ignore name="wicked"/>
     <package name="ucode-amd" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="ucode-intel"/>
+    <!-- OBS-IgnorePackage: ucode-intel -->
     <ignore name="ucode-intel"/>
 
     <!-- list-x11.sh -->
-    <package name="aaa_base" replaces="NetworkManager-lang"/>
+    <!-- OBS-IgnorePackage: NetworkManager-lang -->
     <ignore name="NetworkManager-lang"/>
-    <package name="aaa_base" replaces="NetworkManager-applet-lang"/>
+    <!-- OBS-IgnorePackage: NetworkManager-applet-lang -->
     <ignore name="NetworkManager-applet-lang"/>
-    <package name="aaa_base" replaces="PackageKit"/>
+    <!-- OBS-IgnorePackage: PackageKit -->
     <ignore name="PackageKit"/>
-    <package name="aaa_base" replaces="samba-libs"/>
+    <!-- OBS-IgnorePackage: samba-libs -->
     <ignore name="samba-libs"/>
-    <package name="aaa_base" replaces="release-notes-openSUSE"/>
+    <!-- OBS-IgnorePackage: release-notes-openSUSE -->
     <ignore name="release-notes-openSUSE"/>
-    <package name="aaa_base" replaces="gnome-themes-accessibility"/>
+    <!-- OBS-IgnorePackage: gnome-themes-accessibility -->
     <ignore name="gnome-themes-accessibility"/>
-    <package name="aaa_base" replaces="xlockmore"/>
+    <!-- OBS-IgnorePackage: xlockmore -->
     <ignore name="xlockmore"/>
-    <package name="aaa_base" replaces="unzip-doc"/>
+    <!-- OBS-IgnorePackage: unzip-doc -->
     <ignore name="unzip-doc"/>
-    <package name="aaa_base" replaces="gtk2-immodule-inuktitut"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-inuktitut -->
     <ignore name="gtk2-immodule-inuktitut"/>
-    <package name="aaa_base" replaces="gtk2-immodule-thai"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-thai -->
     <ignore name="gtk2-immodule-thai"/>
-    <package name="aaa_base" replaces="gtk2-immodule-vietnamese"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-vietnamese -->
     <ignore name="gtk2-immodule-vietnamese"/>
-    <package name="aaa_base" replaces="gtk2-lang"/>
+    <!-- OBS-IgnorePackage: gtk2-lang -->
     <ignore name="gtk2-lang"/>
-    <package name="aaa_base" replaces="gtk3-immodule-inuktitut"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-inuktitut -->
     <ignore name="gtk3-immodule-inuktitut"/>
-    <package name="aaa_base" replaces="gtk3-immodule-thai"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-thai -->
     <ignore name="gtk3-immodule-thai"/>
-    <package name="aaa_base" replaces="gtk3-immodule-vietnamese"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-vietnamese -->
     <ignore name="gtk3-immodule-vietnamese"/>
-    <package name="aaa_base" replaces="gtk3-lang"/>
+    <!-- OBS-IgnorePackage: gtk3-lang -->
     <ignore name="gtk3-lang"/>
-    <package name="aaa_base" replaces="evince-lang"/>
+    <!-- OBS-IgnorePackage: evince-lang -->
     <ignore name="evince-lang"/>
-    <package name="aaa_base" replaces="hexchat-lang"/>
+    <!-- OBS-IgnorePackage: hexchat-lang -->
     <ignore name="hexchat-lang"/>
-    <package name="aaa_base" replaces="nano-lang"/>
+    <!-- OBS-IgnorePackage: nano-lang -->
     <ignore name="nano-lang"/>
-    <package name="aaa_base" replaces="zenity-lang"/>
+    <!-- OBS-IgnorePackage: zenity-lang -->
     <ignore name="zenity-lang"/>
-    <package name="aaa_base" replaces="gsettings-desktop-schema-lang"/>
+    <!-- OBS-IgnorePackage: gsettings-desktop-schema-lang -->
     <ignore name="gsettings-desktop-schema-lang"/>
-    <package name="aaa_base" replaces="gvfs-lang"/>
+    <!-- OBS-IgnorePackage: gvfs-lang -->
     <ignore name="gvfs-lang"/>
-    <package name="aaa_base" replaces="libstorage-ng-lang"/>
+    <!-- OBS-IgnorePackage: libstorage-ng-lang -->
     <ignore name="libstorage-ng-lang"/>
-    <package name="aaa_base" replaces="joe"/>
+    <!-- OBS-IgnorePackage: joe -->
     <ignore name="joe"/>
-    <package name="aaa_base" replaces="libgphoto2-6-lang"/>
+    <!-- OBS-IgnorePackage: libgphoto2-6-lang -->
     <ignore name="libgphoto2-6-lang"/>
-    <package name="aaa_base" replaces="alsa"/>
+    <!-- OBS-IgnorePackage: alsa -->
     <ignore name="alsa"/>
-    <package name="aaa_base" replaces="alsa-firmware"/>
+    <!-- OBS-IgnorePackage: alsa-firmware -->
     <ignore name="alsa-firmware"/>
-    <package name="aaa_base" replaces="alsa-plugins"/>
+    <!-- OBS-IgnorePackage: alsa-plugins -->
     <ignore name="alsa-plugins"/>
-    <package name="aaa_base" replaces="xscreensaver"/>
+    <!-- OBS-IgnorePackage: xscreensaver -->
     <ignore name="xscreensaver"/>
-    <package name="aaa_base" replaces="PackageKit-gstreamer-plugin"/>
+    <!-- OBS-IgnorePackage: PackageKit-gstreamer-plugin -->
     <ignore name="PackageKit-gstreamer-plugin"/>
-    <package name="aaa_base" replaces="ImageMagick"/>
+    <!-- OBS-IgnorePackage: ImageMagick -->
     <ignore name="ImageMagick"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="sbl"/>
+    <!-- OBS-IgnorePackage: sbl -->
     <ignore name="sbl"/>
-    <package name="aaa_base" replaces="gnome-online-accounts"/>
+    <!-- OBS-IgnorePackage: gnome-online-accounts -->
     <ignore name="gnome-online-accounts"/>
-    <package name="aaa_base" replaces="snapper"/>
+    <!-- OBS-IgnorePackage: snapper -->
     <ignore name="snapper"/>
-    <package name="aaa_base" replaces="patterns-yast-yast2_basis"/>
+    <!-- OBS-IgnorePackage: patterns-yast-yast2_basis -->
     <ignore name="patterns-yast-yast2_basis"/>
-    <package name="aaa_base" replaces="yast2-control-center"/>
+    <!-- OBS-IgnorePackage: yast2-control-center -->
     <ignore name="yast2-control-center"/>
-    <package name="aaa_base" replaces="yast2-control-center-qt"/>
+    <!-- OBS-IgnorePackage: yast2-control-center-qt -->
     <ignore name="yast2-control-center-qt"/>
-    <package name="aaa_base" replaces="libyui*"/>
+    <!-- OBS-IgnorePackage: libyui* -->
     <ignore name="libyui*"/>
-    <package name="aaa_base" replaces="Mesa-libva"/>
+    <!-- OBS-IgnorePackage: Mesa-libva -->
     <ignore name="Mesa-libva"/>
-    <package name="aaa_base" replaces="python-base"/>
+    <!-- OBS-IgnorePackage: python-base -->
     <ignore name="python-base"/>
-    <package name="aaa_base" replaces="python38-pip"/>
+    <!-- OBS-IgnorePackage: python38-pip -->
     <ignore name="python38-pip"/>
-    <package name="aaa_base" replaces="libpeas-loader-python"/>
+    <!-- OBS-IgnorePackage: libpeas-loader-python -->
     <ignore name="libpeas-loader-python"/>
-    <package name="aaa_base" replaces="aspell-en"/>
+    <!-- OBS-IgnorePackage: aspell-en -->
     <ignore name="aspell-en"/>
-    <package name="aaa_base" replaces="ModemManager"/>
+    <!-- OBS-IgnorePackage: ModemManager -->
     <ignore name="ModemManager"/>
-    <package name="aaa_base" replaces="avahi"/>
+    <!-- OBS-IgnorePackage: avahi -->
     <ignore name="avahi"/>
-    <package name="aaa_base" replaces="fprintd"/>
+    <!-- OBS-IgnorePackage: fprintd -->
     <ignore name="fprintd"/>
-    <package name="aaa_base" replaces="MozillaFirefox"/>
+    <!-- OBS-IgnorePackage: MozillaFirefox -->
     <ignore name="MozillaFirefox"/>
-    <package name="aaa_base" replaces="tcpdump"/>
+    <!-- OBS-IgnorePackage: tcpdump -->
     <ignore name="tcpdump"/>
     <package name="gparted"/>
     <package name="epiphany"/>
-    <package name="aaa_base" replaces="gparted-lang"/>
+    <!-- OBS-IgnorePackage: gparted-lang -->
     <ignore name="gparted-lang"/>
-    <package name="aaa_base" replaces="epiaphy-lang"/>
+    <!-- OBS-IgnorePackage: epiaphy-lang -->
     <ignore name="epiaphy-lang"/>
-    <package name="aaa_base" replaces="iso-codes-lang"/>
+    <!-- OBS-IgnorePackage: iso-codes-lang -->
     <ignore name="iso-codes-lang"/>
-    <package name="aaa_base" replaces="glib2-lang"/>
+    <!-- OBS-IgnorePackage: glib2-lang -->
     <ignore name="glib2-lang"/>
-    <package name="aaa_base" replaces="thunar-lang"/>
+    <!-- OBS-IgnorePackage: thunar-lang -->
     <ignore name="thunar-lang"/>
-    <package name="aaa_base" replaces="xfce4-settings-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-settings-lang -->
     <ignore name="xfce4-settings-lang"/>
-    <package name="aaa_base" replaces="xfce4-panel-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-panel-lang -->
     <ignore name="xfce4-panel-lang"/>
-    <package name="aaa_base" replaces="xfce-terminal-lang"/>
+    <!-- OBS-IgnorePackage: xfce-terminal-lang -->
     <ignore name="xfce-terminal-lang"/>
-    <package name="aaa_base" replaces="exo-lang"/>
+    <!-- OBS-IgnorePackage: exo-lang -->
     <ignore name="exo-lang"/>
-    <package name="aaa_base" replaces="xfdesktop-lang"/>
+    <!-- OBS-IgnorePackage: xfdesktop-lang -->
     <ignore name="xfdesktop-lang"/>
-    <package name="aaa_base" replaces="xfce4-power-manager-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-power-manager-lang -->
     <ignore name="xfce4-power-manager-lang"/>
-    <package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-cjk-fonts -->
     <ignore name="noto-sans-cjk-fonts"/>
-    <package name="aaa_base" replaces="man-pages-posix"/>
+    <!-- OBS-IgnorePackage: man-pages-posix -->
     <ignore name="man-pages-posix"/>
-    <package name="aaa_base" replaces="libvulkan_radeon"/>
+    <!-- OBS-IgnorePackage: libvulkan_radeon -->
     <ignore name="libvulkan_radeon"/>
-    <package name="aaa_base" replaces="man"/>
+    <!-- OBS-IgnorePackage: man -->
     <ignore name="man"/>
-    <package name="aaa_base" replaces="groff"/>
+    <!-- OBS-IgnorePackage: groff -->
     <ignore name="groff"/>
-    <package name="aaa_base" replaces="libqt5-qttranslations"/>
+    <!-- OBS-IgnorePackage: libqt5-qttranslations -->
     <ignore name="libqt5-qttranslations"/>
-    <package name="aaa_base" replaces="plymouth"/>
+    <!-- OBS-IgnorePackage: plymouth -->
     <ignore name="plymouth"/>
-    <package name="aaa_base" replaces="7zip"/>
+    <!-- OBS-IgnorePackage: 7zip -->
     <ignore name="7zip"/>
-    <package name="aaa_base" replaces="tumbler"/>
+    <!-- OBS-IgnorePackage: tumbler -->
     <ignore name="tumbler"/>
-    <package name="aaa_base" replaces="ristretto"/>
+    <!-- OBS-IgnorePackage: ristretto -->
     <ignore name="ristretto"/>
-    <package name="aaa_base" replaces="cyrus-sasl"/>
+    <!-- OBS-IgnorePackage: cyrus-sasl -->
     <ignore name="cyrus-sasl"/>
-    <package name="aaa_base" replaces="deltarpm"/>
+    <!-- OBS-IgnorePackage: deltarpm -->
     <ignore name="deltarpm"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts -->
     <ignore name="xorg-x11-fonts"/>
-    <package name="aaa_base" replaces="Mesa-dri-nouveau"/>
+    <!-- OBS-IgnorePackage: Mesa-dri-nouveau -->
     <ignore name="Mesa-dri-nouveau"/>
-    <package name="aaa_base" replaces="libvdpau_nouveau"/>
+    <!-- OBS-IgnorePackage: libvdpau_nouveau -->
     <ignore name="libvdpau_nouveau"/>
-    <package name="aaa_base" replaces="gstreamer-plugins-bad"/>
+    <!-- OBS-IgnorePackage: gstreamer-plugins-bad -->
     <ignore name="gstreamer-plugins-bad"/>
     <package name="patterns-xfce-xfce_basis"/>
     <namedCollection name="xfce_basis"/>
@@ -607,7 +607,7 @@
     <package name="NetworkManager-applet"/>
     <package name="xfce4-panel-plugin-xkb"/>
     <package name="xfce4-terminal"/>
-    <package name="aaa_base" replaces="argyllcms"/>
+    <!-- OBS-IgnorePackage: argyllcms -->
     <ignore name="argyllcms"/>
   </packages>
   <packages type="bootstrap">
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index c94566a..1b4060a 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-XFCE-Live" displayname="openSUSE Leap %OS_VERSION_ID% XFCE Live">
+<image schemaversion="7.4" name="openSUSE-Leap-%OS_VERSION_ID%-XFCE-Live" displayname="openSUSE Leap %OS_VERSION_ID% XFCE Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_XFCE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_XFCE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_XFCE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_XFCE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -57,289 +57,289 @@
     <archive name="livecd-udev.tar.xz"/>
     
     <!-- list-common.sh -->
-    <package name="aaa_base" replaces="poppler-data"/>
+    <!-- OBS-IgnorePackage: poppler-data -->
     <ignore name="poppler-data"/>
-    <package name="aaa_base" replaces="tin"/>
+    <!-- OBS-IgnorePackage: tin -->
     <ignore name="tin"/>
-    <package name="aaa_base" replaces="desktop-translations"/>
+    <!-- OBS-IgnorePackage: desktop-translations -->
     <ignore name="desktop-translations"/>
-    <package name="aaa_base" replaces="ft2demos"/>
+    <!-- OBS-IgnorePackage: ft2demos -->
     <ignore name="ft2demos"/>
-    <package name="aaa_base" replaces="gimp-help"/>
+    <!-- OBS-IgnorePackage: gimp-help -->
     <ignore name="gimp-help"/>
-    <package name="aaa_base" replaces="gimp-lang"/>
+    <!-- OBS-IgnorePackage: gimp-lang -->
     <ignore name="gimp-lang"/>
-    <package name="aaa_base" replaces="libreoffice-base"/>
+    <!-- OBS-IgnorePackage: libreoffice-base -->
     <ignore name="libreoffice-base"/>
-    <package name="aaa_base" replaces="libreoffice-mailmerge"/>
+    <!-- OBS-IgnorePackage: libreoffice-mailmerge -->
     <ignore name="libreoffice-mailmerge"/>
-    <package name="aaa_base" replaces="libreoffice-math"/>
+    <!-- OBS-IgnorePackage: libreoffice-math -->
     <ignore name="libreoffice-math"/>
-    <package name="aaa_base" replaces="libreoffice-filters-optional"/>
+    <!-- OBS-IgnorePackage: libreoffice-filters-optional -->
     <ignore name="libreoffice-filters-optional"/>
-    <package name="aaa_base" replaces="libreoffice-pyuno"/>
+    <!-- OBS-IgnorePackage: libreoffice-pyuno -->
     <ignore name="libreoffice-pyuno"/>
-    <package name="aaa_base" replaces="readline-doc"/>
+    <!-- OBS-IgnorePackage: readline-doc -->
     <ignore name="readline-doc"/>
-    <package name="aaa_base" replaces="graphviz"/>
+    <!-- OBS-IgnorePackage: graphviz -->
     <ignore name="graphviz"/>
-    <package name="aaa_base" replaces="linux-kernel-headers"/>
+    <!-- OBS-IgnorePackage: linux-kernel-headers -->
     <ignore name="linux-kernel-headers"/>
-    <package name="aaa_base" replaces="bash-doc"/>
+    <!-- OBS-IgnorePackage: bash-doc -->
     <ignore name="bash-doc"/>
-    <package name="aaa_base" replaces="gimp-plugins-python"/>
+    <!-- OBS-IgnorePackage: gimp-plugins-python -->
     <ignore name="gimp-plugins-python"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_basis_opt -->
     <ignore name="patterns-openSUSE-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_admin -->
     <ignore name="patterns-openSUSE-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_multimedia_opt -->
     <ignore name="patterns-openSUSE-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_imaging_opt -->
     <ignore name="patterns-openSUSE-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_office_opt -->
     <ignore name="patterns-openSUSE-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-apparmor_opt -->
     <ignore name="patterns-openSUSE-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-enhanced_base_opt -->
     <ignore name="patterns-openSUSE-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-fonts_opt -->
     <ignore name="patterns-openSUSE-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-imaging_opt -->
     <ignore name="patterns-openSUSE-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-kde_utilities_opt -->
     <ignore name="patterns-openSUSE-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-multimedia_opt -->
     <ignore name="patterns-openSUSE-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-office_opt -->
     <ignore name="patterns-openSUSE-office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-x11_opt -->
     <ignore name="patterns-openSUSE-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_basis_opt -->
     <ignore name="patterns-gnome-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-gmome-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-gmome-gnome_admin -->
     <ignore name="patterns-gmome-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_multimedia_opt -->
     <ignore name="patterns-gnome-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_imaging_opt -->
     <ignore name="patterns-gnome-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_office_opt -->
     <ignore name="patterns-gnome-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-apparmor_opt -->
     <ignore name="patterns-base-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-base-documentation"/>
+    <!-- OBS-IgnorePackage: patterns-base-documentation -->
     <ignore name="patterns-base-documentation"/>
-    <package name="aaa_base" replaces="patterns-base-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-enhanced_base_opt -->
     <ignore name="patterns-base-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-fonts-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-fonts-fonts_opt -->
     <ignore name="patterns-fonts-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-imaging_opt -->
     <ignore name="patterns-desktop-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_utilities_opt -->
     <ignore name="patterns-kde-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-multimedia_opt -->
     <ignore name="patterns-desktop-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-office-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-office-office_opt -->
     <ignore name="patterns-office-office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_opt -->
     <ignore name="patterns-base-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_enhanced"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_enhanced -->
     <ignore name="patterns-base-x11_enhanced"/>
-    <package name="aaa_base" replaces="make"/>
+    <!-- OBS-IgnorePackage: make -->
     <ignore name="make"/>
-    <package name="aaa_base" replaces="netpbm"/>
+    <!-- OBS-IgnorePackage: netpbm -->
     <ignore name="netpbm"/>
-    <package name="aaa_base" replaces="p7zip-full"/>
+    <!-- OBS-IgnorePackage: p7zip-full -->
     <ignore name="p7zip-full"/>
-    <package name="aaa_base" replaces="busybox-static"/>
+    <!-- OBS-IgnorePackage: busybox-static -->
     <ignore name="busybox-static"/>
-    <package name="aaa_base" replaces="inxi"/>
+    <!-- OBS-IgnorePackage: inxi -->
     <ignore name="inxi"/>
-    <package name="aaa_base" replaces="sane-backends"/>
+    <!-- OBS-IgnorePackage: sane-backends -->
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="aaa_base" replaces="glibc-32bit"/>
+    <!-- OBS-IgnorePackage: glibc-32bit -->
     <ignore name="glibc-32bit"/>
-    <package name="aaa_base" replaces="libvdpau_r300"/>
+    <!-- OBS-IgnorePackage: libvdpau_r300 -->
     <ignore name="libvdpau_r300"/>
-    <package name="aaa_base" replaces="libvdpau_radeonsi"/>
+    <!-- OBS-IgnorePackage: libvdpau_radeonsi -->
     <ignore name="libvdpau_radeonsi"/>
-    <package name="aaa_base" replaces="libvdpau_r600"/>
+    <!-- OBS-IgnorePackage: libvdpau_r600 -->
     <ignore name="libvdpau_r600"/>
-    <package name="aaa_base" replaces="pavucontrol"/>
+    <!-- OBS-IgnorePackage: pavucontrol -->
     <ignore name="pavucontrol"/>
-    <package name="aaa_base" replaces="libqmi-tools"/>
+    <!-- OBS-IgnorePackage: libqmi-tools -->
     <ignore name="libqmi-tools"/>
-    <package name="aaa_base" replaces="python*-pip"/>
+    <!-- OBS-IgnorePackage: python*-pip -->
     <ignore name="python*-pip"/>
-    <package name="aaa_base" replaces="multipath-tools-rbd"/>
+    <!-- OBS-IgnorePackage: multipath-tools-rbd -->
     <ignore name="multipath-tools-rbd"/>
-    <package name="aaa_base" replaces="acpica"/>
+    <!-- OBS-IgnorePackage: acpica -->
     <ignore name="acpica"/>
-    <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
+    <!-- OBS-IgnorePackage: xorg-x11-Xvnc -->
     <ignore name="xorg-x11-Xvnc"/>
-    <package name="aaa_base" replaces="cabextract"/>
+    <!-- OBS-IgnorePackage: cabextract -->
     <ignore name="cabextract"/>
-    <package name="aaa_base" replaces="sssd"/>
+    <!-- OBS-IgnorePackage: sssd -->
     <ignore name="sssd"/>
-    <package name="aaa_base" replaces="db-utils"/>
+    <!-- OBS-IgnorePackage: db-utils -->
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="dnsmasq"/>
+    <!-- OBS-IgnorePackage: dnsmasq -->
     <ignore name="dnsmasq"/>
-    <package name="aaa_base" replaces="fribidi"/>
+    <!-- OBS-IgnorePackage: fribidi -->
     <ignore name="fribidi"/>
-    <package name="aaa_base" replaces="ipmitool"/>
+    <!-- OBS-IgnorePackage: ipmitool -->
     <ignore name="ipmitool"/>
-    <package name="aaa_base" replaces="irda"/>
+    <!-- OBS-IgnorePackage: irda -->
     <ignore name="irda"/>
-    <package name="aaa_base" replaces="lomoco"/>
+    <!-- OBS-IgnorePackage: lomoco -->
     <ignore name="lomoco"/>
-    <package name="aaa_base" replaces="mksh"/>
+    <!-- OBS-IgnorePackage: mksh -->
     <ignore name="mksh"/>
-    <package name="aaa_base" replaces="cifs-utils"/>
+    <!-- OBS-IgnorePackage: cifs-utils -->
     <ignore name="cifs-utils"/>
-    <package name="aaa_base" replaces="gvfs-backend-samba"/>
+    <!-- OBS-IgnorePackage: gvfs-backend-samba -->
     <ignore name="gvfs-backend-samba"/>
-    <package name="aaa_base" replaces="xorg-x11"/>
+    <!-- OBS-IgnorePackage: xorg-x11 -->
     <ignore name="xorg-x11"/>
-    <package name="aaa_base" replaces="xorg-x11-essentials"/>
+    <!-- OBS-IgnorePackage: xorg-x11-essentials -->
     <ignore name="xorg-x11-essentials"/>
-    <package name="aaa_base" replaces="xorg-x11-server-extra"/>
+    <!-- OBS-IgnorePackage: xorg-x11-server-extra -->
     <ignore name="xorg-x11-server-extra"/>
     <package name="xdm"/>
     <package name="sysvinit-tools"/>
-    <package name="aaa_base" replaces="icewm"/>
+    <!-- OBS-IgnorePackage: icewm -->
     <ignore name="icewm"/>
-    <package name="aaa_base" replaces="baekmuk-ttf-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-ttf-fonts -->
     <ignore name="baekmuk-ttf-fonts"/>
-    <package name="aaa_base" replaces="google-droid-fonts"/>
+    <!-- OBS-IgnorePackage: google-droid-fonts -->
     <ignore name="google-droid-fonts"/>
-    <package name="aaa_base" replaces="efont-unicode-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: efont-unicode-bitmap-fonts -->
     <ignore name="efont-unicode-bitmap-fonts"/>
-    <package name="aaa_base" replaces="baekmuk-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-bitmap-fonts -->
     <ignore name="baekmuk-bitmap-fonts"/>
-    <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: intlfonts-chinese-big-bitmap-fonts -->
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-legacy -->
     <ignore name="xorg-x11-fonts-legacy"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-converted -->
     <ignore name="xorg-x11-fonts-converted"/>
-    <package name="aaa_base" replaces="strace"/>
+    <!-- OBS-IgnorePackage: strace -->
     <ignore name="strace"/>
-    <package name="aaa_base" replaces="tcsh"/>
+    <!-- OBS-IgnorePackage: tcsh -->
     <ignore name="tcsh"/>
-    <package name="aaa_base" replaces="usbmuxd"/>
+    <!-- OBS-IgnorePackage: usbmuxd -->
     <ignore name="usbmuxd"/>
-    <package name="aaa_base" replaces="gnome-keyring-pam"/>
+    <!-- OBS-IgnorePackage: gnome-keyring-pam -->
     <ignore name="gnome-keyring-pam"/>
-    <package name="aaa_base" replaces="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
-    <package name="aaa_base" replaces="apparmor-docs"/>
+    <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
-    <package name="aaa_base" replaces="mutt-doc"/>
+    <!-- OBS-IgnorePackage: mutt-doc -->
     <ignore name="mutt-doc"/>
-    <package name="aaa_base" replaces="coreutils-doc"/>
+    <!-- OBS-IgnorePackage: coreutils-doc -->
     <ignore name="coreutils-doc"/>
-    <package name="aaa_base" replaces="unar"/>
+    <!-- OBS-IgnorePackage: unar -->
     <ignore name="unar"/>
-    <package name="aaa_base" replaces="jing"/>
+    <!-- OBS-IgnorePackage: jing -->
     <ignore name="jing"/>
-    <package name="aaa_base" replaces="icedtea-web"/>
+    <!-- OBS-IgnorePackage: icedtea-web -->
     <ignore name="icedtea-web"/>
-    <package name="aaa_base" replaces="tigervnc"/>
+    <!-- OBS-IgnorePackage: tigervnc -->
     <ignore name="tigervnc"/>
-    <package name="aaa_base" replaces="autofs"/>
+    <!-- OBS-IgnorePackage: autofs -->
     <ignore name="autofs"/>
-    <package name="aaa_base" replaces="expect"/>
+    <!-- OBS-IgnorePackage: expect -->
     <ignore name="expect"/>
-    <package name="aaa_base" replaces="m4"/>
+    <!-- OBS-IgnorePackage: m4 -->
     <ignore name="m4"/>
-    <package name="aaa_base" replaces="mutt"/>
+    <!-- OBS-IgnorePackage: mutt -->
     <ignore name="mutt"/>
-    <package name="aaa_base" replaces="net-snmp"/>
+    <!-- OBS-IgnorePackage: net-snmp -->
     <ignore name="net-snmp"/>
-    <package name="aaa_base" replaces="procmail"/>
+    <!-- OBS-IgnorePackage: procmail -->
     <ignore name="procmail"/>
-    <package name="aaa_base" replaces="recode"/>
+    <!-- OBS-IgnorePackage: recode -->
     <ignore name="recode"/>
-    <package name="aaa_base" replaces="spax"/>
+    <!-- OBS-IgnorePackage: spax -->
     <ignore name="spax"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="espeak"/>
+    <!-- OBS-IgnorePackage: espeak -->
     <ignore name="espeak"/>
-    <package name="aaa_base" replaces="pam_mount"/>
+    <!-- OBS-IgnorePackage: pam_mount -->
     <ignore name="pam_mount"/>
-    <package name="aaa_base" replaces="groff-full"/>
+    <!-- OBS-IgnorePackage: groff-full -->
     <ignore name="groff-full"/>
-    <package name="aaa_base" replaces="tuned"/>
+    <!-- OBS-IgnorePackage: tuned -->
     <ignore name="tuned"/>
-    <package name="aaa_base" replaces="cups"/>
+    <!-- OBS-IgnorePackage: cups -->
     <ignore name="cups"/>
-    <package name="aaa_base" replaces="cups-client"/>
+    <!-- OBS-IgnorePackage: cups-client -->
     <ignore name="cups-client"/>
-    <package name="aaa_base" replaces="system-config-printer"/>
+    <!-- OBS-IgnorePackage: system-config-printer -->
     <ignore name="system-config-printer"/>
-    <package name="aaa_base" replaces="ghostscript"/>
+    <!-- OBS-IgnorePackage: ghostscript -->
     <ignore name="ghostscript"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-std"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-std -->
     <ignore name="ghostscript-fonts-std"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-other"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-other -->
     <ignore name="ghostscript-fonts-other"/>
-    <package name="aaa_base" replaces="manufacturer-PPDs"/>
+    <!-- OBS-IgnorePackage: manufacturer-PPDs -->
     <ignore name="manufacturer-PPDs"/>
-    <package name="aaa_base" replaces="gutenprint"/>
+    <!-- OBS-IgnorePackage: gutenprint -->
     <ignore name="gutenprint"/>
-    <package name="aaa_base" replaces="hplip-hpijs"/>
+    <!-- OBS-IgnorePackage: hplip-hpijs -->
     <ignore name="hplip-hpijs"/>
-    <package name="aaa_base" replaces="hplip"/>
+    <!-- OBS-IgnorePackage: hplip -->
     <ignore name="hplip"/>
-    <package name="aaa_base" replaces="system-config-printer-applet"/>
+    <!-- OBS-IgnorePackage: system-config-printer-applet -->
     <ignore name="system-config-printer-applet"/>
-    <package name="aaa_base" replaces="udev-configure-printer"/>
+    <!-- OBS-IgnorePackage: udev-configure-printer -->
     <ignore name="udev-configure-printer"/>
-    <package name="aaa_base" replaces="systemd-coredump"/>
+    <!-- OBS-IgnorePackage: systemd-coredump -->
     <ignore name="systemd-coredump"/>
-    <package name="aaa_base" replaces="systemd-doc"/>
+    <!-- OBS-IgnorePackage: systemd-doc -->
     <ignore name="systemd-doc"/>
-    <package name="aaa_base" replaces="man-pages"/>
+    <!-- OBS-IgnorePackage: man-pages -->
     <ignore name="man-pages"/>
-    <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
+    <!-- OBS-IgnorePackage: NetworkManager-vpnc-gnome -->
     <ignore name="NetworkManager-vpnc-gnome"/>
-    <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-vpnc -->
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <!-- OBS-IgnorePackage: busybox-sendmail -->
     <ignore name="busybox-sendmail"/>
-    <package name="aaa_base" replaces="exim"/>
+    <!-- OBS-IgnorePackage: exim -->
     <ignore name="exim"/>
-    <package name="aaa_base" replaces="msmtp-mta"/>
+    <!-- OBS-IgnorePackage: msmtp-mta -->
     <ignore name="msmtp-mta"/>
-    <package name="aaa_base" replaces="postfix"/>
+    <!-- OBS-IgnorePackage: postfix -->
     <ignore name="postfix"/>
-    <package name="aaa_base" replaces="postfix-bdb"/>
+    <!-- OBS-IgnorePackage: postfix-bdb -->
     <ignore name="postfix-bdb"/>
-    <package name="aaa_base" replaces="sendmail"/>
+    <!-- OBS-IgnorePackage: sendmail -->
     <ignore name="sendmail"/>
-    <package name="aaa_base" replaces="virtualbox-guest-tools"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-tools -->
     <ignore name="virtualbox-guest-tools"/>
-    <package name="aaa_base" replaces="virtualbox-guest-x11"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-x11 -->
     <ignore name="virtualbox-guest-x11"/>
-    <package name="aaa_base" replaces="intel-gpu-tools"/>
+    <!-- OBS-IgnorePackage: intel-gpu-tools -->
     <ignore name="intel-gpu-tools"/>
     <package name="spice-vdagent"/>
-    <package name="aaa_base" replaces="open-vm-tools"/>
+    <!-- OBS-IgnorePackage: open-vm-tools -->
     <ignore name="open-vm-tools"/>
-    <package name="aaa_base" replaces="usb_modeswitch"/>
+    <!-- OBS-IgnorePackage: usb_modeswitch -->
     <ignore name="usb_modeswitch"/>
-    <package name="aaa_base" replaces="gstreamer-plugins-rs"/>
+    <!-- OBS-IgnorePackage: gstreamer-plugins-rs -->
     <ignore name="gstreamer-plugins-rs"/>
-    <package name="aaa_base" replaces="vim-data"/>
+    <!-- OBS-IgnorePackage: vim-data -->
     <ignore name="vim-data"/>
-    <package name="aaa_base" replaces="vim"/>
+    <!-- OBS-IgnorePackage: vim -->
     <ignore name="vim"/>
     <package name="vim-small"/>
     <package name="kernel-default"/>
@@ -411,12 +411,12 @@
     <package name="xz"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
-    <package name="aaa_base" replaces="ntp"/>
+    <!-- OBS-IgnorePackage: ntp -->
     <ignore name="ntp"/>
-    <package name="aaa_base" replaces="wicked"/>
+    <!-- OBS-IgnorePackage: wicked -->
     <ignore name="wicked"/>
     <package name="ucode-amd" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="ucode-intel"/>
+    <!-- OBS-IgnorePackage: ucode-intel -->
     <ignore name="ucode-intel"/>
 
     <!-- list-xfce.sh -->
@@ -424,35 +424,35 @@
     <package name="yast2-trans-stats"/>
     <package name="patterns-xfce-xfce"/>
     <namedCollection name="xfce"/>
-    <package name="aaa_base" replaces="gnome-themes-accessibility"/>
+    <!-- OBS-IgnorePackage: gnome-themes-accessibility -->
     <ignore name="gnome-themes-accessibility"/>
-    <package name="aaa_base" replaces="xlockmore"/>
+    <!-- OBS-IgnorePackage: xlockmore -->
     <ignore name="xlockmore"/>
-    <package name="aaa_base" replaces="unzip-doc"/>
+    <!-- OBS-IgnorePackage: unzip-doc -->
     <ignore name="unzip-doc"/>
-    <package name="aaa_base" replaces="gtk2-immodule-inuktitut"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-inuktitut -->
     <ignore name="gtk2-immodule-inuktitut"/>
-    <package name="aaa_base" replaces="gtk2-immodule-thai"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-thai -->
     <ignore name="gtk2-immodule-thai"/>
-    <package name="aaa_base" replaces="gtk2-immodule-vietnamese"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-vietnamese -->
     <ignore name="gtk2-immodule-vietnamese"/>
-    <package name="aaa_base" replaces="gtk3-immodule-inuktitut"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-inuktitut -->
     <ignore name="gtk3-immodule-inuktitut"/>
-    <package name="aaa_base" replaces="gtk3-immodule-thai"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-thai -->
     <ignore name="gtk3-immodule-thai"/>
-    <package name="aaa_base" replaces="gtk3-immodule-vietnamese"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-vietnamese -->
     <ignore name="gtk3-immodule-vietnamese"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="sbl"/>
+    <!-- OBS-IgnorePackage: sbl -->
     <ignore name="sbl"/>
-    <package name="aaa_base" replaces="gnome-online-accounts"/>
+    <!-- OBS-IgnorePackage: gnome-online-accounts -->
     <ignore name="gnome-online-accounts"/>
-    <package name="aaa_base" replaces="samba"/>
+    <!-- OBS-IgnorePackage: samba -->
     <ignore name="samba"/>
-    <package name="aaa_base" replaces="xdg-desktop-portal"/>
+    <!-- OBS-IgnorePackage: xdg-desktop-portal -->
     <ignore name="xdg-desktop-portal"/>
-    <package name="aaa_base" replaces="pragha"/>
+    <!-- OBS-IgnorePackage: pragha -->
     <ignore name="pragha"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
@@ -462,15 +462,15 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
-    <package name="aaa_base" replaces="yast2-samba-client"/>
+    <!-- OBS-IgnorePackage: yast2-samba-client -->
     <ignore name="yast2-samba-client"/>
-    <package name="aaa_base" replaces="yast2-vpn"/>
+    <!-- OBS-IgnorePackage: yast2-vpn -->
     <ignore name="yast2-vpn"/>
-    <package name="aaa_base" replaces="yast2-journal"/>
+    <!-- OBS-IgnorePackage: yast2-journal -->
     <ignore name="yast2-journal"/>
-    <package name="aaa_base" replaces="yast2-auth-client"/>
+    <!-- OBS-IgnorePackage: yast2-auth-client -->
     <ignore name="yast2-auth-client"/>
-    <package name="aaa_base" replaces="yast2-sudo"/>
+    <!-- OBS-IgnorePackage: yast2-sudo -->
     <ignore name="yast2-sudo"/>
     <package name="yast2-trans-de"/>
     <package name="yast2-trans-cs"/>
@@ -491,31 +491,31 @@
     <package name="lklug-fonts"/>
     <package name="indic-fonts"/>
     <package name="arabic-kacst-fonts"/>
-    <package name="aaa_base" replaces="aspell-en"/>
+    <!-- OBS-IgnorePackage: aspell-en -->
     <ignore name="aspell-en"/>
     <package name="libxslt-tools"/>
-    <package name="aaa_base" replaces="xfce4-panel-plugin-xkb"/>
+    <!-- OBS-IgnorePackage: xfce4-panel-plugin-xkb -->
     <ignore name="xfce4-panel-plugin-xkb"/>
-    <package name="aaa_base" replaces="xfce4-panel-plugin-notes"/>
+    <!-- OBS-IgnorePackage: xfce4-panel-plugin-notes -->
     <ignore name="xfce4-panel-plugin-notes"/>
-    <package name="aaa_base" replaces="engrampa-lang"/>
+    <!-- OBS-IgnorePackage: engrampa-lang -->
     <ignore name="engrampa-lang"/>
-    <package name="aaa_base" replaces="libreoffice"/>
+    <!-- OBS-IgnorePackage: libreoffice -->
     <ignore name="libreoffice"/>
-    <package name="aaa_base" replaces="gdb"/>
+    <!-- OBS-IgnorePackage: gdb -->
     <ignore name="gdb"/>
-    <package name="aaa_base" replaces="gimp"/>
+    <!-- OBS-IgnorePackage: gimp -->
     <ignore name="gimp"/>
-    <package name="aaa_base" replaces="pidgin"/>
+    <!-- OBS-IgnorePackage: pidgin -->
     <ignore name="pidgin"/>
-    <package name="aaa_base" replaces="simple-scan"/>
+    <!-- OBS-IgnorePackage: simple-scan -->
     <ignore name="simple-scan"/>
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts -->
     <ignore name="xorg-x11-fonts"/>
     <package name="evince-plugin-pdfdocument"/>
     <package name="alsa-firmware"/>
-    <package name="aaa_base" replaces="mugshot"/>
+    <!-- OBS-IgnorePackage: mugshot -->
     <ignore name="mugshot"/>
     <package name="opensuse-welcome"/>
   </packages>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 62864f4..b522d4e 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 12 09:50:25 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Switch to kiwi schema v7.4:
+  * Remove hybrid="true"
+  * Switch from <package replaces="..."/> to <!-- OBS-IgnorePackage: ... -->
+
 -------------------------------------------------------------------
 Wed Jan 31 15:42:51 UTC 2024 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 89f5a73..22fe891 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Tumbleweed-GNOME-Live" displayname="openSUSE Tumbleweed GNOME Live">
+<image schemaversion="7.4" name="openSUSE-Tumbleweed-GNOME-Live" displayname="openSUSE Tumbleweed GNOME Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_GNOME_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Tumbleweed_GNOME_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Tumbleweed_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -57,289 +57,289 @@
     <archive name="livecd-udev.tar.xz"/>
     
     <!-- list-common.sh -->
-    <package name="aaa_base" replaces="poppler-data"/>
+    <!-- OBS-IgnorePackage: poppler-data -->
     <ignore name="poppler-data"/>
-    <package name="aaa_base" replaces="tin"/>
+    <!-- OBS-IgnorePackage: tin -->
     <ignore name="tin"/>
-    <package name="aaa_base" replaces="desktop-translations"/>
+    <!-- OBS-IgnorePackage: desktop-translations -->
     <ignore name="desktop-translations"/>
-    <package name="aaa_base" replaces="ft2demos"/>
+    <!-- OBS-IgnorePackage: ft2demos -->
     <ignore name="ft2demos"/>
-    <package name="aaa_base" replaces="gimp-help"/>
+    <!-- OBS-IgnorePackage: gimp-help -->
     <ignore name="gimp-help"/>
-    <package name="aaa_base" replaces="gimp-lang"/>
+    <!-- OBS-IgnorePackage: gimp-lang -->
     <ignore name="gimp-lang"/>
-    <package name="aaa_base" replaces="libreoffice-base"/>
+    <!-- OBS-IgnorePackage: libreoffice-base -->
     <ignore name="libreoffice-base"/>
-    <package name="aaa_base" replaces="libreoffice-mailmerge"/>
+    <!-- OBS-IgnorePackage: libreoffice-mailmerge -->
     <ignore name="libreoffice-mailmerge"/>
-    <package name="aaa_base" replaces="libreoffice-math"/>
+    <!-- OBS-IgnorePackage: libreoffice-math -->
     <ignore name="libreoffice-math"/>
-    <package name="aaa_base" replaces="libreoffice-filters-optional"/>
+    <!-- OBS-IgnorePackage: libreoffice-filters-optional -->
     <ignore name="libreoffice-filters-optional"/>
-    <package name="aaa_base" replaces="libreoffice-pyuno"/>
+    <!-- OBS-IgnorePackage: libreoffice-pyuno -->
     <ignore name="libreoffice-pyuno"/>
-    <package name="aaa_base" replaces="readline-doc"/>
+    <!-- OBS-IgnorePackage: readline-doc -->
     <ignore name="readline-doc"/>
-    <package name="aaa_base" replaces="graphviz"/>
+    <!-- OBS-IgnorePackage: graphviz -->
     <ignore name="graphviz"/>
-    <package name="aaa_base" replaces="linux-kernel-headers"/>
+    <!-- OBS-IgnorePackage: linux-kernel-headers -->
     <ignore name="linux-kernel-headers"/>
-    <package name="aaa_base" replaces="bash-doc"/>
+    <!-- OBS-IgnorePackage: bash-doc -->
     <ignore name="bash-doc"/>
-    <package name="aaa_base" replaces="gimp-plugins-python"/>
+    <!-- OBS-IgnorePackage: gimp-plugins-python -->
     <ignore name="gimp-plugins-python"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_basis_opt -->
     <ignore name="patterns-openSUSE-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_admin -->
     <ignore name="patterns-openSUSE-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_multimedia_opt -->
     <ignore name="patterns-openSUSE-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_imaging_opt -->
     <ignore name="patterns-openSUSE-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_office_opt -->
     <ignore name="patterns-openSUSE-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-apparmor_opt -->
     <ignore name="patterns-openSUSE-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-enhanced_base_opt -->
     <ignore name="patterns-openSUSE-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-fonts_opt -->
     <ignore name="patterns-openSUSE-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-imaging_opt -->
     <ignore name="patterns-openSUSE-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-kde_utilities_opt -->
     <ignore name="patterns-openSUSE-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-multimedia_opt -->
     <ignore name="patterns-openSUSE-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-office_opt -->
     <ignore name="patterns-openSUSE-office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-x11_opt -->
     <ignore name="patterns-openSUSE-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_basis_opt -->
     <ignore name="patterns-gnome-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-gmome-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-gmome-gnome_admin -->
     <ignore name="patterns-gmome-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_multimedia_opt -->
     <ignore name="patterns-gnome-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_imaging_opt -->
     <ignore name="patterns-gnome-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_office_opt -->
     <ignore name="patterns-gnome-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-apparmor_opt -->
     <ignore name="patterns-base-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-base-documentation"/>
+    <!-- OBS-IgnorePackage: patterns-base-documentation -->
     <ignore name="patterns-base-documentation"/>
-    <package name="aaa_base" replaces="patterns-base-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-enhanced_base_opt -->
     <ignore name="patterns-base-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-fonts-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-fonts-fonts_opt -->
     <ignore name="patterns-fonts-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-imaging_opt -->
     <ignore name="patterns-desktop-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_utilities_opt -->
     <ignore name="patterns-kde-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-multimedia_opt -->
     <ignore name="patterns-desktop-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-office-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-office-office_opt -->
     <ignore name="patterns-office-office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_opt -->
     <ignore name="patterns-base-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_enhanced"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_enhanced -->
     <ignore name="patterns-base-x11_enhanced"/>
-    <package name="aaa_base" replaces="make"/>
+    <!-- OBS-IgnorePackage: make -->
     <ignore name="make"/>
-    <package name="aaa_base" replaces="netpbm"/>
+    <!-- OBS-IgnorePackage: netpbm -->
     <ignore name="netpbm"/>
-    <package name="aaa_base" replaces="p7zip-full"/>
+    <!-- OBS-IgnorePackage: p7zip-full -->
     <ignore name="p7zip-full"/>
-    <package name="aaa_base" replaces="busybox-static"/>
+    <!-- OBS-IgnorePackage: busybox-static -->
     <ignore name="busybox-static"/>
-    <package name="aaa_base" replaces="inxi"/>
+    <!-- OBS-IgnorePackage: inxi -->
     <ignore name="inxi"/>
-    <package name="aaa_base" replaces="sane-backends"/>
+    <!-- OBS-IgnorePackage: sane-backends -->
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="aaa_base" replaces="glibc-32bit"/>
+    <!-- OBS-IgnorePackage: glibc-32bit -->
     <ignore name="glibc-32bit"/>
-    <package name="aaa_base" replaces="libvdpau_r300"/>
+    <!-- OBS-IgnorePackage: libvdpau_r300 -->
     <ignore name="libvdpau_r300"/>
-    <package name="aaa_base" replaces="libvdpau_radeonsi"/>
+    <!-- OBS-IgnorePackage: libvdpau_radeonsi -->
     <ignore name="libvdpau_radeonsi"/>
-    <package name="aaa_base" replaces="libvdpau_r600"/>
+    <!-- OBS-IgnorePackage: libvdpau_r600 -->
     <ignore name="libvdpau_r600"/>
-    <package name="aaa_base" replaces="pavucontrol"/>
+    <!-- OBS-IgnorePackage: pavucontrol -->
     <ignore name="pavucontrol"/>
-    <package name="aaa_base" replaces="libqmi-tools"/>
+    <!-- OBS-IgnorePackage: libqmi-tools -->
     <ignore name="libqmi-tools"/>
-    <package name="aaa_base" replaces="python*-pip"/>
+    <!-- OBS-IgnorePackage: python*-pip -->
     <ignore name="python*-pip"/>
-    <package name="aaa_base" replaces="multipath-tools-rbd"/>
+    <!-- OBS-IgnorePackage: multipath-tools-rbd -->
     <ignore name="multipath-tools-rbd"/>
-    <package name="aaa_base" replaces="acpica"/>
+    <!-- OBS-IgnorePackage: acpica -->
     <ignore name="acpica"/>
-    <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
+    <!-- OBS-IgnorePackage: xorg-x11-Xvnc -->
     <ignore name="xorg-x11-Xvnc"/>
-    <package name="aaa_base" replaces="cabextract"/>
+    <!-- OBS-IgnorePackage: cabextract -->
     <ignore name="cabextract"/>
-    <package name="aaa_base" replaces="sssd"/>
+    <!-- OBS-IgnorePackage: sssd -->
     <ignore name="sssd"/>
-    <package name="aaa_base" replaces="db-utils"/>
+    <!-- OBS-IgnorePackage: db-utils -->
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="dnsmasq"/>
+    <!-- OBS-IgnorePackage: dnsmasq -->
     <ignore name="dnsmasq"/>
-    <package name="aaa_base" replaces="fribidi"/>
+    <!-- OBS-IgnorePackage: fribidi -->
     <ignore name="fribidi"/>
-    <package name="aaa_base" replaces="ipmitool"/>
+    <!-- OBS-IgnorePackage: ipmitool -->
     <ignore name="ipmitool"/>
-    <package name="aaa_base" replaces="irda"/>
+    <!-- OBS-IgnorePackage: irda -->
     <ignore name="irda"/>
-    <package name="aaa_base" replaces="lomoco"/>
+    <!-- OBS-IgnorePackage: lomoco -->
     <ignore name="lomoco"/>
-    <package name="aaa_base" replaces="mksh"/>
+    <!-- OBS-IgnorePackage: mksh -->
     <ignore name="mksh"/>
-    <package name="aaa_base" replaces="cifs-utils"/>
+    <!-- OBS-IgnorePackage: cifs-utils -->
     <ignore name="cifs-utils"/>
-    <package name="aaa_base" replaces="gvfs-backend-samba"/>
+    <!-- OBS-IgnorePackage: gvfs-backend-samba -->
     <ignore name="gvfs-backend-samba"/>
-    <package name="aaa_base" replaces="xorg-x11"/>
+    <!-- OBS-IgnorePackage: xorg-x11 -->
     <ignore name="xorg-x11"/>
-    <package name="aaa_base" replaces="xorg-x11-essentials"/>
+    <!-- OBS-IgnorePackage: xorg-x11-essentials -->
     <ignore name="xorg-x11-essentials"/>
-    <package name="aaa_base" replaces="xorg-x11-server-extra"/>
+    <!-- OBS-IgnorePackage: xorg-x11-server-extra -->
     <ignore name="xorg-x11-server-extra"/>
     <package name="xdm"/>
     <package name="sysvinit-tools"/>
-    <package name="aaa_base" replaces="icewm"/>
+    <!-- OBS-IgnorePackage: icewm -->
     <ignore name="icewm"/>
-    <package name="aaa_base" replaces="baekmuk-ttf-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-ttf-fonts -->
     <ignore name="baekmuk-ttf-fonts"/>
-    <package name="aaa_base" replaces="google-droid-fonts"/>
+    <!-- OBS-IgnorePackage: google-droid-fonts -->
     <ignore name="google-droid-fonts"/>
-    <package name="aaa_base" replaces="efont-unicode-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: efont-unicode-bitmap-fonts -->
     <ignore name="efont-unicode-bitmap-fonts"/>
-    <package name="aaa_base" replaces="baekmuk-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-bitmap-fonts -->
     <ignore name="baekmuk-bitmap-fonts"/>
-    <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: intlfonts-chinese-big-bitmap-fonts -->
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-legacy -->
     <ignore name="xorg-x11-fonts-legacy"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-converted -->
     <ignore name="xorg-x11-fonts-converted"/>
-    <package name="aaa_base" replaces="strace"/>
+    <!-- OBS-IgnorePackage: strace -->
     <ignore name="strace"/>
-    <package name="aaa_base" replaces="tcsh"/>
+    <!-- OBS-IgnorePackage: tcsh -->
     <ignore name="tcsh"/>
-    <package name="aaa_base" replaces="usbmuxd"/>
+    <!-- OBS-IgnorePackage: usbmuxd -->
     <ignore name="usbmuxd"/>
-    <package name="aaa_base" replaces="gnome-keyring-pam"/>
+    <!-- OBS-IgnorePackage: gnome-keyring-pam -->
     <ignore name="gnome-keyring-pam"/>
-    <package name="aaa_base" replaces="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
-    <package name="aaa_base" replaces="apparmor-docs"/>
+    <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
-    <package name="aaa_base" replaces="mutt-doc"/>
+    <!-- OBS-IgnorePackage: mutt-doc -->
     <ignore name="mutt-doc"/>
-    <package name="aaa_base" replaces="coreutils-doc"/>
+    <!-- OBS-IgnorePackage: coreutils-doc -->
     <ignore name="coreutils-doc"/>
-    <package name="aaa_base" replaces="unar"/>
+    <!-- OBS-IgnorePackage: unar -->
     <ignore name="unar"/>
-    <package name="aaa_base" replaces="jing"/>
+    <!-- OBS-IgnorePackage: jing -->
     <ignore name="jing"/>
-    <package name="aaa_base" replaces="icedtea-web"/>
+    <!-- OBS-IgnorePackage: icedtea-web -->
     <ignore name="icedtea-web"/>
-    <package name="aaa_base" replaces="tigervnc"/>
+    <!-- OBS-IgnorePackage: tigervnc -->
     <ignore name="tigervnc"/>
-    <package name="aaa_base" replaces="autofs"/>
+    <!-- OBS-IgnorePackage: autofs -->
     <ignore name="autofs"/>
-    <package name="aaa_base" replaces="expect"/>
+    <!-- OBS-IgnorePackage: expect -->
     <ignore name="expect"/>
-    <package name="aaa_base" replaces="m4"/>
+    <!-- OBS-IgnorePackage: m4 -->
     <ignore name="m4"/>
-    <package name="aaa_base" replaces="mutt"/>
+    <!-- OBS-IgnorePackage: mutt -->
     <ignore name="mutt"/>
-    <package name="aaa_base" replaces="net-snmp"/>
+    <!-- OBS-IgnorePackage: net-snmp -->
     <ignore name="net-snmp"/>
-    <package name="aaa_base" replaces="procmail"/>
+    <!-- OBS-IgnorePackage: procmail -->
     <ignore name="procmail"/>
-    <package name="aaa_base" replaces="recode"/>
+    <!-- OBS-IgnorePackage: recode -->
     <ignore name="recode"/>
-    <package name="aaa_base" replaces="spax"/>
+    <!-- OBS-IgnorePackage: spax -->
     <ignore name="spax"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="espeak"/>
+    <!-- OBS-IgnorePackage: espeak -->
     <ignore name="espeak"/>
-    <package name="aaa_base" replaces="pam_mount"/>
+    <!-- OBS-IgnorePackage: pam_mount -->
     <ignore name="pam_mount"/>
-    <package name="aaa_base" replaces="groff-full"/>
+    <!-- OBS-IgnorePackage: groff-full -->
     <ignore name="groff-full"/>
-    <package name="aaa_base" replaces="tuned"/>
+    <!-- OBS-IgnorePackage: tuned -->
     <ignore name="tuned"/>
-    <package name="aaa_base" replaces="cups"/>
+    <!-- OBS-IgnorePackage: cups -->
     <ignore name="cups"/>
-    <package name="aaa_base" replaces="cups-client"/>
+    <!-- OBS-IgnorePackage: cups-client -->
     <ignore name="cups-client"/>
-    <package name="aaa_base" replaces="system-config-printer"/>
+    <!-- OBS-IgnorePackage: system-config-printer -->
     <ignore name="system-config-printer"/>
-    <package name="aaa_base" replaces="ghostscript"/>
+    <!-- OBS-IgnorePackage: ghostscript -->
     <ignore name="ghostscript"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-std"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-std -->
     <ignore name="ghostscript-fonts-std"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-other"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-other -->
     <ignore name="ghostscript-fonts-other"/>
-    <package name="aaa_base" replaces="manufacturer-PPDs"/>
+    <!-- OBS-IgnorePackage: manufacturer-PPDs -->
     <ignore name="manufacturer-PPDs"/>
-    <package name="aaa_base" replaces="gutenprint"/>
+    <!-- OBS-IgnorePackage: gutenprint -->
     <ignore name="gutenprint"/>
-    <package name="aaa_base" replaces="hplip-hpijs"/>
+    <!-- OBS-IgnorePackage: hplip-hpijs -->
     <ignore name="hplip-hpijs"/>
-    <package name="aaa_base" replaces="hplip"/>
+    <!-- OBS-IgnorePackage: hplip -->
     <ignore name="hplip"/>
-    <package name="aaa_base" replaces="system-config-printer-applet"/>
+    <!-- OBS-IgnorePackage: system-config-printer-applet -->
     <ignore name="system-config-printer-applet"/>
-    <package name="aaa_base" replaces="udev-configure-printer"/>
+    <!-- OBS-IgnorePackage: udev-configure-printer -->
     <ignore name="udev-configure-printer"/>
-    <package name="aaa_base" replaces="systemd-coredump"/>
+    <!-- OBS-IgnorePackage: systemd-coredump -->
     <ignore name="systemd-coredump"/>
-    <package name="aaa_base" replaces="systemd-doc"/>
+    <!-- OBS-IgnorePackage: systemd-doc -->
     <ignore name="systemd-doc"/>
-    <package name="aaa_base" replaces="man-pages"/>
+    <!-- OBS-IgnorePackage: man-pages -->
     <ignore name="man-pages"/>
-    <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
+    <!-- OBS-IgnorePackage: NetworkManager-vpnc-gnome -->
     <ignore name="NetworkManager-vpnc-gnome"/>
-    <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-vpnc -->
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <!-- OBS-IgnorePackage: busybox-sendmail -->
     <ignore name="busybox-sendmail"/>
-    <package name="aaa_base" replaces="exim"/>
+    <!-- OBS-IgnorePackage: exim -->
     <ignore name="exim"/>
-    <package name="aaa_base" replaces="msmtp-mta"/>
+    <!-- OBS-IgnorePackage: msmtp-mta -->
     <ignore name="msmtp-mta"/>
-    <package name="aaa_base" replaces="postfix"/>
+    <!-- OBS-IgnorePackage: postfix -->
     <ignore name="postfix"/>
-    <package name="aaa_base" replaces="postfix-bdb"/>
+    <!-- OBS-IgnorePackage: postfix-bdb -->
     <ignore name="postfix-bdb"/>
-    <package name="aaa_base" replaces="sendmail"/>
+    <!-- OBS-IgnorePackage: sendmail -->
     <ignore name="sendmail"/>
-    <package name="aaa_base" replaces="virtualbox-guest-tools"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-tools -->
     <ignore name="virtualbox-guest-tools"/>
-    <package name="aaa_base" replaces="virtualbox-guest-x11"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-x11 -->
     <ignore name="virtualbox-guest-x11"/>
-    <package name="aaa_base" replaces="intel-gpu-tools"/>
+    <!-- OBS-IgnorePackage: intel-gpu-tools -->
     <ignore name="intel-gpu-tools"/>
     <package name="spice-vdagent"/>
-    <package name="aaa_base" replaces="open-vm-tools"/>
+    <!-- OBS-IgnorePackage: open-vm-tools -->
     <ignore name="open-vm-tools"/>
-    <package name="aaa_base" replaces="usb_modeswitch"/>
+    <!-- OBS-IgnorePackage: usb_modeswitch -->
     <ignore name="usb_modeswitch"/>
-    <package name="aaa_base" replaces="gstreamer-plugins-rs"/>
+    <!-- OBS-IgnorePackage: gstreamer-plugins-rs -->
     <ignore name="gstreamer-plugins-rs"/>
-    <package name="aaa_base" replaces="vim-data"/>
+    <!-- OBS-IgnorePackage: vim-data -->
     <ignore name="vim-data"/>
-    <package name="aaa_base" replaces="vim"/>
+    <!-- OBS-IgnorePackage: vim -->
     <ignore name="vim"/>
     <package name="vim-small"/>
     <package name="kernel-default"/>
@@ -411,80 +411,80 @@
     <package name="xz"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
-    <package name="aaa_base" replaces="ntp"/>
+    <!-- OBS-IgnorePackage: ntp -->
     <ignore name="ntp"/>
-    <package name="aaa_base" replaces="wicked"/>
+    <!-- OBS-IgnorePackage: wicked -->
     <ignore name="wicked"/>
     <package name="ucode-amd" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="ucode-intel"/>
+    <!-- OBS-IgnorePackage: ucode-intel -->
     <ignore name="ucode-intel"/>
 
     <!-- list-gnome.sh -->
-    <package name="aaa_base" replaces="libreoffice-calc"/>
+    <!-- OBS-IgnorePackage: libreoffice-calc -->
     <ignore name="libreoffice-calc"/>
-    <package name="aaa_base" replaces="libreoffice-draw"/>
+    <!-- OBS-IgnorePackage: libreoffice-draw -->
     <ignore name="libreoffice-draw"/>
-    <package name="aaa_base" replaces="libreoffice-impress"/>
+    <!-- OBS-IgnorePackage: libreoffice-impress -->
     <ignore name="libreoffice-impress"/>
-    <package name="aaa_base" replaces="libreoffice-icon-themes"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-themes -->
     <ignore name="libreoffice-icon-themes"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-breeze"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-breeze -->
     <ignore name="libreoffice-icon-theme-breeze"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-sifr"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-sifr -->
     <ignore name="libreoffice-icon-theme-sifr"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-hicontrast"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-hicontrast -->
     <ignore name="libreoffice-icon-theme-hicontrast"/>
-    <package name="aaa_base" replaces="colord"/>
+    <!-- OBS-IgnorePackage: colord -->
     <ignore name="colord"/>
-    <package name="aaa_base" replaces="apparmor-utils"/>
+    <!-- OBS-IgnorePackage: apparmor-utils -->
     <ignore name="apparmor-utils"/>
-    <package name="aaa_base" replaces="java-11-openjdk-headless"/>
+    <!-- OBS-IgnorePackage: java-11-openjdk-headless -->
     <ignore name="java-11-openjdk-headless"/>
     <package name="branding-openSUSE"/>
     <package name="adobe-sourcecodepro-fonts"/>
-    <package name="aaa_base" replaces="google-carlito-fonts"/>
+    <!-- OBS-IgnorePackage: google-carlito-fonts -->
     <ignore name="google-carlito-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-fonts -->
     <ignore name="google-noto-sans-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-cjk-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-cjk-fonts -->
     <ignore name="google-noto-sans-cjk-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-sc-bold-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-sc-bold-fonts -->
     <ignore name="google-noto-sans-sc-bold-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-sc-regular-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-sc-regular-fonts -->
     <ignore name="google-noto-sans-sc-regular-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-tc-bold-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-tc-bold-fonts -->
     <ignore name="google-noto-sans-tc-bold-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-tc-regular-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-tc-regular-fonts -->
     <ignore name="google-noto-sans-tc-regular-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-jp-bold-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-jp-bold-fonts -->
     <ignore name="google-noto-sans-jp-bold-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-jp-regular-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-jp-regular-fonts -->
     <ignore name="google-noto-sans-jp-regular-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-kr-bold-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-kr-bold-fonts -->
     <ignore name="google-noto-sans-kr-bold-fonts"/>
-    <package name="aaa_base" replaces="google-noto-sans-kr-regular-fonts"/>
+    <!-- OBS-IgnorePackage: google-noto-sans-kr-regular-fonts -->
     <ignore name="google-noto-sans-kr-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-fonts -->
     <ignore name="noto-sans-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-cjk-fonts -->
     <ignore name="noto-sans-cjk-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-sc-bold-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-sc-bold-fonts -->
     <ignore name="noto-sans-sc-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-sc-regular-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-sc-regular-fonts -->
     <ignore name="noto-sans-sc-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-tc-bold-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-tc-bold-fonts -->
     <ignore name="noto-sans-tc-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-tc-regular-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-tc-regular-fonts -->
     <ignore name="noto-sans-tc-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-jp-bold-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-jp-bold-fonts -->
     <ignore name="noto-sans-jp-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-jp-regular-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-jp-regular-fonts -->
     <ignore name="noto-sans-jp-regular-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-kr-bold-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-kr-bold-fonts -->
     <ignore name="noto-sans-kr-bold-fonts"/>
-    <package name="aaa_base" replaces="noto-sans-kr-regular-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-kr-regular-fonts -->
     <ignore name="noto-sans-kr-regular-fonts"/>
-    <package name="aaa_base" replaces="libreoffice"/>
+    <!-- OBS-IgnorePackage: libreoffice -->
     <ignore name="libreoffice"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
@@ -494,15 +494,15 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
-    <package name="aaa_base" replaces="yast2-samba-client"/>
+    <!-- OBS-IgnorePackage: yast2-samba-client -->
     <ignore name="yast2-samba-client"/>
-    <package name="aaa_base" replaces="yast2-vpn"/>
+    <!-- OBS-IgnorePackage: yast2-vpn -->
     <ignore name="yast2-vpn"/>
-    <package name="aaa_base" replaces="yast2-journal"/>
+    <!-- OBS-IgnorePackage: yast2-journal -->
     <ignore name="yast2-journal"/>
-    <package name="aaa_base" replaces="yast2-auth-client"/>
+    <!-- OBS-IgnorePackage: yast2-auth-client -->
     <ignore name="yast2-auth-client"/>
-    <package name="aaa_base" replaces="yast2-sudo"/>
+    <!-- OBS-IgnorePackage: yast2-sudo -->
     <ignore name="yast2-sudo"/>
     <package name="yast2-trans-de"/>
     <package name="live-net-installer"/>
@@ -514,64 +514,64 @@
     <package name="lklug-fonts"/>
     <package name="indic-fonts"/>
     <package name="arabic-kacst-fonts"/>
-    <package name="aaa_base" replaces="simple-scan"/>
+    <!-- OBS-IgnorePackage: simple-scan -->
     <ignore name="simple-scan"/>
-    <package name="aaa_base" replaces="ghostscript"/>
+    <!-- OBS-IgnorePackage: ghostscript -->
     <ignore name="ghostscript"/>
-    <package name="aaa_base" replaces="myspell-en_US"/>
+    <!-- OBS-IgnorePackage: myspell-en_US -->
     <ignore name="myspell-en_US"/>
-    <package name="aaa_base" replaces="orca"/>
+    <!-- OBS-IgnorePackage: orca -->
     <ignore name="orca"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_games"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_games -->
     <ignore name="patterns-gnome-gnome_games"/>
-    <package name="aaa_base" replaces="gnome-software"/>
+    <!-- OBS-IgnorePackage: gnome-software -->
     <ignore name="gnome-software"/>
-    <package name="aaa_base" replaces="gnome-control-center-color"/>
+    <!-- OBS-IgnorePackage: gnome-control-center-color -->
     <ignore name="gnome-control-center-color"/>
-    <package name="aaa_base" replaces="gnome-control-center-user-faces"/>
+    <!-- OBS-IgnorePackage: gnome-control-center-user-faces -->
     <ignore name="gnome-control-center-user-faces"/>
-    <package name="aaa_base" replaces="libgweather-lang"/>
+    <!-- OBS-IgnorePackage: libgweather-lang -->
     <ignore name="libgweather-lang"/>
-    <package name="aaa_base" replaces="gnome-user-docs"/>
+    <!-- OBS-IgnorePackage: gnome-user-docs -->
     <ignore name="gnome-user-docs"/>
-    <package name="aaa_base" replaces="gnome-user-docs-lang"/>
+    <!-- OBS-IgnorePackage: gnome-user-docs-lang -->
     <ignore name="gnome-user-docs-lang"/>
-    <package name="aaa_base" replaces="eog-lang"/>
+    <!-- OBS-IgnorePackage: eog-lang -->
     <ignore name="eog-lang"/>
-    <package name="aaa_base" replaces="evolution-lang"/>
+    <!-- OBS-IgnorePackage: evolution-lang -->
     <ignore name="evolution-lang"/>
-    <package name="aaa_base" replaces="evolution-data-server-lang"/>
+    <!-- OBS-IgnorePackage: evolution-data-server-lang -->
     <ignore name="evolution-data-server-lang"/>
-    <package name="aaa_base" replaces="zenity-lang"/>
+    <!-- OBS-IgnorePackage: zenity-lang -->
     <ignore name="zenity-lang"/>
-    <package name="aaa_base" replaces="amavisd-new"/>
+    <!-- OBS-IgnorePackage: amavisd-new -->
     <ignore name="amavisd-new"/>
-    <package name="aaa_base" replaces="inkscape"/>
+    <!-- OBS-IgnorePackage: inkscape -->
     <ignore name="inkscape"/>
-    <package name="aaa_base" replaces="deja-dup"/>
+    <!-- OBS-IgnorePackage: deja-dup -->
     <ignore name="deja-dup"/>
-    <package name="aaa_base" replaces="libpython2_7-1_0"/>
+    <!-- OBS-IgnorePackage: libpython2_7-1_0 -->
     <ignore name="libpython2_7-1_0"/>
-    <package name="aaa_base" replaces="gimp"/>
+    <!-- OBS-IgnorePackage: gimp -->
     <ignore name="gimp"/>
-    <package name="aaa_base" replaces="noto-coloremoji-fonts"/>
+    <!-- OBS-IgnorePackage: noto-coloremoji-fonts -->
     <ignore name="noto-coloremoji-fonts"/>
-    <package name="aaa_base" replaces="gnome-weather"/>
+    <!-- OBS-IgnorePackage: gnome-weather -->
     <ignore name="gnome-weather"/>
     <package name="gparted"/>
-    <package name="aaa_base" replaces="gparted-lang"/>
+    <!-- OBS-IgnorePackage: gparted-lang -->
     <ignore name="gparted-lang"/>
-    <package name="aaa_base" replaces="vinagre-lang"/>
+    <!-- OBS-IgnorePackage: vinagre-lang -->
     <ignore name="vinagre-lang"/>
-    <package name="aaa_base" replaces="gedit-lang"/>
+    <!-- OBS-IgnorePackage: gedit-lang -->
     <ignore name="gedit-lang"/>
-    <package name="aaa_base" replaces="fwupd-lang"/>
+    <!-- OBS-IgnorePackage: fwupd-lang -->
     <ignore name="fwupd-lang"/>
-    <package name="aaa_base" replaces="gnome-photos"/>
+    <!-- OBS-IgnorePackage: gnome-photos -->
     <ignore name="gnome-photos"/>
-    <package name="aaa_base" replaces="gnome-backgrounds"/>
+    <!-- OBS-IgnorePackage: gnome-backgrounds -->
     <ignore name="gnome-backgrounds"/>
-    <package name="aaa_base" replaces="cyrus-sasl"/>
+    <!-- OBS-IgnorePackage: cyrus-sasl -->
     <ignore name="cyrus-sasl"/>
     <package name="NetworkManager-applet"/>
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
@@ -594,11 +594,11 @@
     <package name="gnome-mines"/>
     <package name="gnome-sudoku"/>
     <package name="quadrapassel"/>
-    <package name="aaa_base" replaces="opensuse-welcome"/>
+    <!-- OBS-IgnorePackage: opensuse-welcome -->
     <ignore name="opensuse-welcome"/>
-    <package name="aaa_base" replaces="yelp"/>
+    <!-- OBS-IgnorePackage: yelp -->
     <ignore name="yelp"/>
-    <package name="aaa_base" replaces="libgtk-2_0-0"/>
+    <!-- OBS-IgnorePackage: libgtk-2_0-0 -->
     <ignore name="libgtk-2_0-0"/>
   </packages>
   <packages type="bootstrap">
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 185006f..af6f1ea 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Tumbleweed-KDE-Live" displayname="openSUSE Tumbleweed KDE Live">
+<image schemaversion="7.4" name="openSUSE-Tumbleweed-KDE-Live" displayname="openSUSE Tumbleweed KDE Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_KDE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Tumbleweed_KDE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Tumbleweed_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -57,289 +57,289 @@
     <archive name="livecd-udev.tar.xz"/>
     
     <!-- list-common.sh -->
-    <package name="aaa_base" replaces="poppler-data"/>
+    <!-- OBS-IgnorePackage: poppler-data -->
     <ignore name="poppler-data"/>
-    <package name="aaa_base" replaces="tin"/>
+    <!-- OBS-IgnorePackage: tin -->
     <ignore name="tin"/>
-    <package name="aaa_base" replaces="desktop-translations"/>
+    <!-- OBS-IgnorePackage: desktop-translations -->
     <ignore name="desktop-translations"/>
-    <package name="aaa_base" replaces="ft2demos"/>
+    <!-- OBS-IgnorePackage: ft2demos -->
     <ignore name="ft2demos"/>
-    <package name="aaa_base" replaces="gimp-help"/>
+    <!-- OBS-IgnorePackage: gimp-help -->
     <ignore name="gimp-help"/>
-    <package name="aaa_base" replaces="gimp-lang"/>
+    <!-- OBS-IgnorePackage: gimp-lang -->
     <ignore name="gimp-lang"/>
-    <package name="aaa_base" replaces="libreoffice-base"/>
+    <!-- OBS-IgnorePackage: libreoffice-base -->
     <ignore name="libreoffice-base"/>
-    <package name="aaa_base" replaces="libreoffice-mailmerge"/>
+    <!-- OBS-IgnorePackage: libreoffice-mailmerge -->
     <ignore name="libreoffice-mailmerge"/>
-    <package name="aaa_base" replaces="libreoffice-math"/>
+    <!-- OBS-IgnorePackage: libreoffice-math -->
     <ignore name="libreoffice-math"/>
-    <package name="aaa_base" replaces="libreoffice-filters-optional"/>
+    <!-- OBS-IgnorePackage: libreoffice-filters-optional -->
     <ignore name="libreoffice-filters-optional"/>
-    <package name="aaa_base" replaces="libreoffice-pyuno"/>
+    <!-- OBS-IgnorePackage: libreoffice-pyuno -->
     <ignore name="libreoffice-pyuno"/>
-    <package name="aaa_base" replaces="readline-doc"/>
+    <!-- OBS-IgnorePackage: readline-doc -->
     <ignore name="readline-doc"/>
-    <package name="aaa_base" replaces="graphviz"/>
+    <!-- OBS-IgnorePackage: graphviz -->
     <ignore name="graphviz"/>
-    <package name="aaa_base" replaces="linux-kernel-headers"/>
+    <!-- OBS-IgnorePackage: linux-kernel-headers -->
     <ignore name="linux-kernel-headers"/>
-    <package name="aaa_base" replaces="bash-doc"/>
+    <!-- OBS-IgnorePackage: bash-doc -->
     <ignore name="bash-doc"/>
-    <package name="aaa_base" replaces="gimp-plugins-python"/>
+    <!-- OBS-IgnorePackage: gimp-plugins-python -->
     <ignore name="gimp-plugins-python"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_basis_opt -->
     <ignore name="patterns-openSUSE-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_admin -->
     <ignore name="patterns-openSUSE-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_multimedia_opt -->
     <ignore name="patterns-openSUSE-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_imaging_opt -->
     <ignore name="patterns-openSUSE-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_office_opt -->
     <ignore name="patterns-openSUSE-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-apparmor_opt -->
     <ignore name="patterns-openSUSE-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-enhanced_base_opt -->
     <ignore name="patterns-openSUSE-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-fonts_opt -->
     <ignore name="patterns-openSUSE-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-imaging_opt -->
     <ignore name="patterns-openSUSE-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-kde_utilities_opt -->
     <ignore name="patterns-openSUSE-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-multimedia_opt -->
     <ignore name="patterns-openSUSE-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-office_opt -->
     <ignore name="patterns-openSUSE-office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-x11_opt -->
     <ignore name="patterns-openSUSE-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_basis_opt -->
     <ignore name="patterns-gnome-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-gmome-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-gmome-gnome_admin -->
     <ignore name="patterns-gmome-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_multimedia_opt -->
     <ignore name="patterns-gnome-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_imaging_opt -->
     <ignore name="patterns-gnome-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_office_opt -->
     <ignore name="patterns-gnome-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-apparmor_opt -->
     <ignore name="patterns-base-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-base-documentation"/>
+    <!-- OBS-IgnorePackage: patterns-base-documentation -->
     <ignore name="patterns-base-documentation"/>
-    <package name="aaa_base" replaces="patterns-base-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-enhanced_base_opt -->
     <ignore name="patterns-base-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-fonts-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-fonts-fonts_opt -->
     <ignore name="patterns-fonts-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-imaging_opt -->
     <ignore name="patterns-desktop-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_utilities_opt -->
     <ignore name="patterns-kde-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-multimedia_opt -->
     <ignore name="patterns-desktop-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-office-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-office-office_opt -->
     <ignore name="patterns-office-office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_opt -->
     <ignore name="patterns-base-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_enhanced"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_enhanced -->
     <ignore name="patterns-base-x11_enhanced"/>
-    <package name="aaa_base" replaces="make"/>
+    <!-- OBS-IgnorePackage: make -->
     <ignore name="make"/>
-    <package name="aaa_base" replaces="netpbm"/>
+    <!-- OBS-IgnorePackage: netpbm -->
     <ignore name="netpbm"/>
-    <package name="aaa_base" replaces="p7zip-full"/>
+    <!-- OBS-IgnorePackage: p7zip-full -->
     <ignore name="p7zip-full"/>
-    <package name="aaa_base" replaces="busybox-static"/>
+    <!-- OBS-IgnorePackage: busybox-static -->
     <ignore name="busybox-static"/>
-    <package name="aaa_base" replaces="inxi"/>
+    <!-- OBS-IgnorePackage: inxi -->
     <ignore name="inxi"/>
-    <package name="aaa_base" replaces="sane-backends"/>
+    <!-- OBS-IgnorePackage: sane-backends -->
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="aaa_base" replaces="glibc-32bit"/>
+    <!-- OBS-IgnorePackage: glibc-32bit -->
     <ignore name="glibc-32bit"/>
-    <package name="aaa_base" replaces="libvdpau_r300"/>
+    <!-- OBS-IgnorePackage: libvdpau_r300 -->
     <ignore name="libvdpau_r300"/>
-    <package name="aaa_base" replaces="libvdpau_radeonsi"/>
+    <!-- OBS-IgnorePackage: libvdpau_radeonsi -->
     <ignore name="libvdpau_radeonsi"/>
-    <package name="aaa_base" replaces="libvdpau_r600"/>
+    <!-- OBS-IgnorePackage: libvdpau_r600 -->
     <ignore name="libvdpau_r600"/>
-    <package name="aaa_base" replaces="pavucontrol"/>
+    <!-- OBS-IgnorePackage: pavucontrol -->
     <ignore name="pavucontrol"/>
-    <package name="aaa_base" replaces="libqmi-tools"/>
+    <!-- OBS-IgnorePackage: libqmi-tools -->
     <ignore name="libqmi-tools"/>
-    <package name="aaa_base" replaces="python*-pip"/>
+    <!-- OBS-IgnorePackage: python*-pip -->
     <ignore name="python*-pip"/>
-    <package name="aaa_base" replaces="multipath-tools-rbd"/>
+    <!-- OBS-IgnorePackage: multipath-tools-rbd -->
     <ignore name="multipath-tools-rbd"/>
-    <package name="aaa_base" replaces="acpica"/>
+    <!-- OBS-IgnorePackage: acpica -->
     <ignore name="acpica"/>
-    <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
+    <!-- OBS-IgnorePackage: xorg-x11-Xvnc -->
     <ignore name="xorg-x11-Xvnc"/>
-    <package name="aaa_base" replaces="cabextract"/>
+    <!-- OBS-IgnorePackage: cabextract -->
     <ignore name="cabextract"/>
-    <package name="aaa_base" replaces="sssd"/>
+    <!-- OBS-IgnorePackage: sssd -->
     <ignore name="sssd"/>
-    <package name="aaa_base" replaces="db-utils"/>
+    <!-- OBS-IgnorePackage: db-utils -->
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="dnsmasq"/>
+    <!-- OBS-IgnorePackage: dnsmasq -->
     <ignore name="dnsmasq"/>
-    <package name="aaa_base" replaces="fribidi"/>
+    <!-- OBS-IgnorePackage: fribidi -->
     <ignore name="fribidi"/>
-    <package name="aaa_base" replaces="ipmitool"/>
+    <!-- OBS-IgnorePackage: ipmitool -->
     <ignore name="ipmitool"/>
-    <package name="aaa_base" replaces="irda"/>
+    <!-- OBS-IgnorePackage: irda -->
     <ignore name="irda"/>
-    <package name="aaa_base" replaces="lomoco"/>
+    <!-- OBS-IgnorePackage: lomoco -->
     <ignore name="lomoco"/>
-    <package name="aaa_base" replaces="mksh"/>
+    <!-- OBS-IgnorePackage: mksh -->
     <ignore name="mksh"/>
-    <package name="aaa_base" replaces="cifs-utils"/>
+    <!-- OBS-IgnorePackage: cifs-utils -->
     <ignore name="cifs-utils"/>
-    <package name="aaa_base" replaces="gvfs-backend-samba"/>
+    <!-- OBS-IgnorePackage: gvfs-backend-samba -->
     <ignore name="gvfs-backend-samba"/>
-    <package name="aaa_base" replaces="xorg-x11"/>
+    <!-- OBS-IgnorePackage: xorg-x11 -->
     <ignore name="xorg-x11"/>
-    <package name="aaa_base" replaces="xorg-x11-essentials"/>
+    <!-- OBS-IgnorePackage: xorg-x11-essentials -->
     <ignore name="xorg-x11-essentials"/>
-    <package name="aaa_base" replaces="xorg-x11-server-extra"/>
+    <!-- OBS-IgnorePackage: xorg-x11-server-extra -->
     <ignore name="xorg-x11-server-extra"/>
     <package name="xdm"/>
     <package name="sysvinit-tools"/>
-    <package name="aaa_base" replaces="icewm"/>
+    <!-- OBS-IgnorePackage: icewm -->
     <ignore name="icewm"/>
-    <package name="aaa_base" replaces="baekmuk-ttf-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-ttf-fonts -->
     <ignore name="baekmuk-ttf-fonts"/>
-    <package name="aaa_base" replaces="google-droid-fonts"/>
+    <!-- OBS-IgnorePackage: google-droid-fonts -->
     <ignore name="google-droid-fonts"/>
-    <package name="aaa_base" replaces="efont-unicode-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: efont-unicode-bitmap-fonts -->
     <ignore name="efont-unicode-bitmap-fonts"/>
-    <package name="aaa_base" replaces="baekmuk-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-bitmap-fonts -->
     <ignore name="baekmuk-bitmap-fonts"/>
-    <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: intlfonts-chinese-big-bitmap-fonts -->
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-legacy -->
     <ignore name="xorg-x11-fonts-legacy"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-converted -->
     <ignore name="xorg-x11-fonts-converted"/>
-    <package name="aaa_base" replaces="strace"/>
+    <!-- OBS-IgnorePackage: strace -->
     <ignore name="strace"/>
-    <package name="aaa_base" replaces="tcsh"/>
+    <!-- OBS-IgnorePackage: tcsh -->
     <ignore name="tcsh"/>
-    <package name="aaa_base" replaces="usbmuxd"/>
+    <!-- OBS-IgnorePackage: usbmuxd -->
     <ignore name="usbmuxd"/>
-    <package name="aaa_base" replaces="gnome-keyring-pam"/>
+    <!-- OBS-IgnorePackage: gnome-keyring-pam -->
     <ignore name="gnome-keyring-pam"/>
-    <package name="aaa_base" replaces="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
-    <package name="aaa_base" replaces="apparmor-docs"/>
+    <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
-    <package name="aaa_base" replaces="mutt-doc"/>
+    <!-- OBS-IgnorePackage: mutt-doc -->
     <ignore name="mutt-doc"/>
-    <package name="aaa_base" replaces="coreutils-doc"/>
+    <!-- OBS-IgnorePackage: coreutils-doc -->
     <ignore name="coreutils-doc"/>
-    <package name="aaa_base" replaces="unar"/>
+    <!-- OBS-IgnorePackage: unar -->
     <ignore name="unar"/>
-    <package name="aaa_base" replaces="jing"/>
+    <!-- OBS-IgnorePackage: jing -->
     <ignore name="jing"/>
-    <package name="aaa_base" replaces="icedtea-web"/>
+    <!-- OBS-IgnorePackage: icedtea-web -->
     <ignore name="icedtea-web"/>
-    <package name="aaa_base" replaces="tigervnc"/>
+    <!-- OBS-IgnorePackage: tigervnc -->
     <ignore name="tigervnc"/>
-    <package name="aaa_base" replaces="autofs"/>
+    <!-- OBS-IgnorePackage: autofs -->
     <ignore name="autofs"/>
-    <package name="aaa_base" replaces="expect"/>
+    <!-- OBS-IgnorePackage: expect -->
     <ignore name="expect"/>
-    <package name="aaa_base" replaces="m4"/>
+    <!-- OBS-IgnorePackage: m4 -->
     <ignore name="m4"/>
-    <package name="aaa_base" replaces="mutt"/>
+    <!-- OBS-IgnorePackage: mutt -->
     <ignore name="mutt"/>
-    <package name="aaa_base" replaces="net-snmp"/>
+    <!-- OBS-IgnorePackage: net-snmp -->
     <ignore name="net-snmp"/>
-    <package name="aaa_base" replaces="procmail"/>
+    <!-- OBS-IgnorePackage: procmail -->
     <ignore name="procmail"/>
-    <package name="aaa_base" replaces="recode"/>
+    <!-- OBS-IgnorePackage: recode -->
     <ignore name="recode"/>
-    <package name="aaa_base" replaces="spax"/>
+    <!-- OBS-IgnorePackage: spax -->
     <ignore name="spax"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="espeak"/>
+    <!-- OBS-IgnorePackage: espeak -->
     <ignore name="espeak"/>
-    <package name="aaa_base" replaces="pam_mount"/>
+    <!-- OBS-IgnorePackage: pam_mount -->
     <ignore name="pam_mount"/>
-    <package name="aaa_base" replaces="groff-full"/>
+    <!-- OBS-IgnorePackage: groff-full -->
     <ignore name="groff-full"/>
-    <package name="aaa_base" replaces="tuned"/>
+    <!-- OBS-IgnorePackage: tuned -->
     <ignore name="tuned"/>
-    <package name="aaa_base" replaces="cups"/>
+    <!-- OBS-IgnorePackage: cups -->
     <ignore name="cups"/>
-    <package name="aaa_base" replaces="cups-client"/>
+    <!-- OBS-IgnorePackage: cups-client -->
     <ignore name="cups-client"/>
-    <package name="aaa_base" replaces="system-config-printer"/>
+    <!-- OBS-IgnorePackage: system-config-printer -->
     <ignore name="system-config-printer"/>
-    <package name="aaa_base" replaces="ghostscript"/>
+    <!-- OBS-IgnorePackage: ghostscript -->
     <ignore name="ghostscript"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-std"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-std -->
     <ignore name="ghostscript-fonts-std"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-other"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-other -->
     <ignore name="ghostscript-fonts-other"/>
-    <package name="aaa_base" replaces="manufacturer-PPDs"/>
+    <!-- OBS-IgnorePackage: manufacturer-PPDs -->
     <ignore name="manufacturer-PPDs"/>
-    <package name="aaa_base" replaces="gutenprint"/>
+    <!-- OBS-IgnorePackage: gutenprint -->
     <ignore name="gutenprint"/>
-    <package name="aaa_base" replaces="hplip-hpijs"/>
+    <!-- OBS-IgnorePackage: hplip-hpijs -->
     <ignore name="hplip-hpijs"/>
-    <package name="aaa_base" replaces="hplip"/>
+    <!-- OBS-IgnorePackage: hplip -->
     <ignore name="hplip"/>
-    <package name="aaa_base" replaces="system-config-printer-applet"/>
+    <!-- OBS-IgnorePackage: system-config-printer-applet -->
     <ignore name="system-config-printer-applet"/>
-    <package name="aaa_base" replaces="udev-configure-printer"/>
+    <!-- OBS-IgnorePackage: udev-configure-printer -->
     <ignore name="udev-configure-printer"/>
-    <package name="aaa_base" replaces="systemd-coredump"/>
+    <!-- OBS-IgnorePackage: systemd-coredump -->
     <ignore name="systemd-coredump"/>
-    <package name="aaa_base" replaces="systemd-doc"/>
+    <!-- OBS-IgnorePackage: systemd-doc -->
     <ignore name="systemd-doc"/>
-    <package name="aaa_base" replaces="man-pages"/>
+    <!-- OBS-IgnorePackage: man-pages -->
     <ignore name="man-pages"/>
-    <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
+    <!-- OBS-IgnorePackage: NetworkManager-vpnc-gnome -->
     <ignore name="NetworkManager-vpnc-gnome"/>
-    <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-vpnc -->
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <!-- OBS-IgnorePackage: busybox-sendmail -->
     <ignore name="busybox-sendmail"/>
-    <package name="aaa_base" replaces="exim"/>
+    <!-- OBS-IgnorePackage: exim -->
     <ignore name="exim"/>
-    <package name="aaa_base" replaces="msmtp-mta"/>
+    <!-- OBS-IgnorePackage: msmtp-mta -->
     <ignore name="msmtp-mta"/>
-    <package name="aaa_base" replaces="postfix"/>
+    <!-- OBS-IgnorePackage: postfix -->
     <ignore name="postfix"/>
-    <package name="aaa_base" replaces="postfix-bdb"/>
+    <!-- OBS-IgnorePackage: postfix-bdb -->
     <ignore name="postfix-bdb"/>
-    <package name="aaa_base" replaces="sendmail"/>
+    <!-- OBS-IgnorePackage: sendmail -->
     <ignore name="sendmail"/>
-    <package name="aaa_base" replaces="virtualbox-guest-tools"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-tools -->
     <ignore name="virtualbox-guest-tools"/>
-    <package name="aaa_base" replaces="virtualbox-guest-x11"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-x11 -->
     <ignore name="virtualbox-guest-x11"/>
-    <package name="aaa_base" replaces="intel-gpu-tools"/>
+    <!-- OBS-IgnorePackage: intel-gpu-tools -->
     <ignore name="intel-gpu-tools"/>
     <package name="spice-vdagent"/>
-    <package name="aaa_base" replaces="open-vm-tools"/>
+    <!-- OBS-IgnorePackage: open-vm-tools -->
     <ignore name="open-vm-tools"/>
-    <package name="aaa_base" replaces="usb_modeswitch"/>
+    <!-- OBS-IgnorePackage: usb_modeswitch -->
     <ignore name="usb_modeswitch"/>
-    <package name="aaa_base" replaces="gstreamer-plugins-rs"/>
+    <!-- OBS-IgnorePackage: gstreamer-plugins-rs -->
     <ignore name="gstreamer-plugins-rs"/>
-    <package name="aaa_base" replaces="vim-data"/>
+    <!-- OBS-IgnorePackage: vim-data -->
     <ignore name="vim-data"/>
-    <package name="aaa_base" replaces="vim"/>
+    <!-- OBS-IgnorePackage: vim -->
     <ignore name="vim"/>
     <package name="vim-small"/>
     <package name="kernel-default"/>
@@ -411,57 +411,57 @@
     <package name="xz"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
-    <package name="aaa_base" replaces="ntp"/>
+    <!-- OBS-IgnorePackage: ntp -->
     <ignore name="ntp"/>
-    <package name="aaa_base" replaces="wicked"/>
+    <!-- OBS-IgnorePackage: wicked -->
     <ignore name="wicked"/>
     <package name="ucode-amd" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="ucode-intel"/>
+    <!-- OBS-IgnorePackage: ucode-intel -->
     <ignore name="ucode-intel"/>
 
     <!-- list-kde.sh -->
-    <package name="aaa_base" replaces="gvfs"/>
+    <!-- OBS-IgnorePackage: gvfs -->
     <ignore name="gvfs"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-galaxy"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-galaxy -->
     <ignore name="libreoffice-icon-theme-galaxy"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-hicontrast"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-hicontrast -->
     <ignore name="libreoffice-icon-theme-hicontrast"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-tango"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-tango -->
     <ignore name="libreoffice-icon-theme-tango"/>
-    <package name="aaa_base" replaces="libreoffice-base-drivers-mysql"/>
+    <!-- OBS-IgnorePackage: libreoffice-base-drivers-mysql -->
     <ignore name="libreoffice-base-drivers-mysql"/>
-    <package name="aaa_base" replaces="libreoffice-pyuno"/>
+    <!-- OBS-IgnorePackage: libreoffice-pyuno -->
     <ignore name="libreoffice-pyuno"/>
-    <package name="aaa_base" replaces="cairomm"/>
+    <!-- OBS-IgnorePackage: cairomm -->
     <ignore name="cairomm"/>
-    <package name="aaa_base" replaces="evolution-data-server"/>
+    <!-- OBS-IgnorePackage: evolution-data-server -->
     <ignore name="evolution-data-server"/>
-    <package name="aaa_base" replaces="notification-daemon"/>
+    <!-- OBS-IgnorePackage: notification-daemon -->
     <ignore name="notification-daemon"/>
-    <package name="aaa_base" replaces="gdm"/>
+    <!-- OBS-IgnorePackage: gdm -->
     <ignore name="gdm"/>
-    <package name="aaa_base" replaces="akregator"/>
+    <!-- OBS-IgnorePackage: akregator -->
     <ignore name="akregator"/>
-    <package name="aaa_base" replaces="ImageMagick"/>
+    <!-- OBS-IgnorePackage: ImageMagick -->
     <ignore name="ImageMagick"/>
     <package name="patterns-kde-kde"/>
     <namedCollection name="kde"/>
     <package name="plasma5-workspace-branding-openSUSE"/>
     <package name="baloo5-tools"/>
     <package name="NetworkManager"/>
-    <package name="aaa_base" replaces="libreoffice"/>
+    <!-- OBS-IgnorePackage: libreoffice -->
     <ignore name="libreoffice"/>
-    <package name="aaa_base" replaces="libreoffice-icon-themes"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-themes -->
     <ignore name="libreoffice-icon-themes"/>
-    <package name="aaa_base" replaces="libreoffice-icon-theme-breeze"/>
+    <!-- OBS-IgnorePackage: libreoffice-icon-theme-breeze -->
     <ignore name="libreoffice-icon-theme-breeze"/>
-    <package name="aaa_base" replaces="kdenetwork4-filesharing"/>
+    <!-- OBS-IgnorePackage: kdenetwork4-filesharing -->
     <ignore name="kdenetwork4-filesharing"/>
-    <package name="aaa_base" replaces="gnome-keyring"/>
+    <!-- OBS-IgnorePackage: gnome-keyring -->
     <ignore name="gnome-keyring"/>
-    <package name="aaa_base" replaces="openssh-askpass-gnome"/>
+    <!-- OBS-IgnorePackage: openssh-askpass-gnome -->
     <ignore name="openssh-askpass-gnome"/>
-    <package name="aaa_base" replaces="libgtk-2_0-0"/>
+    <!-- OBS-IgnorePackage: libgtk-2_0-0 -->
     <ignore name="libgtk-2_0-0"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
@@ -471,15 +471,15 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
-    <package name="aaa_base" replaces="yast2-samba-client"/>
+    <!-- OBS-IgnorePackage: yast2-samba-client -->
     <ignore name="yast2-samba-client"/>
-    <package name="aaa_base" replaces="yast2-vpn"/>
+    <!-- OBS-IgnorePackage: yast2-vpn -->
     <ignore name="yast2-vpn"/>
-    <package name="aaa_base" replaces="yast2-journal"/>
+    <!-- OBS-IgnorePackage: yast2-journal -->
     <ignore name="yast2-journal"/>
-    <package name="aaa_base" replaces="yast2-auth-client"/>
+    <!-- OBS-IgnorePackage: yast2-auth-client -->
     <ignore name="yast2-auth-client"/>
-    <package name="aaa_base" replaces="yast2-sudo"/>
+    <!-- OBS-IgnorePackage: yast2-sudo -->
     <ignore name="yast2-sudo"/>
     <package name="yast2-trans-de"/>
     <package name="live-net-installer"/>
@@ -491,60 +491,60 @@
     <package name="lklug-fonts"/>
     <package name="indic-fonts"/>
     <package name="arabic-kacst-fonts"/>
-    <package name="aaa_base" replaces="oxygen5-icon-theme-large"/>
+    <!-- OBS-IgnorePackage: oxygen5-icon-theme-large -->
     <ignore name="oxygen5-icon-theme-large"/>
-    <package name="aaa_base" replaces="plasma5-desktop-emojier"/>
+    <!-- OBS-IgnorePackage: plasma5-desktop-emojier -->
     <ignore name="plasma5-desktop-emojier"/>
     <package name="plasma-nm5"/>
     <package name="phonon4qt5-backend-vlc"/>
-    <package name="aaa_base" replaces="ispell"/>
+    <!-- OBS-IgnorePackage: ispell -->
     <ignore name="ispell"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_games"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_games -->
     <ignore name="patterns-kde-kde_games"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_pim"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_pim -->
     <ignore name="patterns-kde-kde_pim"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_utilities"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_utilities -->
     <ignore name="patterns-kde-kde_utilities"/>
     <package name="kcharselect"/>
-    <package name="aaa_base" replaces="plasma-nm5-openconnect"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-openconnect -->
     <ignore name="plasma-nm5-openconnect"/>
-    <package name="aaa_base" replaces="plasma-nm5-openvpn"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-openvpn -->
     <ignore name="plasma-nm5-openvpn"/>
-    <package name="aaa_base" replaces="kdoctools"/>
+    <!-- OBS-IgnorePackage: kdoctools -->
     <ignore name="kdoctools"/>
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="digikam"/>
+    <!-- OBS-IgnorePackage: digikam -->
     <ignore name="digikam"/>
-    <package name="aaa_base" replaces="gdb"/>
+    <!-- OBS-IgnorePackage: gdb -->
     <ignore name="gdb"/>
-    <package name="aaa_base" replaces="hugin"/>
+    <!-- OBS-IgnorePackage: hugin -->
     <ignore name="hugin"/>
-    <package name="aaa_base" replaces="icewm"/>
+    <!-- OBS-IgnorePackage: icewm -->
     <ignore name="icewm"/>
-    <package name="aaa_base" replaces="kmahjongg-lang"/>
+    <!-- OBS-IgnorePackage: kmahjongg-lang -->
     <ignore name="kmahjongg-lang"/>
-    <package name="aaa_base" replaces="konversation-lang"/>
+    <!-- OBS-IgnorePackage: konversation-lang -->
     <ignore name="konversation-lang"/>
-    <package name="aaa_base" replaces="libproxy1-pacrunner-webkit"/>
+    <!-- OBS-IgnorePackage: libproxy1-pacrunner-webkit -->
     <ignore name="libproxy1-pacrunner-webkit"/>
-    <package name="aaa_base" replaces="vlc"/>
+    <!-- OBS-IgnorePackage: vlc -->
     <ignore name="vlc"/>
-    <package name="aaa_base" replaces="vlc-qt"/>
+    <!-- OBS-IgnorePackage: vlc-qt -->
     <ignore name="vlc-qt"/>
-    <package name="aaa_base" replaces="vlc-lang"/>
+    <!-- OBS-IgnorePackage: vlc-lang -->
     <ignore name="vlc-lang"/>
-    <package name="aaa_base" replaces="kipi-plugins"/>
+    <!-- OBS-IgnorePackage: kipi-plugins -->
     <ignore name="kipi-plugins"/>
-    <package name="aaa_base" replaces="breeze5-wallpapers"/>
+    <!-- OBS-IgnorePackage: breeze5-wallpapers -->
     <ignore name="breeze5-wallpapers"/>
     <package name="partitionmanager"/>
-    <package name="aaa_base" replaces="cyrus-sasl"/>
+    <!-- OBS-IgnorePackage: cyrus-sasl -->
     <ignore name="cyrus-sasl"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts -->
     <ignore name="xorg-x11-fonts"/>
     <package name="alsa-firmware"/>
     <package name="opensuse-welcome"/>
-    <package name="aaa_base" replaces="bluedevil5"/>
+    <!-- OBS-IgnorePackage: bluedevil5 -->
     <ignore name="bluedevil5"/>
   </packages>
   <packages type="bootstrap">
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index e412fc3..d8a8665 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Tumbleweed-Rescue-CD" displayname="openSUSE Tumbleweed Rescue CD">
+<image schemaversion="7.4" name="openSUSE-Tumbleweed-Rescue-CD" displayname="openSUSE Tumbleweed Rescue CD">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_Rescue_CD" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Tumbleweed_Rescue_CD" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Tumbleweed_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -57,289 +57,289 @@
     <archive name="livecd-udev.tar.xz"/>
     
     <!-- list-common.sh -->
-    <package name="aaa_base" replaces="poppler-data"/>
+    <!-- OBS-IgnorePackage: poppler-data -->
     <ignore name="poppler-data"/>
-    <package name="aaa_base" replaces="tin"/>
+    <!-- OBS-IgnorePackage: tin -->
     <ignore name="tin"/>
-    <package name="aaa_base" replaces="desktop-translations"/>
+    <!-- OBS-IgnorePackage: desktop-translations -->
     <ignore name="desktop-translations"/>
-    <package name="aaa_base" replaces="ft2demos"/>
+    <!-- OBS-IgnorePackage: ft2demos -->
     <ignore name="ft2demos"/>
-    <package name="aaa_base" replaces="gimp-help"/>
+    <!-- OBS-IgnorePackage: gimp-help -->
     <ignore name="gimp-help"/>
-    <package name="aaa_base" replaces="gimp-lang"/>
+    <!-- OBS-IgnorePackage: gimp-lang -->
     <ignore name="gimp-lang"/>
-    <package name="aaa_base" replaces="libreoffice-base"/>
+    <!-- OBS-IgnorePackage: libreoffice-base -->
     <ignore name="libreoffice-base"/>
-    <package name="aaa_base" replaces="libreoffice-mailmerge"/>
+    <!-- OBS-IgnorePackage: libreoffice-mailmerge -->
     <ignore name="libreoffice-mailmerge"/>
-    <package name="aaa_base" replaces="libreoffice-math"/>
+    <!-- OBS-IgnorePackage: libreoffice-math -->
     <ignore name="libreoffice-math"/>
-    <package name="aaa_base" replaces="libreoffice-filters-optional"/>
+    <!-- OBS-IgnorePackage: libreoffice-filters-optional -->
     <ignore name="libreoffice-filters-optional"/>
-    <package name="aaa_base" replaces="libreoffice-pyuno"/>
+    <!-- OBS-IgnorePackage: libreoffice-pyuno -->
     <ignore name="libreoffice-pyuno"/>
-    <package name="aaa_base" replaces="readline-doc"/>
+    <!-- OBS-IgnorePackage: readline-doc -->
     <ignore name="readline-doc"/>
-    <package name="aaa_base" replaces="graphviz"/>
+    <!-- OBS-IgnorePackage: graphviz -->
     <ignore name="graphviz"/>
-    <package name="aaa_base" replaces="linux-kernel-headers"/>
+    <!-- OBS-IgnorePackage: linux-kernel-headers -->
     <ignore name="linux-kernel-headers"/>
-    <package name="aaa_base" replaces="bash-doc"/>
+    <!-- OBS-IgnorePackage: bash-doc -->
     <ignore name="bash-doc"/>
-    <package name="aaa_base" replaces="gimp-plugins-python"/>
+    <!-- OBS-IgnorePackage: gimp-plugins-python -->
     <ignore name="gimp-plugins-python"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_basis_opt -->
     <ignore name="patterns-openSUSE-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_admin -->
     <ignore name="patterns-openSUSE-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_multimedia_opt -->
     <ignore name="patterns-openSUSE-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_imaging_opt -->
     <ignore name="patterns-openSUSE-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_office_opt -->
     <ignore name="patterns-openSUSE-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-apparmor_opt -->
     <ignore name="patterns-openSUSE-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-enhanced_base_opt -->
     <ignore name="patterns-openSUSE-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-fonts_opt -->
     <ignore name="patterns-openSUSE-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-imaging_opt -->
     <ignore name="patterns-openSUSE-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-kde_utilities_opt -->
     <ignore name="patterns-openSUSE-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-multimedia_opt -->
     <ignore name="patterns-openSUSE-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-office_opt -->
     <ignore name="patterns-openSUSE-office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-x11_opt -->
     <ignore name="patterns-openSUSE-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_basis_opt -->
     <ignore name="patterns-gnome-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-gmome-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-gmome-gnome_admin -->
     <ignore name="patterns-gmome-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_multimedia_opt -->
     <ignore name="patterns-gnome-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_imaging_opt -->
     <ignore name="patterns-gnome-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_office_opt -->
     <ignore name="patterns-gnome-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-apparmor_opt -->
     <ignore name="patterns-base-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-base-documentation"/>
+    <!-- OBS-IgnorePackage: patterns-base-documentation -->
     <ignore name="patterns-base-documentation"/>
-    <package name="aaa_base" replaces="patterns-base-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-enhanced_base_opt -->
     <ignore name="patterns-base-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-fonts-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-fonts-fonts_opt -->
     <ignore name="patterns-fonts-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-imaging_opt -->
     <ignore name="patterns-desktop-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_utilities_opt -->
     <ignore name="patterns-kde-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-multimedia_opt -->
     <ignore name="patterns-desktop-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-office-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-office-office_opt -->
     <ignore name="patterns-office-office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_opt -->
     <ignore name="patterns-base-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_enhanced"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_enhanced -->
     <ignore name="patterns-base-x11_enhanced"/>
-    <package name="aaa_base" replaces="make"/>
+    <!-- OBS-IgnorePackage: make -->
     <ignore name="make"/>
-    <package name="aaa_base" replaces="netpbm"/>
+    <!-- OBS-IgnorePackage: netpbm -->
     <ignore name="netpbm"/>
-    <package name="aaa_base" replaces="p7zip-full"/>
+    <!-- OBS-IgnorePackage: p7zip-full -->
     <ignore name="p7zip-full"/>
-    <package name="aaa_base" replaces="busybox-static"/>
+    <!-- OBS-IgnorePackage: busybox-static -->
     <ignore name="busybox-static"/>
-    <package name="aaa_base" replaces="inxi"/>
+    <!-- OBS-IgnorePackage: inxi -->
     <ignore name="inxi"/>
-    <package name="aaa_base" replaces="sane-backends"/>
+    <!-- OBS-IgnorePackage: sane-backends -->
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="aaa_base" replaces="glibc-32bit"/>
+    <!-- OBS-IgnorePackage: glibc-32bit -->
     <ignore name="glibc-32bit"/>
-    <package name="aaa_base" replaces="libvdpau_r300"/>
+    <!-- OBS-IgnorePackage: libvdpau_r300 -->
     <ignore name="libvdpau_r300"/>
-    <package name="aaa_base" replaces="libvdpau_radeonsi"/>
+    <!-- OBS-IgnorePackage: libvdpau_radeonsi -->
     <ignore name="libvdpau_radeonsi"/>
-    <package name="aaa_base" replaces="libvdpau_r600"/>
+    <!-- OBS-IgnorePackage: libvdpau_r600 -->
     <ignore name="libvdpau_r600"/>
-    <package name="aaa_base" replaces="pavucontrol"/>
+    <!-- OBS-IgnorePackage: pavucontrol -->
     <ignore name="pavucontrol"/>
-    <package name="aaa_base" replaces="libqmi-tools"/>
+    <!-- OBS-IgnorePackage: libqmi-tools -->
     <ignore name="libqmi-tools"/>
-    <package name="aaa_base" replaces="python*-pip"/>
+    <!-- OBS-IgnorePackage: python*-pip -->
     <ignore name="python*-pip"/>
-    <package name="aaa_base" replaces="multipath-tools-rbd"/>
+    <!-- OBS-IgnorePackage: multipath-tools-rbd -->
     <ignore name="multipath-tools-rbd"/>
-    <package name="aaa_base" replaces="acpica"/>
+    <!-- OBS-IgnorePackage: acpica -->
     <ignore name="acpica"/>
-    <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
+    <!-- OBS-IgnorePackage: xorg-x11-Xvnc -->
     <ignore name="xorg-x11-Xvnc"/>
-    <package name="aaa_base" replaces="cabextract"/>
+    <!-- OBS-IgnorePackage: cabextract -->
     <ignore name="cabextract"/>
-    <package name="aaa_base" replaces="sssd"/>
+    <!-- OBS-IgnorePackage: sssd -->
     <ignore name="sssd"/>
-    <package name="aaa_base" replaces="db-utils"/>
+    <!-- OBS-IgnorePackage: db-utils -->
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="dnsmasq"/>
+    <!-- OBS-IgnorePackage: dnsmasq -->
     <ignore name="dnsmasq"/>
-    <package name="aaa_base" replaces="fribidi"/>
+    <!-- OBS-IgnorePackage: fribidi -->
     <ignore name="fribidi"/>
-    <package name="aaa_base" replaces="ipmitool"/>
+    <!-- OBS-IgnorePackage: ipmitool -->
     <ignore name="ipmitool"/>
-    <package name="aaa_base" replaces="irda"/>
+    <!-- OBS-IgnorePackage: irda -->
     <ignore name="irda"/>
-    <package name="aaa_base" replaces="lomoco"/>
+    <!-- OBS-IgnorePackage: lomoco -->
     <ignore name="lomoco"/>
-    <package name="aaa_base" replaces="mksh"/>
+    <!-- OBS-IgnorePackage: mksh -->
     <ignore name="mksh"/>
-    <package name="aaa_base" replaces="cifs-utils"/>
+    <!-- OBS-IgnorePackage: cifs-utils -->
     <ignore name="cifs-utils"/>
-    <package name="aaa_base" replaces="gvfs-backend-samba"/>
+    <!-- OBS-IgnorePackage: gvfs-backend-samba -->
     <ignore name="gvfs-backend-samba"/>
-    <package name="aaa_base" replaces="xorg-x11"/>
+    <!-- OBS-IgnorePackage: xorg-x11 -->
     <ignore name="xorg-x11"/>
-    <package name="aaa_base" replaces="xorg-x11-essentials"/>
+    <!-- OBS-IgnorePackage: xorg-x11-essentials -->
     <ignore name="xorg-x11-essentials"/>
-    <package name="aaa_base" replaces="xorg-x11-server-extra"/>
+    <!-- OBS-IgnorePackage: xorg-x11-server-extra -->
     <ignore name="xorg-x11-server-extra"/>
     <package name="xdm"/>
     <package name="sysvinit-tools"/>
-    <package name="aaa_base" replaces="icewm"/>
+    <!-- OBS-IgnorePackage: icewm -->
     <ignore name="icewm"/>
-    <package name="aaa_base" replaces="baekmuk-ttf-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-ttf-fonts -->
     <ignore name="baekmuk-ttf-fonts"/>
-    <package name="aaa_base" replaces="google-droid-fonts"/>
+    <!-- OBS-IgnorePackage: google-droid-fonts -->
     <ignore name="google-droid-fonts"/>
-    <package name="aaa_base" replaces="efont-unicode-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: efont-unicode-bitmap-fonts -->
     <ignore name="efont-unicode-bitmap-fonts"/>
-    <package name="aaa_base" replaces="baekmuk-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-bitmap-fonts -->
     <ignore name="baekmuk-bitmap-fonts"/>
-    <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: intlfonts-chinese-big-bitmap-fonts -->
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-legacy -->
     <ignore name="xorg-x11-fonts-legacy"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-converted -->
     <ignore name="xorg-x11-fonts-converted"/>
-    <package name="aaa_base" replaces="strace"/>
+    <!-- OBS-IgnorePackage: strace -->
     <ignore name="strace"/>
-    <package name="aaa_base" replaces="tcsh"/>
+    <!-- OBS-IgnorePackage: tcsh -->
     <ignore name="tcsh"/>
-    <package name="aaa_base" replaces="usbmuxd"/>
+    <!-- OBS-IgnorePackage: usbmuxd -->
     <ignore name="usbmuxd"/>
-    <package name="aaa_base" replaces="gnome-keyring-pam"/>
+    <!-- OBS-IgnorePackage: gnome-keyring-pam -->
     <ignore name="gnome-keyring-pam"/>
-    <package name="aaa_base" replaces="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
-    <package name="aaa_base" replaces="apparmor-docs"/>
+    <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
-    <package name="aaa_base" replaces="mutt-doc"/>
+    <!-- OBS-IgnorePackage: mutt-doc -->
     <ignore name="mutt-doc"/>
-    <package name="aaa_base" replaces="coreutils-doc"/>
+    <!-- OBS-IgnorePackage: coreutils-doc -->
     <ignore name="coreutils-doc"/>
-    <package name="aaa_base" replaces="unar"/>
+    <!-- OBS-IgnorePackage: unar -->
     <ignore name="unar"/>
-    <package name="aaa_base" replaces="jing"/>
+    <!-- OBS-IgnorePackage: jing -->
     <ignore name="jing"/>
-    <package name="aaa_base" replaces="icedtea-web"/>
+    <!-- OBS-IgnorePackage: icedtea-web -->
     <ignore name="icedtea-web"/>
-    <package name="aaa_base" replaces="tigervnc"/>
+    <!-- OBS-IgnorePackage: tigervnc -->
     <ignore name="tigervnc"/>
-    <package name="aaa_base" replaces="autofs"/>
+    <!-- OBS-IgnorePackage: autofs -->
     <ignore name="autofs"/>
-    <package name="aaa_base" replaces="expect"/>
+    <!-- OBS-IgnorePackage: expect -->
     <ignore name="expect"/>
-    <package name="aaa_base" replaces="m4"/>
+    <!-- OBS-IgnorePackage: m4 -->
     <ignore name="m4"/>
-    <package name="aaa_base" replaces="mutt"/>
+    <!-- OBS-IgnorePackage: mutt -->
     <ignore name="mutt"/>
-    <package name="aaa_base" replaces="net-snmp"/>
+    <!-- OBS-IgnorePackage: net-snmp -->
     <ignore name="net-snmp"/>
-    <package name="aaa_base" replaces="procmail"/>
+    <!-- OBS-IgnorePackage: procmail -->
     <ignore name="procmail"/>
-    <package name="aaa_base" replaces="recode"/>
+    <!-- OBS-IgnorePackage: recode -->
     <ignore name="recode"/>
-    <package name="aaa_base" replaces="spax"/>
+    <!-- OBS-IgnorePackage: spax -->
     <ignore name="spax"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="espeak"/>
+    <!-- OBS-IgnorePackage: espeak -->
     <ignore name="espeak"/>
-    <package name="aaa_base" replaces="pam_mount"/>
+    <!-- OBS-IgnorePackage: pam_mount -->
     <ignore name="pam_mount"/>
-    <package name="aaa_base" replaces="groff-full"/>
+    <!-- OBS-IgnorePackage: groff-full -->
     <ignore name="groff-full"/>
-    <package name="aaa_base" replaces="tuned"/>
+    <!-- OBS-IgnorePackage: tuned -->
     <ignore name="tuned"/>
-    <package name="aaa_base" replaces="cups"/>
+    <!-- OBS-IgnorePackage: cups -->
     <ignore name="cups"/>
-    <package name="aaa_base" replaces="cups-client"/>
+    <!-- OBS-IgnorePackage: cups-client -->
     <ignore name="cups-client"/>
-    <package name="aaa_base" replaces="system-config-printer"/>
+    <!-- OBS-IgnorePackage: system-config-printer -->
     <ignore name="system-config-printer"/>
-    <package name="aaa_base" replaces="ghostscript"/>
+    <!-- OBS-IgnorePackage: ghostscript -->
     <ignore name="ghostscript"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-std"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-std -->
     <ignore name="ghostscript-fonts-std"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-other"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-other -->
     <ignore name="ghostscript-fonts-other"/>
-    <package name="aaa_base" replaces="manufacturer-PPDs"/>
+    <!-- OBS-IgnorePackage: manufacturer-PPDs -->
     <ignore name="manufacturer-PPDs"/>
-    <package name="aaa_base" replaces="gutenprint"/>
+    <!-- OBS-IgnorePackage: gutenprint -->
     <ignore name="gutenprint"/>
-    <package name="aaa_base" replaces="hplip-hpijs"/>
+    <!-- OBS-IgnorePackage: hplip-hpijs -->
     <ignore name="hplip-hpijs"/>
-    <package name="aaa_base" replaces="hplip"/>
+    <!-- OBS-IgnorePackage: hplip -->
     <ignore name="hplip"/>
-    <package name="aaa_base" replaces="system-config-printer-applet"/>
+    <!-- OBS-IgnorePackage: system-config-printer-applet -->
     <ignore name="system-config-printer-applet"/>
-    <package name="aaa_base" replaces="udev-configure-printer"/>
+    <!-- OBS-IgnorePackage: udev-configure-printer -->
     <ignore name="udev-configure-printer"/>
-    <package name="aaa_base" replaces="systemd-coredump"/>
+    <!-- OBS-IgnorePackage: systemd-coredump -->
     <ignore name="systemd-coredump"/>
-    <package name="aaa_base" replaces="systemd-doc"/>
+    <!-- OBS-IgnorePackage: systemd-doc -->
     <ignore name="systemd-doc"/>
-    <package name="aaa_base" replaces="man-pages"/>
+    <!-- OBS-IgnorePackage: man-pages -->
     <ignore name="man-pages"/>
-    <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
+    <!-- OBS-IgnorePackage: NetworkManager-vpnc-gnome -->
     <ignore name="NetworkManager-vpnc-gnome"/>
-    <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-vpnc -->
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <!-- OBS-IgnorePackage: busybox-sendmail -->
     <ignore name="busybox-sendmail"/>
-    <package name="aaa_base" replaces="exim"/>
+    <!-- OBS-IgnorePackage: exim -->
     <ignore name="exim"/>
-    <package name="aaa_base" replaces="msmtp-mta"/>
+    <!-- OBS-IgnorePackage: msmtp-mta -->
     <ignore name="msmtp-mta"/>
-    <package name="aaa_base" replaces="postfix"/>
+    <!-- OBS-IgnorePackage: postfix -->
     <ignore name="postfix"/>
-    <package name="aaa_base" replaces="postfix-bdb"/>
+    <!-- OBS-IgnorePackage: postfix-bdb -->
     <ignore name="postfix-bdb"/>
-    <package name="aaa_base" replaces="sendmail"/>
+    <!-- OBS-IgnorePackage: sendmail -->
     <ignore name="sendmail"/>
-    <package name="aaa_base" replaces="virtualbox-guest-tools"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-tools -->
     <ignore name="virtualbox-guest-tools"/>
-    <package name="aaa_base" replaces="virtualbox-guest-x11"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-x11 -->
     <ignore name="virtualbox-guest-x11"/>
-    <package name="aaa_base" replaces="intel-gpu-tools"/>
+    <!-- OBS-IgnorePackage: intel-gpu-tools -->
     <ignore name="intel-gpu-tools"/>
     <package name="spice-vdagent"/>
-    <package name="aaa_base" replaces="open-vm-tools"/>
+    <!-- OBS-IgnorePackage: open-vm-tools -->
     <ignore name="open-vm-tools"/>
-    <package name="aaa_base" replaces="usb_modeswitch"/>
+    <!-- OBS-IgnorePackage: usb_modeswitch -->
     <ignore name="usb_modeswitch"/>
-    <package name="aaa_base" replaces="gstreamer-plugins-rs"/>
+    <!-- OBS-IgnorePackage: gstreamer-plugins-rs -->
     <ignore name="gstreamer-plugins-rs"/>
-    <package name="aaa_base" replaces="vim-data"/>
+    <!-- OBS-IgnorePackage: vim-data -->
     <ignore name="vim-data"/>
-    <package name="aaa_base" replaces="vim"/>
+    <!-- OBS-IgnorePackage: vim -->
     <ignore name="vim"/>
     <package name="vim-small"/>
     <package name="kernel-default"/>
@@ -411,170 +411,170 @@
     <package name="xz"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
-    <package name="aaa_base" replaces="ntp"/>
+    <!-- OBS-IgnorePackage: ntp -->
     <ignore name="ntp"/>
-    <package name="aaa_base" replaces="wicked"/>
+    <!-- OBS-IgnorePackage: wicked -->
     <ignore name="wicked"/>
     <package name="ucode-amd" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="ucode-intel"/>
+    <!-- OBS-IgnorePackage: ucode-intel -->
     <ignore name="ucode-intel"/>
 
     <!-- list-x11.sh -->
-    <package name="aaa_base" replaces="NetworkManager-lang"/>
+    <!-- OBS-IgnorePackage: NetworkManager-lang -->
     <ignore name="NetworkManager-lang"/>
-    <package name="aaa_base" replaces="NetworkManager-applet-lang"/>
+    <!-- OBS-IgnorePackage: NetworkManager-applet-lang -->
     <ignore name="NetworkManager-applet-lang"/>
-    <package name="aaa_base" replaces="PackageKit"/>
+    <!-- OBS-IgnorePackage: PackageKit -->
     <ignore name="PackageKit"/>
-    <package name="aaa_base" replaces="samba-libs"/>
+    <!-- OBS-IgnorePackage: samba-libs -->
     <ignore name="samba-libs"/>
-    <package name="aaa_base" replaces="release-notes-openSUSE"/>
+    <!-- OBS-IgnorePackage: release-notes-openSUSE -->
     <ignore name="release-notes-openSUSE"/>
-    <package name="aaa_base" replaces="gnome-themes-accessibility"/>
+    <!-- OBS-IgnorePackage: gnome-themes-accessibility -->
     <ignore name="gnome-themes-accessibility"/>
-    <package name="aaa_base" replaces="xlockmore"/>
+    <!-- OBS-IgnorePackage: xlockmore -->
     <ignore name="xlockmore"/>
-    <package name="aaa_base" replaces="unzip-doc"/>
+    <!-- OBS-IgnorePackage: unzip-doc -->
     <ignore name="unzip-doc"/>
-    <package name="aaa_base" replaces="gtk2-immodule-inuktitut"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-inuktitut -->
     <ignore name="gtk2-immodule-inuktitut"/>
-    <package name="aaa_base" replaces="gtk2-immodule-thai"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-thai -->
     <ignore name="gtk2-immodule-thai"/>
-    <package name="aaa_base" replaces="gtk2-immodule-vietnamese"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-vietnamese -->
     <ignore name="gtk2-immodule-vietnamese"/>
-    <package name="aaa_base" replaces="gtk2-lang"/>
+    <!-- OBS-IgnorePackage: gtk2-lang -->
     <ignore name="gtk2-lang"/>
-    <package name="aaa_base" replaces="gtk3-immodule-inuktitut"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-inuktitut -->
     <ignore name="gtk3-immodule-inuktitut"/>
-    <package name="aaa_base" replaces="gtk3-immodule-thai"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-thai -->
     <ignore name="gtk3-immodule-thai"/>
-    <package name="aaa_base" replaces="gtk3-immodule-vietnamese"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-vietnamese -->
     <ignore name="gtk3-immodule-vietnamese"/>
-    <package name="aaa_base" replaces="gtk3-lang"/>
+    <!-- OBS-IgnorePackage: gtk3-lang -->
     <ignore name="gtk3-lang"/>
-    <package name="aaa_base" replaces="evince-lang"/>
+    <!-- OBS-IgnorePackage: evince-lang -->
     <ignore name="evince-lang"/>
-    <package name="aaa_base" replaces="hexchat-lang"/>
+    <!-- OBS-IgnorePackage: hexchat-lang -->
     <ignore name="hexchat-lang"/>
-    <package name="aaa_base" replaces="nano-lang"/>
+    <!-- OBS-IgnorePackage: nano-lang -->
     <ignore name="nano-lang"/>
-    <package name="aaa_base" replaces="zenity-lang"/>
+    <!-- OBS-IgnorePackage: zenity-lang -->
     <ignore name="zenity-lang"/>
-    <package name="aaa_base" replaces="gsettings-desktop-schema-lang"/>
+    <!-- OBS-IgnorePackage: gsettings-desktop-schema-lang -->
     <ignore name="gsettings-desktop-schema-lang"/>
-    <package name="aaa_base" replaces="gvfs-lang"/>
+    <!-- OBS-IgnorePackage: gvfs-lang -->
     <ignore name="gvfs-lang"/>
-    <package name="aaa_base" replaces="libstorage-ng-lang"/>
+    <!-- OBS-IgnorePackage: libstorage-ng-lang -->
     <ignore name="libstorage-ng-lang"/>
-    <package name="aaa_base" replaces="joe"/>
+    <!-- OBS-IgnorePackage: joe -->
     <ignore name="joe"/>
-    <package name="aaa_base" replaces="libgphoto2-6-lang"/>
+    <!-- OBS-IgnorePackage: libgphoto2-6-lang -->
     <ignore name="libgphoto2-6-lang"/>
-    <package name="aaa_base" replaces="alsa"/>
+    <!-- OBS-IgnorePackage: alsa -->
     <ignore name="alsa"/>
-    <package name="aaa_base" replaces="alsa-firmware"/>
+    <!-- OBS-IgnorePackage: alsa-firmware -->
     <ignore name="alsa-firmware"/>
-    <package name="aaa_base" replaces="alsa-plugins"/>
+    <!-- OBS-IgnorePackage: alsa-plugins -->
     <ignore name="alsa-plugins"/>
-    <package name="aaa_base" replaces="xscreensaver"/>
+    <!-- OBS-IgnorePackage: xscreensaver -->
     <ignore name="xscreensaver"/>
-    <package name="aaa_base" replaces="PackageKit-gstreamer-plugin"/>
+    <!-- OBS-IgnorePackage: PackageKit-gstreamer-plugin -->
     <ignore name="PackageKit-gstreamer-plugin"/>
-    <package name="aaa_base" replaces="ImageMagick"/>
+    <!-- OBS-IgnorePackage: ImageMagick -->
     <ignore name="ImageMagick"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="sbl"/>
+    <!-- OBS-IgnorePackage: sbl -->
     <ignore name="sbl"/>
-    <package name="aaa_base" replaces="gnome-online-accounts"/>
+    <!-- OBS-IgnorePackage: gnome-online-accounts -->
     <ignore name="gnome-online-accounts"/>
-    <package name="aaa_base" replaces="snapper"/>
+    <!-- OBS-IgnorePackage: snapper -->
     <ignore name="snapper"/>
-    <package name="aaa_base" replaces="patterns-yast-yast2_basis"/>
+    <!-- OBS-IgnorePackage: patterns-yast-yast2_basis -->
     <ignore name="patterns-yast-yast2_basis"/>
-    <package name="aaa_base" replaces="yast2-control-center"/>
+    <!-- OBS-IgnorePackage: yast2-control-center -->
     <ignore name="yast2-control-center"/>
-    <package name="aaa_base" replaces="yast2-control-center-qt"/>
+    <!-- OBS-IgnorePackage: yast2-control-center-qt -->
     <ignore name="yast2-control-center-qt"/>
-    <package name="aaa_base" replaces="libyui*"/>
+    <!-- OBS-IgnorePackage: libyui* -->
     <ignore name="libyui*"/>
-    <package name="aaa_base" replaces="Mesa-libva"/>
+    <!-- OBS-IgnorePackage: Mesa-libva -->
     <ignore name="Mesa-libva"/>
-    <package name="aaa_base" replaces="python-base"/>
+    <!-- OBS-IgnorePackage: python-base -->
     <ignore name="python-base"/>
-    <package name="aaa_base" replaces="python38-pip"/>
+    <!-- OBS-IgnorePackage: python38-pip -->
     <ignore name="python38-pip"/>
-    <package name="aaa_base" replaces="libpeas-loader-python"/>
+    <!-- OBS-IgnorePackage: libpeas-loader-python -->
     <ignore name="libpeas-loader-python"/>
-    <package name="aaa_base" replaces="aspell-en"/>
+    <!-- OBS-IgnorePackage: aspell-en -->
     <ignore name="aspell-en"/>
-    <package name="aaa_base" replaces="ModemManager"/>
+    <!-- OBS-IgnorePackage: ModemManager -->
     <ignore name="ModemManager"/>
-    <package name="aaa_base" replaces="avahi"/>
+    <!-- OBS-IgnorePackage: avahi -->
     <ignore name="avahi"/>
-    <package name="aaa_base" replaces="fprintd"/>
+    <!-- OBS-IgnorePackage: fprintd -->
     <ignore name="fprintd"/>
-    <package name="aaa_base" replaces="MozillaFirefox"/>
+    <!-- OBS-IgnorePackage: MozillaFirefox -->
     <ignore name="MozillaFirefox"/>
-    <package name="aaa_base" replaces="tcpdump"/>
+    <!-- OBS-IgnorePackage: tcpdump -->
     <ignore name="tcpdump"/>
     <package name="gparted"/>
     <package name="epiphany"/>
-    <package name="aaa_base" replaces="gparted-lang"/>
+    <!-- OBS-IgnorePackage: gparted-lang -->
     <ignore name="gparted-lang"/>
-    <package name="aaa_base" replaces="epiaphy-lang"/>
+    <!-- OBS-IgnorePackage: epiaphy-lang -->
     <ignore name="epiaphy-lang"/>
-    <package name="aaa_base" replaces="iso-codes-lang"/>
+    <!-- OBS-IgnorePackage: iso-codes-lang -->
     <ignore name="iso-codes-lang"/>
-    <package name="aaa_base" replaces="glib2-lang"/>
+    <!-- OBS-IgnorePackage: glib2-lang -->
     <ignore name="glib2-lang"/>
-    <package name="aaa_base" replaces="thunar-lang"/>
+    <!-- OBS-IgnorePackage: thunar-lang -->
     <ignore name="thunar-lang"/>
-    <package name="aaa_base" replaces="xfce4-settings-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-settings-lang -->
     <ignore name="xfce4-settings-lang"/>
-    <package name="aaa_base" replaces="xfce4-panel-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-panel-lang -->
     <ignore name="xfce4-panel-lang"/>
-    <package name="aaa_base" replaces="xfce-terminal-lang"/>
+    <!-- OBS-IgnorePackage: xfce-terminal-lang -->
     <ignore name="xfce-terminal-lang"/>
-    <package name="aaa_base" replaces="exo-lang"/>
+    <!-- OBS-IgnorePackage: exo-lang -->
     <ignore name="exo-lang"/>
-    <package name="aaa_base" replaces="xfdesktop-lang"/>
+    <!-- OBS-IgnorePackage: xfdesktop-lang -->
     <ignore name="xfdesktop-lang"/>
-    <package name="aaa_base" replaces="xfce4-power-manager-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-power-manager-lang -->
     <ignore name="xfce4-power-manager-lang"/>
-    <package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
+    <!-- OBS-IgnorePackage: noto-sans-cjk-fonts -->
     <ignore name="noto-sans-cjk-fonts"/>
-    <package name="aaa_base" replaces="man-pages-posix"/>
+    <!-- OBS-IgnorePackage: man-pages-posix -->
     <ignore name="man-pages-posix"/>
-    <package name="aaa_base" replaces="libvulkan_radeon"/>
+    <!-- OBS-IgnorePackage: libvulkan_radeon -->
     <ignore name="libvulkan_radeon"/>
-    <package name="aaa_base" replaces="man"/>
+    <!-- OBS-IgnorePackage: man -->
     <ignore name="man"/>
-    <package name="aaa_base" replaces="groff"/>
+    <!-- OBS-IgnorePackage: groff -->
     <ignore name="groff"/>
-    <package name="aaa_base" replaces="libqt5-qttranslations"/>
+    <!-- OBS-IgnorePackage: libqt5-qttranslations -->
     <ignore name="libqt5-qttranslations"/>
-    <package name="aaa_base" replaces="plymouth"/>
+    <!-- OBS-IgnorePackage: plymouth -->
     <ignore name="plymouth"/>
-    <package name="aaa_base" replaces="7zip"/>
+    <!-- OBS-IgnorePackage: 7zip -->
     <ignore name="7zip"/>
-    <package name="aaa_base" replaces="bind-utils"/>
+    <!-- OBS-IgnorePackage: bind-utils -->
     <ignore name="bind-utils"/>
-    <package name="aaa_base" replaces="tumbler"/>
+    <!-- OBS-IgnorePackage: tumbler -->
     <ignore name="tumbler"/>
-    <package name="aaa_base" replaces="ristretto"/>
+    <!-- OBS-IgnorePackage: ristretto -->
     <ignore name="ristretto"/>
-    <package name="aaa_base" replaces="cyrus-sasl"/>
+    <!-- OBS-IgnorePackage: cyrus-sasl -->
     <ignore name="cyrus-sasl"/>
-    <package name="aaa_base" replaces="deltarpm"/>
+    <!-- OBS-IgnorePackage: deltarpm -->
     <ignore name="deltarpm"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts -->
     <ignore name="xorg-x11-fonts"/>
-    <package name="aaa_base" replaces="Mesa-dri-nouveau"/>
+    <!-- OBS-IgnorePackage: Mesa-dri-nouveau -->
     <ignore name="Mesa-dri-nouveau"/>
-    <package name="aaa_base" replaces="libvdpau_nouveau"/>
+    <!-- OBS-IgnorePackage: libvdpau_nouveau -->
     <ignore name="libvdpau_nouveau"/>
-    <package name="aaa_base" replaces="gstreamer-plugins-bad"/>
+    <!-- OBS-IgnorePackage: gstreamer-plugins-bad -->
     <ignore name="gstreamer-plugins-bad"/>
     <package name="patterns-xfce-xfce_basis"/>
     <namedCollection name="xfce_basis"/>
@@ -609,7 +609,7 @@
     <package name="NetworkManager-applet"/>
     <package name="xfce4-panel-plugin-xkb"/>
     <package name="xfce4-terminal"/>
-    <package name="aaa_base" replaces="argyllcms"/>
+    <!-- OBS-IgnorePackage: argyllcms -->
     <ignore name="argyllcms"/>
   </packages>
   <packages type="bootstrap">
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index b529888..3676e52 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Tumbleweed-XFCE-Live" displayname="openSUSE Tumbleweed XFCE Live">
+<image schemaversion="7.4" name="openSUSE-Tumbleweed-XFCE-Live" displayname="openSUSE Tumbleweed XFCE Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_XFCE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Tumbleweed_XFCE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Tumbleweed_XFCE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Tumbleweed_XFCE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>bgrt</bootsplash-theme>
@@ -57,289 +57,289 @@
     <archive name="livecd-udev.tar.xz"/>
     
     <!-- list-common.sh -->
-    <package name="aaa_base" replaces="poppler-data"/>
+    <!-- OBS-IgnorePackage: poppler-data -->
     <ignore name="poppler-data"/>
-    <package name="aaa_base" replaces="tin"/>
+    <!-- OBS-IgnorePackage: tin -->
     <ignore name="tin"/>
-    <package name="aaa_base" replaces="desktop-translations"/>
+    <!-- OBS-IgnorePackage: desktop-translations -->
     <ignore name="desktop-translations"/>
-    <package name="aaa_base" replaces="ft2demos"/>
+    <!-- OBS-IgnorePackage: ft2demos -->
     <ignore name="ft2demos"/>
-    <package name="aaa_base" replaces="gimp-help"/>
+    <!-- OBS-IgnorePackage: gimp-help -->
     <ignore name="gimp-help"/>
-    <package name="aaa_base" replaces="gimp-lang"/>
+    <!-- OBS-IgnorePackage: gimp-lang -->
     <ignore name="gimp-lang"/>
-    <package name="aaa_base" replaces="libreoffice-base"/>
+    <!-- OBS-IgnorePackage: libreoffice-base -->
     <ignore name="libreoffice-base"/>
-    <package name="aaa_base" replaces="libreoffice-mailmerge"/>
+    <!-- OBS-IgnorePackage: libreoffice-mailmerge -->
     <ignore name="libreoffice-mailmerge"/>
-    <package name="aaa_base" replaces="libreoffice-math"/>
+    <!-- OBS-IgnorePackage: libreoffice-math -->
     <ignore name="libreoffice-math"/>
-    <package name="aaa_base" replaces="libreoffice-filters-optional"/>
+    <!-- OBS-IgnorePackage: libreoffice-filters-optional -->
     <ignore name="libreoffice-filters-optional"/>
-    <package name="aaa_base" replaces="libreoffice-pyuno"/>
+    <!-- OBS-IgnorePackage: libreoffice-pyuno -->
     <ignore name="libreoffice-pyuno"/>
-    <package name="aaa_base" replaces="readline-doc"/>
+    <!-- OBS-IgnorePackage: readline-doc -->
     <ignore name="readline-doc"/>
-    <package name="aaa_base" replaces="graphviz"/>
+    <!-- OBS-IgnorePackage: graphviz -->
     <ignore name="graphviz"/>
-    <package name="aaa_base" replaces="linux-kernel-headers"/>
+    <!-- OBS-IgnorePackage: linux-kernel-headers -->
     <ignore name="linux-kernel-headers"/>
-    <package name="aaa_base" replaces="bash-doc"/>
+    <!-- OBS-IgnorePackage: bash-doc -->
     <ignore name="bash-doc"/>
-    <package name="aaa_base" replaces="gimp-plugins-python"/>
+    <!-- OBS-IgnorePackage: gimp-plugins-python -->
     <ignore name="gimp-plugins-python"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_basis_opt -->
     <ignore name="patterns-openSUSE-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_admin -->
     <ignore name="patterns-openSUSE-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_multimedia_opt -->
     <ignore name="patterns-openSUSE-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_imaging_opt -->
     <ignore name="patterns-openSUSE-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-gnome_office_opt -->
     <ignore name="patterns-openSUSE-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-apparmor_opt -->
     <ignore name="patterns-openSUSE-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-enhanced_base_opt -->
     <ignore name="patterns-openSUSE-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-fonts_opt -->
     <ignore name="patterns-openSUSE-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-imaging_opt -->
     <ignore name="patterns-openSUSE-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-kde_utilities_opt -->
     <ignore name="patterns-openSUSE-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-multimedia_opt -->
     <ignore name="patterns-openSUSE-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-office_opt -->
     <ignore name="patterns-openSUSE-office_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-x11_opt -->
     <ignore name="patterns-openSUSE-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_basis_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_basis_opt -->
     <ignore name="patterns-gnome-gnome_basis_opt"/>
-    <package name="aaa_base" replaces="patterns-gmome-gnome_admin"/>
+    <!-- OBS-IgnorePackage: patterns-gmome-gnome_admin -->
     <ignore name="patterns-gmome-gnome_admin"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_multimedia_opt -->
     <ignore name="patterns-gnome-gnome_multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_imaging_opt -->
     <ignore name="patterns-gnome-gnome_imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-gnome-gnome_office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-gnome-gnome_office_opt -->
     <ignore name="patterns-gnome-gnome_office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-apparmor_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-apparmor_opt -->
     <ignore name="patterns-base-apparmor_opt"/>
-    <package name="aaa_base" replaces="patterns-base-documentation"/>
+    <!-- OBS-IgnorePackage: patterns-base-documentation -->
     <ignore name="patterns-base-documentation"/>
-    <package name="aaa_base" replaces="patterns-base-enhanced_base_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-enhanced_base_opt -->
     <ignore name="patterns-base-enhanced_base_opt"/>
-    <package name="aaa_base" replaces="patterns-fonts-fonts_opt"/>
+    <!-- OBS-IgnorePackage: patterns-fonts-fonts_opt -->
     <ignore name="patterns-fonts-fonts_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-imaging_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-imaging_opt -->
     <ignore name="patterns-desktop-imaging_opt"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_utilities_opt"/>
+    <!-- OBS-IgnorePackage: patterns-kde-kde_utilities_opt -->
     <ignore name="patterns-kde-kde_utilities_opt"/>
-    <package name="aaa_base" replaces="patterns-desktop-multimedia_opt"/>
+    <!-- OBS-IgnorePackage: patterns-desktop-multimedia_opt -->
     <ignore name="patterns-desktop-multimedia_opt"/>
-    <package name="aaa_base" replaces="patterns-openSUSE-non_oss_opt"/>
+    <!-- OBS-IgnorePackage: patterns-openSUSE-non_oss_opt -->
     <ignore name="patterns-openSUSE-non_oss_opt"/>
-    <package name="aaa_base" replaces="patterns-office-office_opt"/>
+    <!-- OBS-IgnorePackage: patterns-office-office_opt -->
     <ignore name="patterns-office-office_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_opt"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_opt -->
     <ignore name="patterns-base-x11_opt"/>
-    <package name="aaa_base" replaces="patterns-base-x11_enhanced"/>
+    <!-- OBS-IgnorePackage: patterns-base-x11_enhanced -->
     <ignore name="patterns-base-x11_enhanced"/>
-    <package name="aaa_base" replaces="make"/>
+    <!-- OBS-IgnorePackage: make -->
     <ignore name="make"/>
-    <package name="aaa_base" replaces="netpbm"/>
+    <!-- OBS-IgnorePackage: netpbm -->
     <ignore name="netpbm"/>
-    <package name="aaa_base" replaces="p7zip-full"/>
+    <!-- OBS-IgnorePackage: p7zip-full -->
     <ignore name="p7zip-full"/>
-    <package name="aaa_base" replaces="busybox-static"/>
+    <!-- OBS-IgnorePackage: busybox-static -->
     <ignore name="busybox-static"/>
-    <package name="aaa_base" replaces="inxi"/>
+    <!-- OBS-IgnorePackage: inxi -->
     <ignore name="inxi"/>
-    <package name="aaa_base" replaces="sane-backends"/>
+    <!-- OBS-IgnorePackage: sane-backends -->
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
-    <package name="aaa_base" replaces="glibc-32bit"/>
+    <!-- OBS-IgnorePackage: glibc-32bit -->
     <ignore name="glibc-32bit"/>
-    <package name="aaa_base" replaces="libvdpau_r300"/>
+    <!-- OBS-IgnorePackage: libvdpau_r300 -->
     <ignore name="libvdpau_r300"/>
-    <package name="aaa_base" replaces="libvdpau_radeonsi"/>
+    <!-- OBS-IgnorePackage: libvdpau_radeonsi -->
     <ignore name="libvdpau_radeonsi"/>
-    <package name="aaa_base" replaces="libvdpau_r600"/>
+    <!-- OBS-IgnorePackage: libvdpau_r600 -->
     <ignore name="libvdpau_r600"/>
-    <package name="aaa_base" replaces="pavucontrol"/>
+    <!-- OBS-IgnorePackage: pavucontrol -->
     <ignore name="pavucontrol"/>
-    <package name="aaa_base" replaces="libqmi-tools"/>
+    <!-- OBS-IgnorePackage: libqmi-tools -->
     <ignore name="libqmi-tools"/>
-    <package name="aaa_base" replaces="python*-pip"/>
+    <!-- OBS-IgnorePackage: python*-pip -->
     <ignore name="python*-pip"/>
-    <package name="aaa_base" replaces="multipath-tools-rbd"/>
+    <!-- OBS-IgnorePackage: multipath-tools-rbd -->
     <ignore name="multipath-tools-rbd"/>
-    <package name="aaa_base" replaces="acpica"/>
+    <!-- OBS-IgnorePackage: acpica -->
     <ignore name="acpica"/>
-    <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
+    <!-- OBS-IgnorePackage: xorg-x11-Xvnc -->
     <ignore name="xorg-x11-Xvnc"/>
-    <package name="aaa_base" replaces="cabextract"/>
+    <!-- OBS-IgnorePackage: cabextract -->
     <ignore name="cabextract"/>
-    <package name="aaa_base" replaces="sssd"/>
+    <!-- OBS-IgnorePackage: sssd -->
     <ignore name="sssd"/>
-    <package name="aaa_base" replaces="db-utils"/>
+    <!-- OBS-IgnorePackage: db-utils -->
     <ignore name="db-utils"/>
-    <package name="aaa_base" replaces="dnsmasq"/>
+    <!-- OBS-IgnorePackage: dnsmasq -->
     <ignore name="dnsmasq"/>
-    <package name="aaa_base" replaces="fribidi"/>
+    <!-- OBS-IgnorePackage: fribidi -->
     <ignore name="fribidi"/>
-    <package name="aaa_base" replaces="ipmitool"/>
+    <!-- OBS-IgnorePackage: ipmitool -->
     <ignore name="ipmitool"/>
-    <package name="aaa_base" replaces="irda"/>
+    <!-- OBS-IgnorePackage: irda -->
     <ignore name="irda"/>
-    <package name="aaa_base" replaces="lomoco"/>
+    <!-- OBS-IgnorePackage: lomoco -->
     <ignore name="lomoco"/>
-    <package name="aaa_base" replaces="mksh"/>
+    <!-- OBS-IgnorePackage: mksh -->
     <ignore name="mksh"/>
-    <package name="aaa_base" replaces="cifs-utils"/>
+    <!-- OBS-IgnorePackage: cifs-utils -->
     <ignore name="cifs-utils"/>
-    <package name="aaa_base" replaces="gvfs-backend-samba"/>
+    <!-- OBS-IgnorePackage: gvfs-backend-samba -->
     <ignore name="gvfs-backend-samba"/>
-    <package name="aaa_base" replaces="xorg-x11"/>
+    <!-- OBS-IgnorePackage: xorg-x11 -->
     <ignore name="xorg-x11"/>
-    <package name="aaa_base" replaces="xorg-x11-essentials"/>
+    <!-- OBS-IgnorePackage: xorg-x11-essentials -->
     <ignore name="xorg-x11-essentials"/>
-    <package name="aaa_base" replaces="xorg-x11-server-extra"/>
+    <!-- OBS-IgnorePackage: xorg-x11-server-extra -->
     <ignore name="xorg-x11-server-extra"/>
     <package name="xdm"/>
     <package name="sysvinit-tools"/>
-    <package name="aaa_base" replaces="icewm"/>
+    <!-- OBS-IgnorePackage: icewm -->
     <ignore name="icewm"/>
-    <package name="aaa_base" replaces="baekmuk-ttf-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-ttf-fonts -->
     <ignore name="baekmuk-ttf-fonts"/>
-    <package name="aaa_base" replaces="google-droid-fonts"/>
+    <!-- OBS-IgnorePackage: google-droid-fonts -->
     <ignore name="google-droid-fonts"/>
-    <package name="aaa_base" replaces="efont-unicode-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: efont-unicode-bitmap-fonts -->
     <ignore name="efont-unicode-bitmap-fonts"/>
-    <package name="aaa_base" replaces="baekmuk-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: baekmuk-bitmap-fonts -->
     <ignore name="baekmuk-bitmap-fonts"/>
-    <package name="aaa_base" replaces="intlfonts-chinese-big-bitmap-fonts"/>
+    <!-- OBS-IgnorePackage: intlfonts-chinese-big-bitmap-fonts -->
     <ignore name="intlfonts-chinese-big-bitmap-fonts"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-legacy -->
     <ignore name="xorg-x11-fonts-legacy"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts-converted"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts-converted -->
     <ignore name="xorg-x11-fonts-converted"/>
-    <package name="aaa_base" replaces="strace"/>
+    <!-- OBS-IgnorePackage: strace -->
     <ignore name="strace"/>
-    <package name="aaa_base" replaces="tcsh"/>
+    <!-- OBS-IgnorePackage: tcsh -->
     <ignore name="tcsh"/>
-    <package name="aaa_base" replaces="usbmuxd"/>
+    <!-- OBS-IgnorePackage: usbmuxd -->
     <ignore name="usbmuxd"/>
-    <package name="aaa_base" replaces="gnome-keyring-pam"/>
+    <!-- OBS-IgnorePackage: gnome-keyring-pam -->
     <ignore name="gnome-keyring-pam"/>
-    <package name="aaa_base" replaces="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
-    <package name="aaa_base" replaces="apparmor-docs"/>
+    <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
-    <package name="aaa_base" replaces="mutt-doc"/>
+    <!-- OBS-IgnorePackage: mutt-doc -->
     <ignore name="mutt-doc"/>
-    <package name="aaa_base" replaces="coreutils-doc"/>
+    <!-- OBS-IgnorePackage: coreutils-doc -->
     <ignore name="coreutils-doc"/>
-    <package name="aaa_base" replaces="unar"/>
+    <!-- OBS-IgnorePackage: unar -->
     <ignore name="unar"/>
-    <package name="aaa_base" replaces="jing"/>
+    <!-- OBS-IgnorePackage: jing -->
     <ignore name="jing"/>
-    <package name="aaa_base" replaces="icedtea-web"/>
+    <!-- OBS-IgnorePackage: icedtea-web -->
     <ignore name="icedtea-web"/>
-    <package name="aaa_base" replaces="tigervnc"/>
+    <!-- OBS-IgnorePackage: tigervnc -->
     <ignore name="tigervnc"/>
-    <package name="aaa_base" replaces="autofs"/>
+    <!-- OBS-IgnorePackage: autofs -->
     <ignore name="autofs"/>
-    <package name="aaa_base" replaces="expect"/>
+    <!-- OBS-IgnorePackage: expect -->
     <ignore name="expect"/>
-    <package name="aaa_base" replaces="m4"/>
+    <!-- OBS-IgnorePackage: m4 -->
     <ignore name="m4"/>
-    <package name="aaa_base" replaces="mutt"/>
+    <!-- OBS-IgnorePackage: mutt -->
     <ignore name="mutt"/>
-    <package name="aaa_base" replaces="net-snmp"/>
+    <!-- OBS-IgnorePackage: net-snmp -->
     <ignore name="net-snmp"/>
-    <package name="aaa_base" replaces="procmail"/>
+    <!-- OBS-IgnorePackage: procmail -->
     <ignore name="procmail"/>
-    <package name="aaa_base" replaces="recode"/>
+    <!-- OBS-IgnorePackage: recode -->
     <ignore name="recode"/>
-    <package name="aaa_base" replaces="spax"/>
+    <!-- OBS-IgnorePackage: spax -->
     <ignore name="spax"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="espeak"/>
+    <!-- OBS-IgnorePackage: espeak -->
     <ignore name="espeak"/>
-    <package name="aaa_base" replaces="pam_mount"/>
+    <!-- OBS-IgnorePackage: pam_mount -->
     <ignore name="pam_mount"/>
-    <package name="aaa_base" replaces="groff-full"/>
+    <!-- OBS-IgnorePackage: groff-full -->
     <ignore name="groff-full"/>
-    <package name="aaa_base" replaces="tuned"/>
+    <!-- OBS-IgnorePackage: tuned -->
     <ignore name="tuned"/>
-    <package name="aaa_base" replaces="cups"/>
+    <!-- OBS-IgnorePackage: cups -->
     <ignore name="cups"/>
-    <package name="aaa_base" replaces="cups-client"/>
+    <!-- OBS-IgnorePackage: cups-client -->
     <ignore name="cups-client"/>
-    <package name="aaa_base" replaces="system-config-printer"/>
+    <!-- OBS-IgnorePackage: system-config-printer -->
     <ignore name="system-config-printer"/>
-    <package name="aaa_base" replaces="ghostscript"/>
+    <!-- OBS-IgnorePackage: ghostscript -->
     <ignore name="ghostscript"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-std"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-std -->
     <ignore name="ghostscript-fonts-std"/>
-    <package name="aaa_base" replaces="ghostscript-fonts-other"/>
+    <!-- OBS-IgnorePackage: ghostscript-fonts-other -->
     <ignore name="ghostscript-fonts-other"/>
-    <package name="aaa_base" replaces="manufacturer-PPDs"/>
+    <!-- OBS-IgnorePackage: manufacturer-PPDs -->
     <ignore name="manufacturer-PPDs"/>
-    <package name="aaa_base" replaces="gutenprint"/>
+    <!-- OBS-IgnorePackage: gutenprint -->
     <ignore name="gutenprint"/>
-    <package name="aaa_base" replaces="hplip-hpijs"/>
+    <!-- OBS-IgnorePackage: hplip-hpijs -->
     <ignore name="hplip-hpijs"/>
-    <package name="aaa_base" replaces="hplip"/>
+    <!-- OBS-IgnorePackage: hplip -->
     <ignore name="hplip"/>
-    <package name="aaa_base" replaces="system-config-printer-applet"/>
+    <!-- OBS-IgnorePackage: system-config-printer-applet -->
     <ignore name="system-config-printer-applet"/>
-    <package name="aaa_base" replaces="udev-configure-printer"/>
+    <!-- OBS-IgnorePackage: udev-configure-printer -->
     <ignore name="udev-configure-printer"/>
-    <package name="aaa_base" replaces="systemd-coredump"/>
+    <!-- OBS-IgnorePackage: systemd-coredump -->
     <ignore name="systemd-coredump"/>
-    <package name="aaa_base" replaces="systemd-doc"/>
+    <!-- OBS-IgnorePackage: systemd-doc -->
     <ignore name="systemd-doc"/>
-    <package name="aaa_base" replaces="man-pages"/>
+    <!-- OBS-IgnorePackage: man-pages -->
     <ignore name="man-pages"/>
-    <package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
+    <!-- OBS-IgnorePackage: NetworkManager-vpnc-gnome -->
     <ignore name="NetworkManager-vpnc-gnome"/>
-    <package name="aaa_base" replaces="plasma-nm5-vpnc"/>
+    <!-- OBS-IgnorePackage: plasma-nm5-vpnc -->
     <ignore name="plasma-nm5-vpnc"/>
-    <package name="aaa_base" replaces="busybox-sendmail"/>
+    <!-- OBS-IgnorePackage: busybox-sendmail -->
     <ignore name="busybox-sendmail"/>
-    <package name="aaa_base" replaces="exim"/>
+    <!-- OBS-IgnorePackage: exim -->
     <ignore name="exim"/>
-    <package name="aaa_base" replaces="msmtp-mta"/>
+    <!-- OBS-IgnorePackage: msmtp-mta -->
     <ignore name="msmtp-mta"/>
-    <package name="aaa_base" replaces="postfix"/>
+    <!-- OBS-IgnorePackage: postfix -->
     <ignore name="postfix"/>
-    <package name="aaa_base" replaces="postfix-bdb"/>
+    <!-- OBS-IgnorePackage: postfix-bdb -->
     <ignore name="postfix-bdb"/>
-    <package name="aaa_base" replaces="sendmail"/>
+    <!-- OBS-IgnorePackage: sendmail -->
     <ignore name="sendmail"/>
-    <package name="aaa_base" replaces="virtualbox-guest-tools"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-tools -->
     <ignore name="virtualbox-guest-tools"/>
-    <package name="aaa_base" replaces="virtualbox-guest-x11"/>
+    <!-- OBS-IgnorePackage: virtualbox-guest-x11 -->
     <ignore name="virtualbox-guest-x11"/>
-    <package name="aaa_base" replaces="intel-gpu-tools"/>
+    <!-- OBS-IgnorePackage: intel-gpu-tools -->
     <ignore name="intel-gpu-tools"/>
     <package name="spice-vdagent"/>
-    <package name="aaa_base" replaces="open-vm-tools"/>
+    <!-- OBS-IgnorePackage: open-vm-tools -->
     <ignore name="open-vm-tools"/>
-    <package name="aaa_base" replaces="usb_modeswitch"/>
+    <!-- OBS-IgnorePackage: usb_modeswitch -->
     <ignore name="usb_modeswitch"/>
-    <package name="aaa_base" replaces="gstreamer-plugins-rs"/>
+    <!-- OBS-IgnorePackage: gstreamer-plugins-rs -->
     <ignore name="gstreamer-plugins-rs"/>
-    <package name="aaa_base" replaces="vim-data"/>
+    <!-- OBS-IgnorePackage: vim-data -->
     <ignore name="vim-data"/>
-    <package name="aaa_base" replaces="vim"/>
+    <!-- OBS-IgnorePackage: vim -->
     <ignore name="vim"/>
     <package name="vim-small"/>
     <package name="kernel-default"/>
@@ -411,12 +411,12 @@
     <package name="xz"/>
     <package name="zd1211-firmware"/>
     <package name="zip"/>
-    <package name="aaa_base" replaces="ntp"/>
+    <!-- OBS-IgnorePackage: ntp -->
     <ignore name="ntp"/>
-    <package name="aaa_base" replaces="wicked"/>
+    <!-- OBS-IgnorePackage: wicked -->
     <ignore name="wicked"/>
     <package name="ucode-amd" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="ucode-intel"/>
+    <!-- OBS-IgnorePackage: ucode-intel -->
     <ignore name="ucode-intel"/>
 
     <!-- list-xfce.sh -->
@@ -424,33 +424,33 @@
     <package name="yast2-trans-stats"/>
     <package name="patterns-xfce-xfce"/>
     <namedCollection name="xfce"/>
-    <package name="aaa_base" replaces="gnome-themes-accessibility"/>
+    <!-- OBS-IgnorePackage: gnome-themes-accessibility -->
     <ignore name="gnome-themes-accessibility"/>
-    <package name="aaa_base" replaces="xlockmore"/>
+    <!-- OBS-IgnorePackage: xlockmore -->
     <ignore name="xlockmore"/>
-    <package name="aaa_base" replaces="unzip-doc"/>
+    <!-- OBS-IgnorePackage: unzip-doc -->
     <ignore name="unzip-doc"/>
-    <package name="aaa_base" replaces="gtk2-immodule-inuktitut"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-inuktitut -->
     <ignore name="gtk2-immodule-inuktitut"/>
-    <package name="aaa_base" replaces="gtk2-immodule-thai"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-thai -->
     <ignore name="gtk2-immodule-thai"/>
-    <package name="aaa_base" replaces="gtk2-immodule-vietnamese"/>
+    <!-- OBS-IgnorePackage: gtk2-immodule-vietnamese -->
     <ignore name="gtk2-immodule-vietnamese"/>
-    <package name="aaa_base" replaces="gtk3-immodule-inuktitut"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-inuktitut -->
     <ignore name="gtk3-immodule-inuktitut"/>
-    <package name="aaa_base" replaces="gtk3-immodule-thai"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-thai -->
     <ignore name="gtk3-immodule-thai"/>
-    <package name="aaa_base" replaces="gtk3-immodule-vietnamese"/>
+    <!-- OBS-IgnorePackage: gtk3-immodule-vietnamese -->
     <ignore name="gtk3-immodule-vietnamese"/>
-    <package name="aaa_base" replaces="awesfx"/>
+    <!-- OBS-IgnorePackage: awesfx -->
     <ignore name="awesfx"/>
-    <package name="aaa_base" replaces="sbl"/>
+    <!-- OBS-IgnorePackage: sbl -->
     <ignore name="sbl"/>
-    <package name="aaa_base" replaces="gnome-online-accounts"/>
+    <!-- OBS-IgnorePackage: gnome-online-accounts -->
     <ignore name="gnome-online-accounts"/>
-    <package name="aaa_base" replaces="samba"/>
+    <!-- OBS-IgnorePackage: samba -->
     <ignore name="samba"/>
-    <package name="aaa_base" replaces="pragha"/>
+    <!-- OBS-IgnorePackage: pragha -->
     <ignore name="pragha"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
@@ -460,15 +460,15 @@
     <package name="yast2-network"/>
     <package name="yast2-proxy"/>
     <package name="yast2-storage-ng"/>
-    <package name="aaa_base" replaces="yast2-samba-client"/>
+    <!-- OBS-IgnorePackage: yast2-samba-client -->
     <ignore name="yast2-samba-client"/>
-    <package name="aaa_base" replaces="yast2-vpn"/>
+    <!-- OBS-IgnorePackage: yast2-vpn -->
     <ignore name="yast2-vpn"/>
-    <package name="aaa_base" replaces="yast2-journal"/>
+    <!-- OBS-IgnorePackage: yast2-journal -->
     <ignore name="yast2-journal"/>
-    <package name="aaa_base" replaces="yast2-auth-client"/>
+    <!-- OBS-IgnorePackage: yast2-auth-client -->
     <ignore name="yast2-auth-client"/>
-    <package name="aaa_base" replaces="yast2-sudo"/>
+    <!-- OBS-IgnorePackage: yast2-sudo -->
     <ignore name="yast2-sudo"/>
     <package name="yast2-trans-de"/>
     <package name="live-net-installer"/>
@@ -480,31 +480,31 @@
     <package name="lklug-fonts"/>
     <package name="indic-fonts"/>
     <package name="arabic-kacst-fonts"/>
-    <package name="aaa_base" replaces="aspell-en"/>
+    <!-- OBS-IgnorePackage: aspell-en -->
     <ignore name="aspell-en"/>
     <package name="libxslt-tools"/>
-    <package name="aaa_base" replaces="xfce4-panel-plugin-xkb"/>
+    <!-- OBS-IgnorePackage: xfce4-panel-plugin-xkb -->
     <ignore name="xfce4-panel-plugin-xkb"/>
-    <package name="aaa_base" replaces="xfce4-panel-plugin-notes"/>
+    <!-- OBS-IgnorePackage: xfce4-panel-plugin-notes -->
     <ignore name="xfce4-panel-plugin-notes"/>
-    <package name="aaa_base" replaces="engrampa-lang"/>
+    <!-- OBS-IgnorePackage: engrampa-lang -->
     <ignore name="engrampa-lang"/>
-    <package name="aaa_base" replaces="libreoffice"/>
+    <!-- OBS-IgnorePackage: libreoffice -->
     <ignore name="libreoffice"/>
-    <package name="aaa_base" replaces="gdb"/>
+    <!-- OBS-IgnorePackage: gdb -->
     <ignore name="gdb"/>
-    <package name="aaa_base" replaces="gimp"/>
+    <!-- OBS-IgnorePackage: gimp -->
     <ignore name="gimp"/>
-    <package name="aaa_base" replaces="pidgin"/>
+    <!-- OBS-IgnorePackage: pidgin -->
     <ignore name="pidgin"/>
-    <package name="aaa_base" replaces="simple-scan"/>
+    <!-- OBS-IgnorePackage: simple-scan -->
     <ignore name="simple-scan"/>
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="xorg-x11-fonts"/>
+    <!-- OBS-IgnorePackage: xorg-x11-fonts -->
     <ignore name="xorg-x11-fonts"/>
     <package name="evince-plugin-pdfdocument"/>
     <package name="alsa-firmware"/>
-    <package name="aaa_base" replaces="mugshot"/>
+    <!-- OBS-IgnorePackage: mugshot -->
     <ignore name="mugshot"/>
     <package name="opensuse-welcome"/>
   </packages>
diff --git a/livecd.kiwi.in b/livecd.kiwi.in
index 7d5a0cf..73fdde1 100644
--- a/livecd.kiwi.in
+++ b/livecd.kiwi.in
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="@NAME@" displayname="@DISPLAYNAME@">
+<image schemaversion="7.4" name="@NAME@" displayname="@DISPLAYNAME@">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,7 +13,7 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="@VOLID@" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="@VOLID@" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>@BOOTSPLASH@</bootsplash-theme>
@@ -23,7 +23,7 @@
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="@VOLID@" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet systemd.show_status=yes" flags="overlay" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="@VOLID@" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
     <bootsplash-theme>@BOOTSPLASH@</bootsplash-theme>
diff --git a/pre-checkin.sh b/pre-checkin.sh
index d34858e..1cb5933 100644
--- a/pre-checkin.sh
+++ b/pre-checkin.sh
@@ -14,13 +14,8 @@ buildignore() {
         # but https://github.com/openSUSE/obs-build/issues/420 requires a workaround
         ## Due to "--ignoreignore--" this has no effect either, so workaround the workaround
         ## by using <ignore/>, which gets ignored by OBS completely...
-	if [ -n "${2-}" ]; then
-		PACKAGES="$PACKAGES\n    <package name=\"aaa_base\" replaces=\"$1\" arch=\"$2\"/>"
-		PACKAGES="$PACKAGES\n    <ignore name=\"$1\" arch=\"$2\"/>"
-	else
-		PACKAGES="$PACKAGES\n    <package name=\"aaa_base\" replaces=\"$1\"/>"
-		PACKAGES="$PACKAGES\n    <ignore name=\"$1\"/>"
-	fi
+	PACKAGES="$PACKAGES\n    <!-- OBS-IgnorePackage: $1 -->"
+	PACKAGES="$PACKAGES\n    <ignore name=\"$1\"/>"
 }
 
 installPattern() {