22 files changed, 57 insertions, 565 deletions
diff --git a/components/boot-eln.xml b/components/boot-eln.xml
deleted file mode 100644
index ee380b6..0000000
--- a/components/boot-eln.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<image>
-	<profiles>
-		<profile name="BootCore" description="Boot core packages"/>
-		<profile name="BootCoreUKI" description="Boot core packages for UKI"/>
-		<profile name="BootDiskCore" description="Boot disk core configuration">
-			<requires profile="BootCore"/>
-		</profile>
-	</profiles>
-	<preferences profiles="BootDiskCore" arch="x86_64,aarch64">
-		<type image="oem"
-		      filesystem="xfs"
-		      kernelcmdline="rhgb quiet" devicepersistency="by-uuid" target_blocksize="4096"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="500" firmware="uefi"
-		      rootfs_label="fedora"
-		      >
-			<bootloader name="grub2" bls="true" console="console" timeout="1" timeout_style="hidden"/>
-			<oemconfig>
-				<oem-resize>false</oem-resize>
-			</oemconfig>
-		</type>
-	</preferences>
-	<preferences profiles="BootDiskCore" arch="ppc64le">
-		<type image="oem"
-		      filesystem="xfs"
-		      kernelcmdline="rhgb quiet" devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" firmware="ofw"
-		      rootfs_label="fedora"
-		      >
-			<bootloader name="grub2" bls="true" console="console" timeout="1" timeout_style="hidden"/>
-			<oemconfig>
-				<oem-resize>false</oem-resize>
-			</oemconfig>
-		</type>
-	</preferences>
-	<preferences profiles="BootDiskCore" arch="s390x">
-		<type image="oem"
-		      filesystem="xfs"
-		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
-		      devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="xfs"
-		      rootfs_label="fedora"
-		      >
-			<bootloader name="zipl" timeout="1"/>
-			<oemconfig>
-				<oem-resize>false</oem-resize>
-			</oemconfig>
-		</type>
-	</preferences>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI">
-		<package name="grubby"/>
-	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="BootCore">
-		<package name="grub2-efi-aa64" arch="aarch64"/>
-		<package name="grub2-efi-aa64-modules" arch="aarch64"/>
-		<package name="grub2-efi-x64" arch="x86_64"/>
-		<package name="grub2-efi-x64-modules" arch="x86_64"/>
-		<package name="grub2-pc" arch="x86_64"/>
-		<package name="grub2-pc-modules" arch="x86_64"/>
-		<package name="grub2-ppc64le" arch="ppc64le"/>
-		<package name="s390utils-base" arch="s390x"/>
-		<package name="shim-signed-aa64" arch="aarch64"/>
-		<package name="shim-signed-x64" arch="x86_64"/>
-		<package name="kernel-core"/>
-		<package name="systemd-resolved"/>
-	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="BootCoreUKI">
-		<package name="shim-signed-aa64" arch="aarch64"/>
-		<package name="shim-signed-x64" arch="x86_64"/>
-		<package name="systemd-oomd-defaults"/>
-		<package name="systemd-resolved"/>
-		<package name="kernel-uki-virt"/>
-		<package name="python3-virt-firmware"/>
-		<package name="uki-direct"/>
-	</packages>
-	<packages type="iso" patternType="plusRecommended" profiles="BootCore">
-		<package name="grub2-efi-aa64-cdboot" arch="aarch64"/>
-		<package name="grub2-efi-x64-cdboot" arch="x86_64"/>
-	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="BootDiskCore">
-		<package name="glibc-all-langpacks"/>
-		<package name="kernel"/>
-		<package name="kernel-modules"/>
-		<package name="kernel-modules-extra"/>
-	</packages>
-</image>
diff --git a/components/boot.xml b/components/boot.xml
index 816bb91..24f18e9 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -1,82 +1,23 @@
 <image>
 	<profiles>
 		<profile name="BootCore" description="Boot core packages"/>
