diff --git a/Containerfile b/Containerfile
index 1ffa94bf..4b022af0 100644
--- a/Containerfile
+++ b/Containerfile
@@ -148,17 +148,19 @@ RUN rm /usr/share/applications/shredder.desktop && \
     mkdir -p /etc/flatpak/remotes.d && \
     wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /etc/flatpak/remotes.d && \
     systemctl enable com.system76.Scheduler.service && \
+    systemctl enable displaylink.service && \
+    systemctl enable input-remapper.service && \
     systemctl unmask flatpak-system-install.service && \
     systemctl enable flatpak-system-install.service && \
     systemctl disable rpm-ostreed-automatic.timer && \
     systemctl --global enable ublue-update.timer && \
-    systemctl enable displaylink.service && \
-    systemctl enable input-remapper.service && \
+    systemctl enable bazzite-hardware-setup.service && \
+    systemctl --global enable bazzite-user-setup.service && \
     if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         sed -i '/^PRETTY_NAME/s/Kinoite/Bazzite/' /usr/lib/os-release \
     ; else \
         rm /usr/share/applications/yad-icon-browser.desktop && \
-        sed -i '/^PRETTY_NAME/s/Silverblue/Bazzite/' /usr/lib/os-release \
+        sed -i '/^PRETTY_NAME/s/Silverblue/Bazzite GNOME/' /usr/lib/os-release \
     ; fi && \
     echo -e "IMAGE_NAME=${IMAGE_NAME}\nBASE_IMAGE_NAME=${BASE_IMAGE_NAME}\nIMAGE_FLAVOR=${IMAGE_FLAVOR}\nFEDORA_MAJOR_VERSION=${FEDORA_MAJOR_VERSION}" >> /etc/default/bazzite && \
     rm -rf \
diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
index 2d7217ef..c1d83ab3 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -8,6 +8,8 @@ if [[ $BASE_IMAGE_NAME =~ "kinoite"  ]]; then
   kcmshell5 kcm_kwin_scripts
 
   if [[ $IMAGE_NAME =~ "deck" ]]; then
+    echo 'Running setup for Kinoite on Steam Deck'
+
     echo 'Creating Desktop shortcuts'
     cp /usr/share/applications/steam.desktop ~/Desktop
     sed -i 's@Steam (Runtime)@Steam@g' ~/Desktop/steam.desktop
@@ -33,8 +35,12 @@ else
   if [[ $IMAGE_NAME =~ "deck" ]]; then
     echo 'Running setup for Silverblue on Steam Deck'
 
-    echo 'Enabling tofumenu fork'
+    echo 'Enabling Bazzite tofu menu fork'
     gsettings set org.gnome.shell.extensions.fedora-menu menu-button-icon-size 20
     gnome-shell-extension-cl -e tofumenu@tofu
   fi
-fi
\ No newline at end of file
+fi
+
+# Prevent future executions
+echo "Writing state file"
+touch $HOME/.bazzite-configured
\ No newline at end of file
diff --git a/system_files/desktop/shared/usr/lib/systemd/user/bazzite-user-setup.service b/system_files/desktop/shared/usr/lib/systemd/user/bazzite-user-setup.service
new file mode 100644
index 00000000..3f4463e1
--- /dev/null
+++ b/system_files/desktop/shared/usr/lib/systemd/user/bazzite-user-setup.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Configure Bazzite for current user
+Requires=xdg-desktop-autostart.target
+ConditionPathExists=!%h/.bazzite-configured
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/bazzite-user-setup
+
+[Install]
+WantedBy=multi-user.target