diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
index 0c37b6da..d69daebc 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -53,14 +53,15 @@ if [[ $BASE_IMAGE_NAME =~ "kinoite"  ]]; then
   if [[ ! -f "$HOME/Desktop/steam.desktop" ]]; then
     cp /usr/share/applications/steam.desktop $HOME/Desktop/steam.desktop
   fi
-  if [[ ! -f "$HOME/Desktop/Return.desktop" ]]; then
-    cp /etc/skel.d/Desktop/Return.desktop $HOME/Desktop/Return.desktop
-  fi
   if [[ ! -f "$HOME/Desktop/net.lutris.Lutris.desktop" ]]; then
     cp /usr/share/applications/net.lutris.Lutris.desktop $HOME/Desktop/net.lutris.Lutris.desktop
   fi
-  if [[ ! -f "$HOME/Desktop/yafti.desktop" ]]; then
-    cp /usr/share/applications/yafti.desktop $HOME/Desktop/yafti.desktop
+
+  if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegame" ]]; then
+    echo 'Running setup for Kinoite on Steam Deck'
+    if [[ ! -f "$HOME/Desktop/Return.desktop" ]]; then
+      cp /etc/skel.d/Desktop/Return.desktop $HOME/Desktop/Return.desktop
+    fi
   fi
 else
   echo 'Running setup for Silverblue'