diff --git a/3-post-reboot/xmonad.sh b/3-post-reboot/xmonad.sh
index 9b33a0c..3b06d91 100755
--- a/3-post-reboot/xmonad.sh
+++ b/3-post-reboot/xmonad.sh
@@ -1,13 +1,13 @@
 git clone https://github.com/xmonad/xmonad /home/afonso/.config/xmonad/xmonad-git
 git clone https://github.com/xmonad/xmonad-contrib /home/afonso/.config/xmonad/xmonad-contrib-git
 cd /home/afonso/.config/xmonad/ || exit
-stack init
-stack install
+~/.ghcup/bin/stack init
+~/.ghcup/bin/stack install
 
 git clone https://codeberg.org/xmobar/xmobar /home/afonso/.config/xmobar/xmobar-git/
 cd /home/afonso/.config/xmobar/
-stack init
+~/.ghcup/bin/stack init
 sed -i "s/# flags: {}/  flags:\n   xmobar:\n    all_extensions: true\n    with_threaded: true/" /home/afonso/.config/xmobar/stack.yaml
 sed -i "s/# extra-deps: \[\]/  extra-deps:\n   - netlink-1.1.1.0/" /home/afonso/.config/xmobar/stack.yaml
-stack install
+~/.ghcup/bin/stack install
 
diff --git a/setup.sh b/setup.sh
index ba7aede..c1040fe 100755
--- a/setup.sh
+++ b/setup.sh
@@ -4,4 +4,5 @@ source $script_full_path/1-initial/init.sh
 source $script_full_path/2-install-packages/init.sh
 echo "Installing bootloader"
 refind-install
+chsh -s /bin/fish afonso