diff --git a/.dockerignore b/.dockerignore
index 70c8676..7723660 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,3 +6,4 @@ Dockerfile
 **/completions
 **/conf.d
 **/fish_variables
+**/functions
diff --git a/scripts/install.d/02-fish.sh b/scripts/install.d/02-fish.sh
index adba7d0..ffbba54 100755
--- a/scripts/install.d/02-fish.sh
+++ b/scripts/install.d/02-fish.sh
@@ -5,12 +5,12 @@ current_shell=`grep "^$USER" /etc/passwd`
 current_shell=${current_shell##*:}
 fish_shell=`which fish`
 if [[ "$current_shell" != "$fish_shell" ]]; then
-    chsh -s "$fish_shell"
+    sudo usermod --shell "$fish_shell" "$USER"
 fi
 
 fisher_location="$XDG_CONFIG_HOME/fish/functions/fisher.fish"
 if ! [ -f $fisher_location ]; then
-    fish -c "curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher"
+    fish -c "curl -sL https://git.io/fisher | source && fisher update"
 fi
 
 fish -c "fisher update"