diff --git a/init.fish b/init.fish
index fb4d47d..d40c406 100644
--- a/init.fish
+++ b/init.fish
@@ -1,6 +1,6 @@
 if ! cat /etc/passwd | grep -E "^user"
     echo "User was not created correctly. Creating user..."
-    useradd -m -s /bin/fish user
+    useradd -m -s /usr/bin/fish user
     if test ! -e /etc/sudoers.d/user.conf
         echo "Setting sudo permissions"
         mkdir -p /etc/sudoers.d/
@@ -18,12 +18,12 @@ function resume
     if sudo -u user tmux has-session -t 0
         if sudo -u user tmux ls | grep -E "^0.*attached)"
             echo "The default tmux session has been attached, dropping you to a normal shell."
-            cd /home/user && sudo -u user /bin/fish
+            cd /home/user && sudo -u user /usr/bin/fish
         else
             sudo -u user tmux attach -t 0
         end
     else
-        sudo -u user tmux new-session -c /home/user /bin/fish
+        sudo -u user tmux new-session -c /home/user /usr/bin/fish
     end
 end
 
diff --git a/user.fish b/user.fish
index 49e420f..b739e76 100644
--- a/user.fish
+++ b/user.fish
@@ -2,7 +2,7 @@ if test -e /workspace/daemon.sock
     echo "Manager capability is detected. Type 'bubble' for help."
 end
 
-if test ! -e /bin/docker
+if test ! -e /usr/bin/docker
     echo "Docker is not installed. Type 'install-docker' to install if needed."
 end
 
@@ -15,8 +15,8 @@ function logout
 end
 
 function install-docker
-    if test -e /bin/docker
-        echo "Docker is already present at /bin/docker."
+    if test -e /usr/bin/docker
+        echo "Docker is already present at /usr/bin/docker."
         return
     end
     echo "Installing docker in 3s."