-		<profile name="BootCoreUKI" description="Boot core packages for UKI"/>
-		<profile name="BootCoreLive" description="Boot core packages for Live DVDs"/>
-		<profile name="BootDiskCore" description="Boot disk core configuration">
-			<requires profile="BaseCommon"/>
-			<requires profile="HardwareCommon"/>
-			<requires profile="BootCore"/>
-		</profile>
 	</profiles>
-	<!-- Surface Pro 12" (Snapdragon X1P-42-100) is a standard UEFI/GPT aarch64
-	     device, no force_mbr/disk_start_sector/editbootinstall RPi-legacy
-	     quirks needed, those are for boards whose own firmware boot stage
-	     requires an MBR + specific boot sector offset before handing off to
-	     grub. -->
-	<preferences profiles="BootDiskCore" arch="aarch64">
-		<type image="oem"
-		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="x-systemd.growfs,compress=zstd:1"
-		      kernelcmdline="rhgb quiet" devicepersistency="by-uuid"
-		      bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
-		      rootfs_label="fedora"
-		      >
-			<bootloader name="grub2" bls="true" console="console" timeout="5"/>
-			<systemdisk name="fedora">
-				<volume name="@root=root"/>
-				<volume name="home" parent="/"/>
-				<volume name="var" parent="/"/>
-			</systemdisk>
-			<oemconfig>
-				<oem-resize>false</oem-resize>
-			</oemconfig>
-		</type>
-	</preferences>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI,BootCoreLive">
-		<package name="grubby"/>
-	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="BootCore,BootCoreLive">
-		<package name="grub2-efi-aa64"/>
-		<package name="grub2-efi-aa64-modules"/>
-		<package name="shim-signed-aa64"/>
-		<package name="systemd-oomd-defaults"/>
-		<package name="systemd-resolved"/>
-	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="BootCore">
-		<ignore name="kernel-*debug*"/>
-		<package name="kernel-core"/>
-	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="BootCoreLive">
-		<ignore name="kernel-*debug*"/>
-		<!-- Surface Pro 12": kernel-uki-dtbloader bakes in ~3000 boards' dtbs
-		     (.dtbauto sections) and hard-conflicts with kernel-core. This board
-		     isn't in its dtb database anyway (dtb delivered separately via
-		     grub's devicetree directive), so plain kernel-core is enough. -->
+		<package name="grub2-efi-aa64" arch="aarch64"/>
+		<package name="grub2-efi-aa64-modules" arch="aarch64"/>
+		<package name="grub2-efi-x64" arch="x86_64"/>
+		<package name="grub2-efi-x64-modules" arch="x86_64"/>
+		<package name="grub2-pc" arch="x86_64"/>
+		<package name="grub2-pc-modules" arch="x86_64"/>
+		<package name="grubby"/>
+		<package name="shim-signed-aa64" arch="aarch64"/>
+		<package name="shim-signed-x64" arch="x86_64"/>
 		<package name="kernel-core"/>
-	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="BootCoreUKI">
-		<package name="shim-signed-aa64"/>
 		<package name="systemd-oomd-defaults"/>
 		<package name="systemd-resolved"/>
-		<package name="kernel-uki-virt"/>
-		<package name="python3-virt-firmware"/>
-		<package name="uki-direct"/>
 	</packages>
-	<packages type="iso" patternType="plusRecommended" profiles="BootCore,BootCoreLive">
-		<package name="grub2-efi-aa64-cdboot"/>
-	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="BootDiskCore">
-		<ignore name="kernel-*debug*"/>
-		<package name="glibc-all-langpacks"/>
-		<!-- Surface Pro 12": kernel-core, not kernel-uki-dtbloader's multi-board
-		     dtb bloat, same reasoning as BootCoreLive above. arm-image-installer
-		     and uboot-images-armv8 dropped too, they exist for flashing/booting
-		     other ARM SBCs (device-tree selection, U-Boot), not relevant to this
-		     single UEFI/GPT device. -->
-		<package name="kernel-core"/>
-		<package name="kernel-modules"/>
-		<package name="kernel-modules-extra"/>
-		<package name="btrfs-progs"/>
-		<package name="udisks2-btrfs"/>
+	<packages type="iso" patternType="plusRecommended" profiles="BootCore">
+		<package name="grub2-efi-aa64-cdboot" arch="aarch64"/>
+		<package name="grub2-efi-x64-cdboot" arch="x86_64"/>
 	</packages>
 </image>
