diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml
index efd4fd3..7cf9d42 100644
--- a/.chezmoiexternal.toml
+++ b/.chezmoiexternal.toml
@@ -3,33 +3,8 @@
     url = "https://github.com/gpakosz/.tmux/archive/master.tar.gz"
     exact = true
     stripComponents = 1
-[".oh-my-zsh"]
-    type = "archive"
-    url = "https://github.com/ohmyzsh/ohmyzsh/archive/master.tar.gz"
-    exact = true
-    stripComponents = 1
-[".oh-my-zsh/custom/plugins/zsh-syntax-highlighting"]
-    type = "archive"
-    url = "https://github.com/zsh-users/zsh-syntax-highlighting/archive/master.tar.gz"
-    exact = true
-    stripComponents = 1
-[".oh-my-zsh/custom/plugins/zsh-autosuggestions"]
-    type = "archive"
-    url = "https://github.com/zsh-users/zsh-autosuggestions/archive/master.tar.gz"
-    exact = true
-    stripComponents = 1
-[".oh-my-zsh/custom/plugins/zsh-vi-mode"]
-    type = "archive"
-    url = "https://github.com/jeffreytse/zsh-vi-mode/archive/master.tar.gz"
-    exact = true
-    stripComponents = 1
 [".fzf"]
     type = "archive"
     url = "https://github.com/junegunn/fzf/archive/master.tar.gz"
     exact = true
     stripComponents = 1
-[".oh-my-zsh/custom/themes/powerlevel10k"]
-    type = "archive"
-    url = "https://github.com/romkatv/powerlevel10k/archive/master.tar.gz"
-    exact = true
-    stripComponents = 1
diff --git a/.chezmoiignore b/.chezmoiignore
index 6f7cabe..2839eab 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -4,4 +4,5 @@
 README.md
 Dockerfile
 *.local
+*.local.*
 
diff --git a/Dockerfile b/Dockerfile
index 8859c8a..236a17a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,14 @@
-FROM alpine:edge
-RUN apk --no-cache add git curl
-RUN sh -c "$(curl -fsLS git.io/chezmoi)" -- init --apply candrewlee14
+FROM ubuntu:latest
+RUN apt-get update && \
+    apt-get install -y software-properties-common && \
+    add-apt-repository ppa:fish-shell/release-3 && \
+    apt update && \
+    apt install -y git curl fish sudo && \
+    rm -rf /var/lib/apt/lists/*
+RUN sh -c "$(curl -fsLS get.chezmoi.io)"
+COPY . /root/.local/share/chezmoi/
+
+RUN chezmoi init --apply
+
 ENV SHELL /usr/bin/fish
 CMD ["fish"]
diff --git a/run_once_install.sh.tmpl b/run_once_install.sh.tmpl
index 0e9799f..6f89ce7 100644
--- a/run_once_install.sh.tmpl
+++ b/run_once_install.sh.tmpl
@@ -3,7 +3,7 @@ echo "Running installation script\n"
 {{- if eq .chezmoi.os "linux" }}
 {{- if eq .chezmoi.osRelease.id "alpine" }}
 apk update
-apk add curl bash fish
+apk add curl bash fish grep
 {{- else if (eq .chezmoi.osRelease.id "debian" "ubuntu" "zorin") }}
 sudo apt-add-repository ppa:fish-shell/release-3
 sudo apt update
@@ -20,15 +20,16 @@ chsh -s $(which fish) || echo "chsh failed"
 
 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"
-~/.webman/bin/webman add zozide || echo "zoxide install failed"
 ~/.webman/bin/webman add fzf || echo "fzf install failed"
 ~/.webman/bin/webman add zellij || echo "zellij install failed"
 ~/.webman/bin/webman add nvim || echo "nvim install failed"
 
 /usr/bin/env fish ~/.config/fish/.on_install.fish
 
-echo "Moving current nvim config to nvim.bak"
-mv ~/.config/nvim ~/.config/nvim.bak || echo ""
+if test -x ~/.config/nvim/; then
+  echo "Moving current nvim config to nvim.bak"
+  mv ~/.config/nvim ~/.config/nvim.bak || echo ""
+fi
 echo "Installing AstroNvim config"
 git clone --depth 1 https://github.com/AstroNvim/AstroNvim ~/.config/nvim
 git clone https://github.com/candrewlee14/astronvim_config ~/.config/nvim/lua/user