diff --git a/Dockerfile b/Dockerfile
index c9bb576..f586a28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:latest
 RUN apk --no-cache add git curl
 RUN sh -c "$(curl -fsLS git.io/chezmoi)" -- init --apply candrewlee14
-ENTRYPOINT ["/bin/fish"]
-
+ENV SHELL /usr/bin/fish
+CMD ["fish"]
diff --git a/bin/chezmoi b/bin/chezmoi
new file mode 100755
index 0000000..83afae2
Binary files /dev/null and b/bin/chezmoi differ
diff --git a/dot_config/private_fish/config.fish b/dot_config/private_fish/config.fish
index d714361..e01c132 100644
--- a/dot_config/private_fish/config.fish
+++ b/dot_config/private_fish/config.fish
@@ -1,3 +1,13 @@
 if status is-interactive
     # Commands to run in interactive sessions can go here
 end
+
+fish_add_path $HOME/.webman/bin
+
+set -gx EDITOR nvim
+
+zoxide init fish | source
+
+if test -f ~/.config/fish/config.fish.local
+    source ~/.config/fish/config.fish.local
+end
diff --git a/dot_config/private_fish/dot_on_install.fish b/dot_config/private_fish/dot_on_install.fish
index a82ad73..81a5d62 100644
--- a/dot_config/private_fish/dot_on_install.fish
+++ b/dot_config/private_fish/dot_on_install.fish
@@ -2,4 +2,3 @@ curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fi
 
 fisher install IlanCosman/tide@v6
 fisher install PatrickF1/fzf.fish
-fisher install kidonng/zoxide.fish
diff --git a/run_once_install.sh.tmpl b/run_once_install.sh.tmpl
index ee193fb..925d752 100644
--- a/run_once_install.sh.tmpl
+++ b/run_once_install.sh.tmpl
@@ -7,11 +7,12 @@ apk add bash fish
 sudo apt-add-repository ppa:fish-shell/release-3
 sudo apt update
 sudo apt install bash fish -y 
+chsh -s $(which fish)
 {{- else if eq .osid "darwin" }}
 brew install neovim tmux perl fish
+chsh -s $(which fish)
 {{- end }}
 
-chsh -s $(which fish)
 
 curl https://raw.githubusercontent.com/candrewlee14/webman/main/scripts/install.sh | sh
 ~/.webman/bin/webman group add modern-unix --all || echo "Not all modern-unix packages installed successfully"