diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
index b9786596..2ec6daa9 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -1,23 +1,6 @@
 #!/usr/bin/env bash
 source /etc/default/bazzite
 
-if [[ -f "${HOME}/.justfile" ]]; then
-  if grep -Eqvz "main|nvidia|custom" "${HOME}/.justfile"; then
-    mv "${HOME}/.justfile" "${HOME}/.justfile.old"
-    cd /usr/share/ublue-os/just
-    for justfile in *.just; do
-      echo "!include ${PWD}/${justfile}" >> "${HOME}/.justfile"
-    done
-    cd ~
-  fi
-else
-  cd /usr/share/ublue-os/just
-  for justfile in *.just; do
-    echo "!include ${PWD}/${justfile}" >> "${HOME}/.justfile"
-  done
-  cd ~
-fi
-
 if [[ $BASE_IMAGE_NAME =~ "kinoite"  ]]; then
   echo 'Running setup for Kinoite'
 
@@ -97,8 +80,12 @@ else
     gsettings set org.gnome.settings-daemon.plugins.power power-button-action "suspend"
 
     echo 'Setting up templates'
-    ln -s /etc/vkBasalt.conf $HOME/Templates/vkBasalt.conf
-    ln -s /etc/dxvk-example.conf $HOME/Templates/dxvk.conf
+    if [[ ! -f "$HOME/Templates/vkBasalt.conf" ]]; then
+      ln -s /etc/vkBasalt.conf $HOME/Templates/vkBasalt.conf
+    fi
+    if [[ ! -f "$HOME/Templates/dxvk.conf" ]]; then
+      ln -s /etc/dxvk-example.conf $HOME/Templates/dxvk.conf
+    fi
 
     echo 'Tweaking GNOME indexer'
     mkdir -p $HOME/.steam