diff --git a/Containerfile b/Containerfile
index d7ad151..87b3342 100644
--- a/Containerfile
+++ b/Containerfile
@@ -10,15 +10,16 @@ RUN <<EOF
     set -ouex pipefail
 
     dnf install --assumeyes 'dnf5-command(config-manager)'
-    dnf config-manager setopt excludepkgs=PackageKit,PackageKit-command-not-found,rootfiles,firefox
+    dnf config-manager setopt excludepkgs=PackageKit,PackageKit-command-not-found,PackageKit-gstreamer-plugin,rootfiles,firefox,abrt
     dnf config-manager setopt assumeyes=True
     dnf config-manager setopt install_weak_deps=False
 
-    dnf install @sway-desktop-environment @container-management
+    dnf install @sway-desktop-environment
+    dnf group install --with-optional container-management swaywm-extended
     dnf install go wireguard-tools neovim age aria2 android-tools croc p7zip p7zip-plugins rclone restic sshuttle tuned upower
 
     dnf remove @guest-desktop-agents
-    dnf remove vim-data vim-minimal qemu-user-static qemu-user-static-* default-editor foot abrt-desktop dunst crontabs cronie chrony WALinuxAgent-udev NetworkManager-cloud-setup
+    dnf remove vim-data vim-minimal qemu-user-static qemu-user-static-* default-editor foot dunst crontabs cronie chrony WALinuxAgent-udev NetworkManager-cloud-setup
 
     dnf autoremove && dnf clean all