diff --git a/just/custom.just b/just/custom.just
index 56283964f7d..c40565850f5 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -107,7 +107,8 @@ distrobox-universal:
 
 # Switch to the fish shell
 fish:
-  chsh -s /usr/bin/fish
+  sudo usermod $USER --shell /usr/bin/fish 
+  printf "${USER}'s shell is now %s." "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
 
 # Install recommended GNOME extensions
 gnome-extensions:
@@ -155,7 +156,8 @@ nix-devbox-global:
 podmansh:
   sudo mkdir -p /etc/containers/systemd/users/${UID}
   sudo cp /usr/share/ublue-os/quadlets/podmansh.container /etc/containers/systemd/users/${UID}/podmansh.container
-  sudo lchsh $USER /usr/bin/podmansh
+  sudo usermod $USER --shell /usr/bin/podmansh
+  printf "${USER}'s shell is now %s." "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
   podman pull ghcr.io/ublue-os/ubuntu-toolbox:latest
   
   systemctl --user daemon-reload
@@ -215,9 +217,10 @@ yafti:
 
 # Switch to the zsh shell
 zsh:
-  chsh -s /usr/bin/zsh
+  sudo usermod $USER --shell /usr/bin/zsh 
+  printf "${USER}'s shell is now %s." "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
 
 docker:
   sudo systemctl enable --now docker
   sudo usermod -aG docker $USER
-  newgrp docker
+  newgrp docker
\ No newline at end of file