diff --git a/components/common.xml b/components/common.xml
deleted file mode 100644
index 506cf73..0000000
--- a/components/common.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<image>
-	<profiles>
-		<profile name="BaseCommon" description="Base common packages"/>
-		<profile name="HardwareCommon" description="Base common packages for hardware support"/>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="BaseCommon">
-		<namedCollection name="standard"/>
-		<ignore name="qemu-user-static"/> <!-- Saves ~100MB -->
-	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="HardwareCommon">
-		<namedCollection name="hardware-support"/>
-	</packages>
-</image>
diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml
new file mode 100644
index 0000000..8de6532
--- /dev/null
+++ b/components/desktop-environments.xml
@@ -0,0 +1,38 @@
+<image>
+	<profiles>
+		<profile name="DesktopCommon" description="Common desktop packages"/>
+		<profile name="GNOME-Desktop" description="GNOME Desktop">
+			<requires profile="DesktopCommon"/>
+		</profile>
+		<profile name="KDE-Desktop" description="KDE Plasma Desktop">
+			<requires profile="DesktopCommon"/>
+		</profile>
+	</profiles>
+	<packages type="image" patternType="plusRecommended" profiles="DesktopCommon">
+		<namedCollection name="internet-browser"/>
+		<namedCollection name="fonts"/>
+		<namedCollection name="multimedia"/>
+		<namedCollection name="networkmanager-submodules"/>
+		<namedCollection name="office-suite"/>
+		<namedCollection name="hardware-support"/>
+		<namedCollection name="print-client"/>
+		<namedCollection name="guest-desktop-agents"/>
+		<namedCollection name="standard"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop">
+		<namedCollection name="workstation-product-environment"/>
+		<package name="fedora-release-workstation"/>
+	</packages>
+	<packages type="image" patternType="plusRecommended" profiles="KDE-Desktop">
+		<namedCollection name="kde-desktop-environment"/>
+		<namedCollection name="kde-apps"/>
+		<namedCollection name="kde-media"/>
+		<namedCollection name="kde-spin-initial-setup"/>
+		<package name="fuse"/>
+		<package name="fedora-release-kde"/>
+		<package name="kde-l10n"/>
+		<ignore name="@admin-tools"/>
+		<ignore name="gnome-disk-utility"/>
+		<ignore name="system-config-printer"/>
+	</packages>
+</image>
diff --git a/components/desktops/budgie.xml b/components/desktops/budgie.xml
deleted file mode 100644
index 36ae5cf..0000000
--- a/components/desktops/budgie.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<image>
-	<profiles>
-		<profile name="Budgie-Desktop" description="Budgie Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="Budgie-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="budgie-desktop-environment"/>
-		<namedCollection name="budgie-desktop-apps"/>
-		<namedCollection name="libreoffice"/>
-		<package name="libreoffice-draw"/>
-		<package name="libreoffice-math"/>
-		<package name="thunderbird"/>
-	</packages>
-</image>
diff --git a/components/desktops/cinnamon.xml b/components/desktops/cinnamon.xml
deleted file mode 100644
index 3bd5a4e..0000000
--- a/components/desktops/cinnamon.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<image>
-	<profiles>
-		<profile name="Cinnamon-Desktop" description="Cinnamon Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="Cinnamon-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="cinnamon-desktop-environment"/>
-		<namedCollection name="libreoffice"/>
-		<package name="exaile"/>
-	</packages>
-</image>
diff --git a/components/desktops/common.xml b/components/desktops/common.xml
deleted file mode 100644
index fed17c4..0000000
--- a/components/desktops/common.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<image>
-	<profiles>
-		<profile name="DesktopCommon" description="Common desktop packages">
-			<requires profile="BaseCommon"/>
-			<requires profile="HardwareCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="DesktopCommon">
-		<namedCollection name="fonts"/>
-		<namedCollection name="multimedia"/>
-		<namedCollection name="networkmanager-submodules"/>
-		<namedCollection name="printing"/>
-		<namedCollection name="guest-desktop-agents"/>
-		<package name="mediawriter"/>
-		<ignore name="gfs2-utils"/>
-		<ignore name="reiserfs-utils"/>
-	</packages>
-</image>
diff --git a/components/desktops/cosmic.xml b/components/desktops/cosmic.xml
deleted file mode 100644
index 4d010a7..0000000
--- a/components/desktops/cosmic.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<image>
-	<profiles>
-		<profile name="COSMIC-Desktop" description="COSMIC Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="COSMIC-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="cosmic-desktop-environment"/>
-	</packages>
-</image>
diff --git a/components/desktops/gnome.xml b/components/desktops/gnome.xml
deleted file mode 100644
index 17ffc36..0000000
--- a/components/desktops/gnome.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<image>
-	<profiles>
-		<profile name="GNOME-Desktop" description="GNOME Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="workstation-product-environment"/>
-		<!-- space saving, see https://bugzilla.redhat.com/show_bug.cgi?id=2360056#c45 -->
-		<ignore name="python3-boto3"/>
-	</packages>
-</image>
diff --git a/components/desktops/i3.xml b/components/desktops/i3.xml
deleted file mode 100644
index 26e73d2..0000000
--- a/components/desktops/i3.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<image>
-	<profiles>
-		<profile name="i3-Desktop" description="i3 Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="i3-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="i3-desktop-environment"/>
-		<package name="dex-autostart"/>
-		<package name="fedora-release-i3"/>
-		<package name="feh"/>
-		<package name="gnome-keyring-pam"/> <!-- unlock default keyring, FIXME: put in comps -->
-		<package name="system-config-printer"/> <!-- FIXME: put in comps -->
-		<package name="thunar"/> <!-- FIXME: put in comps -->
-		<package name="xfce-polkit"/> <!-- FIXME: put in comps -->
-		<package name="wget"/> <!-- FIXME: put in comps -->
-	</packages>
-</image>
diff --git a/components/desktops/kde.xml b/components/desktops/kde.xml
deleted file mode 100644
index 4c20ea5..0000000
--- a/components/desktops/kde.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<image>
-	<profiles>
-		<profile name="KDE-Desktop" description="KDE Plasma Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-		<profile name="KDE-Mobile" description="KDE Plasma Mobile">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<!-- Common exclusions for KDE variants -->
-	<packages type="image" patternType="plusRecommended" profiles="KDE-Desktop,KDE-Mobile">
-		<ignore name="gnome-disk-utility"/> <!-- redundant with kde partitionmanager -->
-		<ignore name="mariadb-server-utils"/> <!-- Not needed on desktops (pagure.io:fedora-kde/SIG#566) -->
-		<ignore name="system-config-language"/> <!-- redundant with kcms -->
-		<ignore name="system-config-printer"/> <!-- redundant with kcms -->
-		<!-- drop tracker stuff pulled in by gtk3 (pagureio:fedora-kde/SIG#124) -->
-		<ignore name="tracker"/>
-		<ignore name="tracker-miners"/>
-		<!-- space issues -->
-		<ignore name="digikam"/> <!-- digikam has duplicate functionality with gwenview (~28 megs) -->
-		<ignore name="k3b"/> <!-- ~15 megs -->
-		<ignore name="kipi-plugins"/> <!-- ~8 megs + drags in marble -->
-		<ignore name="krusader"/> <!-- ~4 megs -->
-		<ignore name="ktorrent"/> <!-- ~15 megs -->
-		<ignore name="initial-setup"/> <!-- redundant with plasma-setup -->
-	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="KDE-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="kde-desktop-environment"/>
-		<namedCollection name="kde-apps"/>
-		<namedCollection name="kde-media"/>
-		<namedCollection name="kde-pim" arch="aarch64,ppc64le,x86_64"/>
-		<namedCollection name="firefox"/>
-		<namedCollection name="libreoffice"/>
-		<namedCollection name="x86-emulation" arch="aarch64"/>
-		<package name="libreoffice-draw"/>
-		<package name="libreoffice-math"/>
-		<package name="fuse"/>
-		<package name="kde-l10n"/>
-	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="KDE-Mobile">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="kde-mobile-environment"/>
-		<namedCollection name="firefox"/>
-		<namedCollection name="x86-emulation" arch="aarch64"/>
-		<package name="fuse"/>
-		<package name="kde-l10n"/>
-		<ignore name="plasma-welcome"/>
-		<ignore name="plasma-welcome-fedora"/>
-	</packages>
-</image>
diff --git a/components/desktops/lxde.xml b/components/desktops/lxde.xml
deleted file mode 100644
index b14e097..0000000
--- a/components/desktops/lxde.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<image>
-	<profiles>
-		<profile name="LXDE-Desktop" description="LXDE Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="LXDE-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="lxde-desktop-environment"/>
-		<namedCollection name="lxde-apps"/>
-		<namedCollection name="lxde-media"/>
-		<namedCollection name="lxde-office"/>
-		<package name="lxpolkit"/> <!-- Ensure LXDE polkit agent is used -->
-		<package name="notification-daemon"/> <!-- Ensure correct notification daemon is used -->
-		<ignore name="PackageKit*"/> <!-- we use dnfdragora instead -->
-		<ignore name="fprintd-pam"/> <!-- pam-fprint causes segfaults in LXDM -->
-	</packages>
-</image>
diff --git a/components/desktops/lxqt.xml b/components/desktops/lxqt.xml
deleted file mode 100644
index af700f2..0000000
--- a/components/desktops/lxqt.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<image>
-	<profiles>
-		<profile name="LXQt-Desktop" description="LXQt Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="LXQt-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="lxqt-desktop-environment"/>
-		<namedCollection name="lxqt-apps"/>
-		<namedCollection name="lxqt-media"/>
-		<namedCollection name="lxqt-l10n"/>
-		<!-- remove unneeded stuff for a lightweight system -->
-		<package name="wqy-microhei-fonts"/> <!-- compact CJK font -->
-		<ignore name="naver-nanum-gothic-fonts"/> <!-- Korean: replaced by above -->
-		<ignore name="vlgothic-fonts"/> <!-- Japanese: replaced by above -->
-		<ignore name="adobe-source-han-sans-cn-fonts"/> <!-- Simplified Chinese: replaced by above -->
-		<ignore name="adobe-source-han-sans-tw-fonts"/> <!-- Traditional Chinese: replaced by above -->
-		<ignore name="pt-sans-fonts"/> <!-- Cyrillic (already supported by DejaVu) -->
-		<!-- these do not currently work: https://pagure.io/fedora-kiwi-descriptions/issue/112
-		<ignore name="@input-methods"/>
-		-->
-		<!-- because the input-methods group exclusion doesn't work, these aren't safe
-		<ignore name="scim*"/>
-		<ignore name="m17n*"/>
-		<ignore name="iok"/>
-		-->
-	</packages>
-</image>
diff --git a/components/desktops/mate.xml b/components/desktops/mate.xml
deleted file mode 100644
index bcc577d..0000000
--- a/components/desktops/mate.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<image>
-	<profiles>
-		<profile name="MATE-Desktop" description="MATE Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="MATE-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="mate-desktop-environment"/>
-		<namedCollection name="compiz"/>
-		<namedCollection name="libreoffice"/>
-		<ignore name="audacious"/> <!-- breaks the desktop -->
-		<!-- drop things for size -->
-		<ignore name="@3d-printing"/>
-		<ignore name="@mate-applications"/>
-		<ignore name="brasero"/>
-		<ignore name="fedora-icon-theme"/>
-		<ignore name="gnome-icon-theme"/>
-		<ignore name="gnome-icon-theme-symbolic"/>
-		<ignore name="gnome-logs"/>
-		<ignore name="gnome-software"/>
-		<ignore name="gnome-user-docs"/>
-		<ignore name="evolution-help"/>
-		<ignore name="telnet"/> <!-- Legacy cmdline thing we don't want -->
-	</packages>
-</image>
diff --git a/components/desktops/miraclewm.xml b/components/desktops/miraclewm.xml
deleted file mode 100644
index f986915..0000000
--- a/components/desktops/miraclewm.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<image>
-	<profiles>
-		<profile name="MiracleWM-Desktop" description="MiracleWM Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="MiracleWM-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="miraclewm-desktop-environment"/>
-		<namedCollection name="firefox"/>
-		<package name="initial-setup-gui"/>
-		<package name="initial-setup-gui-wayland-miraclewm"/>
-	</packages>
-</image>
diff --git a/components/desktops/phosh.xml b/components/desktops/phosh.xml
deleted file mode 100644
index 7362244..0000000
--- a/components/desktops/phosh.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<image>
-	<profiles>
-		<profile name="Phosh-Desktop" description="Phosh Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="bootstrap" patternType="plusRecommended" profiles="Phosh-Desktop">
-		<package name="fedora-release-mobility"/>
-	</packages>
-	<packages type="image" patternType="plusRecommended" profiles="Phosh-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="phosh-desktop-environment"/>
-	        <package name="initial-setup-gui-wayland-generic"/>
-	</packages>
-</image>
diff --git a/components/desktops/soas.xml b/components/desktops/soas.xml
deleted file mode 100644
index f91802a..0000000
--- a/components/desktops/soas.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<image>
-	<profiles>
-		<profile name="SoaS-Desktop" description="SoaS Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="SoaS-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="sugar-desktop-environment"/>
-		<package name="dejavu-sans-fonts"/>
-		<package name="dejavu-sans-mono-fonts"/>
-		<package name="madan-fonts"/>
-		<package name="aajohan-comfortaa-fonts"/>
-		<package name="sil-abyssinica-fonts"/>
-		<package name="vlgothic-fonts"/>
-		<package name="rp-pppoe"/> <!-- See http://bugs.sugarlabs.org/ticket/1951 -->
-		<package name="livecd-iso-to-mediums" arch="x86_64"/> <!-- See http://bugs.sugarlabs.org/ticket/74 -->
-		<package name="xfce-polkit"/>
-	        <package name="initial-setup-gui-wayland-generic"/>
-		<ignore name="@gnome-desktop"/>
-		<ignore name="firefox"/>
-		<ignore name="ibus*"/>
-		<ignore name="openbox"/>
-		<ignore name="PackageKit"/>
-		<!-- Drop these to allow the Sugar boot screen -->
-		<ignore name="plymouth-system-theme"/>
-		<ignore name="plymouth-theme-charge"/>
-	</packages>
-</image>
diff --git a/components/desktops/sway.xml b/components/desktops/sway.xml
deleted file mode 100644
index e6777f2..0000000
--- a/components/desktops/sway.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<image>
-	<profiles>
-		<profile name="Sway-Desktop" description="Sway Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="Sway-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="sway-desktop-environment"/>
-		<namedCollection name="firefox"/>
-		<namedCollection name="swaywm-extended"/>
-	</packages>
-</image>
diff --git a/components/desktops/xfce.xml b/components/desktops/xfce.xml
deleted file mode 100644
index 141d52e..0000000
--- a/components/desktops/xfce.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<image>
-	<profiles>
-		<profile name="Xfce-Desktop" description="Xfce Desktop">
-			<requires profile="DesktopCommon"/>
-		</profile>
-	</profiles>
-	<packages type="image" patternType="plusRecommended" profiles="Xfce-Desktop">
-		<!-- install env-group to resolve RhBug:1891500 -->
-		<namedCollection name="xfce-desktop-environment"/>
-		<namedCollection name="xfce-apps"/>
-		<namedCollection name="xfce-extra-plugins"/>
-		<namedCollection name="xfce-media"/>
-		<namedCollection name="xfce-office"/>
-		<package name="wget"/>
-		<package name="system-config-printer"/>
-		<!-- Save some space -->
-		<ignore name="autofs"/>
-		<ignore name="acpid"/>
-		<ignore name="gimp-help"/>
-		<ignore name="desktop-backgrounds-basic"/>
-		<ignore name="aspell-*"/> <!-- dictionaries are big -->
-		<ignore name="xfce4-sensors-plugin"/>
-		<ignore name="xfce4-eyes-plugin"/>
-	</packages>
-</image>
diff --git a/components/liveinstall-eln.xml b/components/liveinstall-eln.xml
deleted file mode 100644
index 20f3c40..0000000
--- a/components/liveinstall-eln.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<image>
-	<profiles>
-		<profile name="LiveInstall" description="Live Install ISO">
-			<requires profile="BootCore"/>
-		</profile>
-	</profiles>
-	<preferences profiles="LiveInstall" arch="x86_64">
-		<type image="iso"
-			publisher="Fedora Project" volid="Fedora_Linux_ELN" application_id="Fedora_Linux_ELN"
-			primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
-			firmware="uefi" efiparttable="gpt" efifatimagesize="30" kernelcmdline="quiet rhgb"
-			fscreateoptions="-Efragments -C 1048576"
-			>
-			<bootloader name="grub2" grub_template="grub-x86.cfg.iso-template" console="console" timeout="10"/>
-		</type>
-	</preferences>
-	<preferences profiles="LiveInstall" arch="aarch64">
-		<type image="iso"
-			publisher="Fedora Project" volid="Fedora_Linux_ELN" application_id="Fedora_Linux_ELN"
-			primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
-			firmware="uefi" efiparttable="gpt" efifatimagesize="30" kernelcmdline="quiet rhgb"
-			fscreateoptions="-Efragments -C 1048576"
-			>
-			<bootloader name="grub2" grub_template="grub-arm.cfg.iso-template" console="console" timeout="10"/>
-		</type>
-	</preferences>
-	<preferences profiles="LiveInstall" arch="riscv64">
-		<type image="iso"
-			publisher="Fedora Project" volid="Fedora_Linux_ELN" application_id="Fedora_Linux_ELN"
-			primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
-			firmware="uefi" efiparttable="gpt" efifatimagesize="30" kernelcmdline="quiet rhgb"
-			fscreateoptions="-Efragments -C 1048576"
-			>
-			<bootloader name="grub2" grub_template="grub-riscv64.cfg.iso-template" console="console" timeout="10"/>
-		</type>
-	</preferences>
-	<preferences profiles="LiveInstall" arch="ppc64le">
-		<type image="iso"
-			publisher="Fedora Project" volid="Fedora_Linux_ELN" application_id="Fedora_Linux_ELN"
-			primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
-			firmware="ofw" kernelcmdline="quiet rhgb"
-			fscreateoptions="-Efragments -C 1048576"
-			>
-			<bootloader name="grub2" grub_template="grub-ppc.cfg.iso-template" console="console" timeout="10"/>
-		</type>
-	</preferences>
-	<packages type="iso" patternType="plusRecommended" profiles="LiveInstall">
-		<!-- Filter out unwanted EFI files from the embedded ESP, see rhbz#2358785 -->
-		<file name="iso-esp-excludes.yaml" target="image/exclude_files_efifatimage.yaml"/>
-		<!-- The point of a live image is to install -->
-		<namedCollection name="anaconda-tools"/>
-		<package name="anaconda-install-env-deps"/>
-		<package name="anaconda-live"/>
-		<package name="dracut-live"/>
-		<package name="glibc-all-langpacks"/>
-		<package name="isomd5sum"/>
-		<package name="kernel"/>
-		<package name="kernel-modules"/>
-		<package name="kernel-modules-extra"/>
-		<package name="livesys-scripts"/>
-		<ignore name="device-mapper-multipath"/>
-		<ignore name="fcoe-utils"/>
-		<ignore name="gfs2-utils"/>
-	</packages>
-</image>
diff --git a/components/liveinstall.xml b/components/liveinstall.xml
index c04ca7f..ca7106d 100644
--- a/components/liveinstall.xml
+++ b/components/liveinstall.xml
@@ -1,44 +1,30 @@
 <image>
 	<profiles>
 		<profile name="LiveInstall" description="Live Install ISO">
-			<requires profile="BaseCommon"/>
-			<requires profile="BootCoreLive"/>
+			<requires profile="BootCore"/>
 		</profile>
 	</profiles>
-	<preferences profiles="LiveInstall" arch="aarch64">
-		<type image="iso"
-			publisher="Fedora Project" volid="Fedora_Linux" application_id="Fedora_Linux"
-			primary="true" flags="dmsquash" filesystem="erofs" erofscompression="lzma,level=6" mediacheck="true"
-			firmware="efi" efiparttable="gpt" efifatimagesize="30"
-			kernelcmdline="quiet rhgb mem_sleep_default=s2idle clk_ignore_unused pd_ignore_unused systemd.tpm2_wait=0 rd.live.ram=1"
-			fscreateoptions="-Efragments -C 1048576"
-			>
-			<bootloader name="grub2" grub_template="grub-arm.cfg.iso-template" console="console" timeout="10"/>
+	<preferences profiles="LiveInstall">
+		<type image="iso" publisher="Fedora Project" volid="Fedora_Linux" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
+			<bootloader name="grub2" grub_template="grub.cfg.iso-template" console="console" timeout="10"/>
 		</type>
 	</preferences>
 	<packages type="iso" patternType="plusRecommended" profiles="LiveInstall">
-		<!-- Filter out unwanted EFI files from the embedded ESP, see rhbz#2358785 -->
-		<file name="iso-esp-excludes.yaml" target="image/exclude_files_efifatimage.yaml"/>
 		<!-- The point of a live image is to install -->
 		<namedCollection name="anaconda-tools"/>
+		<package name="anaconda"/>
 		<package name="anaconda-install-env-deps"/>
 		<package name="anaconda-live"/>
 		<!-- Need this for SVG release note images -->
 		<package name="aajohan-comfortaa-fonts"/>
 		<package name="dracut-live"/>
 		<package name="glibc-all-langpacks"/>
-		<package name="isomd5sum"/>
-		<!-- Surface Pro 12": no plain "kernel" package here, it hard-Requires
-		     kernel-uki-dtbloader on aarch64, which conflicts with BootCoreLive's
-		     kernel-core. grub2's ISO kernel lookup just needs a vmlinuz in /boot,
-		     which kernel-core (already installed there) already provides. -->
+		<package name="kernel"/>
 		<package name="kernel-modules"/>
 		<package name="kernel-modules-extra"/>
 		<package name="livesys-scripts"/>
 		<package name="btrfs-progs"/>
 		<package name="udisks2-btrfs"/>
-		<ignore name="device-mapper-multipath"/>
-		<ignore name="fcoe-utils"/>
 		<ignore name="gfs2-utils"/>
 	</packages>
 </image>
diff --git a/components/users.xml b/components/users.xml
index ab9dcb7..08b91a1 100644
--- a/components/users.xml
+++ b/components/users.xml
@@ -1,5 +1,5 @@
 <image>
-	<users profiles="BootCore">
+	<users profiles="Cloud-Azure,Cloud-AmazonEC2,Cloud-GCE,Cloud-OpenStack,LiveInstall">
 		<!-- The password here does not matter, it will be erased in config.sh -->
 		<user name="root" groups="root" password="linux" home="/root" pwdformat="plain" />
 	</users>