diff --git a/Containerfile b/Containerfile
index 2a9e25a9..d3a16c27 100644
--- a/Containerfile
+++ b/Containerfile
@@ -9,11 +9,13 @@ RUN ln -s /usr/bin/steamos-logger /usr/bin/steamos-info && \
 # Re-enable RPMFusion repos & add Copr repos
 RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/rpmfusion-nonfree{,-updates}.repo && \
     sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/rpmfusion-free{,-updates}.repo && \
+    wget https://copr.fedorainfracloud.org/coprs/ublue-os/vanilla-first-setup/repo/fedora-$(rpm -E %fedora)/ublue-os-vanilla-first-setup-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os-vanilla-first-setup.repo && \
     wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
     wget https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedora-$(rpm -E %fedora)/kylegospo-LatencyFleX-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo
 
 # Install new packages
 RUN rpm-ostree install \
+    vanilla-first-setup \
     distrobox \
     steam \
     steam-devices \
@@ -64,6 +66,7 @@ RUN rpm-ostree override remove \
 # Cleanup & Finalize
 RUN sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree{,-updates}.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-free{,-updates}.repo && \
+    sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-vanilla-first-setup.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
diff --git a/Containerfile-desktop b/Containerfile-desktop
index 03d5a870..d2805c8e 100644
--- a/Containerfile-desktop
+++ b/Containerfile-desktop
@@ -6,11 +6,13 @@ COPY usr-desktop /usr
 # Re-enable RPMFusion repos & add Copr repos
 RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/rpmfusion-nonfree{,-updates}.repo && \
     sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/rpmfusion-free{,-updates}.repo && \
+    wget https://copr.fedorainfracloud.org/coprs/ublue-os/vanilla-first-setup/repo/fedora-$(rpm -E %fedora)/ublue-os-vanilla-first-setup-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os-vanilla-first-setup.repo && \
     wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
     wget https://copr.fedorainfracloud.org/coprs/kylegospo/system76-scheduler/repo/fedora-$(rpm -E %fedora)/kylegospo-system76-scheduler-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-system76-scheduler.repo
 
 # Install new packages
 RUN rpm-ostree install \
+    vanilla-first-setup \
     distrobox \
     steam-devices \
     steamdeck-kde-themes \
@@ -47,6 +49,7 @@ RUN rpm-ostree override remove \
 # Cleanup & Finalize
 RUN sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree{,-updates}.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-free{,-updates}.repo && \
+    sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-vanilla-first-setup.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-system76-scheduler.repo && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
diff --git a/etc-desktop/systemd/user/distrobox-upgrade-automatic.service b/etc-desktop/systemd/user/distrobox-upgrade-automatic.service
index c7fbf635..6088b879 100644
--- a/etc-desktop/systemd/user/distrobox-upgrade-automatic.service
+++ b/etc-desktop/systemd/user/distrobox-upgrade-automatic.service
@@ -4,4 +4,5 @@ Description=distrobox-upgrade Automatic Update
 [Service]
 Type=simple
 ExecStart=/usr/bin/distrobox-upgrade --all
+ExecStartPost=/usr/bin/distrobox-enter -n bazzite-arch -- '  yay --noconfirm'
 StandardOutput=null