diff --git a/base/Containerfile b/base/Containerfile
index bdea043..2f4991f 100644
--- a/base/Containerfile
+++ b/base/Containerfile
@@ -18,7 +18,7 @@ RUN for pkg in kernel kernel-core kernel-modules kernel-modules-core ; do rpm --
 # Also install some extra packages :3
 RUN dnf install -y kernel kernel-core kernel-modules{,-core,-extra} linux-firmware fwupd fwupd-efi @ultramarine-product-common
 
-# (why isnt this here?)
+# Workaround to make dracut work just fine
 RUN rm -rf /root
 
 # Regenerate initramfs for new kernel
diff --git a/flagship/Containerfile b/flagship/Containerfile
index e2717fc..332be42 100644
--- a/flagship/Containerfile
+++ b/flagship/Containerfile
@@ -1,7 +1,12 @@
 FROM ghcr.io/ultramarine-linux/base-bootc:latest
 
-RUN rm -rf /root # workaround
+RUN dnf install \
+  -x PackageKit \
+  -x PackageKit-command-not-found \
+  -x grubby \
+  -x sdubby \
+  -x gnome-software-fedora-langpacks \
+  -x budgie-desktop-defaults \
+  --allowerasing -y \
+  @ultramarine-flagship-product-environment
 
-RUN dnf install -x PackageKit -x PackageKit-command-not-found -x grubby -x sdubby -x gnome-software-fedora-langpacks --allowerasing -y @ultramarine-flagship-product-environment
-
-RUN dnf clean all
diff --git a/gnome/Containerfile b/gnome/Containerfile
index 315ce1b..021f325 100644
--- a/gnome/Containerfile
+++ b/gnome/Containerfile
@@ -1,7 +1,12 @@
 FROM ghcr.io/ultramarine-linux/base-bootc:latest
 
-RUN rm -rf /root # workaround
+RUN dnf install \
+  -x PackageKit \
+  -x PackageKit-command-not-found \
+  -x grubby \
+  -x sdubby \
+  -x gnome-software-fedora-langpacks \
+  -x gnome-software-rpm-ostree \
+  --allowerasing -y \
+  @ultramarine-gnome-product-environment
 
-RUN dnf install -x PackageKit -x PackageKit-command-not-found -x grubby -x sdubby -x gnome-software-fedora-langpacks --allowerasing -y @ultramarine-gnome-product-environment
-
-RUN dnf clean all
diff --git a/kde/Containerfile b/kde/Containerfile
index 6955dc8..c26c232 100644
--- a/kde/Containerfile
+++ b/kde/Containerfile
@@ -1,7 +1,10 @@
 FROM ghcr.io/ultramarine-linux/base-bootc:latest
 
-RUN rm -rf /root # workaround
-
-RUN dnf install -x PackageKit -x PackageKit-command-not-found -x grubby -x sdubby -x gnome-software-fedora-langpacks --allowerasing -y @ultramarine-plasma-product-environment
-
-RUN dnf clean all
+RUN dnf install \
+  -x PackageKit \
+  -x PackageKit-command-not-found \
+  -x grubby \
+  -x sdubby \
+  -x gnome-software-fedora-langpacks \
+  --allowerasing -y \
+  @ultramarine-plasma-product-environment
diff --git a/xfce/Containerfile b/xfce/Containerfile
index 96963d2..f2880ce 100644
--- a/xfce/Containerfile
+++ b/xfce/Containerfile
@@ -1,9 +1,11 @@
 FROM ghcr.io/ultramarine-linux/base-bootc:latest
 
-RUN rm -rf /root # workaround
-
-RUN dnf4 remove -y desktop-backgrounds-compat
-
-RUN dnf4 install -x PackageKit -x PackageKit-command-not-found -x grubby -x sdubby -x gnome-software-fedora-langpacks --allowerasing -y @ultramarine-xfce-product-environment
-
-RUN dnf4 clean all
+RUN dnf install \
+  -x PackageKit \
+  -x PackageKit-command-not-found \
+  -x grubby \
+  -x sdubby \
+  -x gnome-software-fedora-langpacks \
+  -x desktop-backgrounds-compat \
+  --allowerasing -y \
+  @ultramarine-xfce-product-environment