diff --git a/web-stack/Dockerfile b/web-stack/Dockerfile
index 61bdf78..bcdc288 100644
--- a/web-stack/Dockerfile
+++ b/web-stack/Dockerfile
@@ -1,11 +1,11 @@
-ARG VARIANT="bookworm"
-FROM debian:${VARIANT}
+FROM ubuntu
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
   && apt-get -y install --no-install-recommends \
     ca-certificates \
     zsh \
     vim \
+    neovim \
     tmux \
     curl \
     unzip \
@@ -19,7 +19,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
   && apt-get clean -y \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd -m -s /bin/zsh dev
+ARG UID=1000
+ARG GID=1000
+
+RUN groupadd -g ${GID} dev
+RUN useradd -u ${UID} -g dev -m -s /bin/zsh dev
 RUN echo "dev ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 RUN mkdir /workspace && chown dev:dev /workspace
@@ -29,6 +33,7 @@ COPY install-tools.sh /usr/local/bin/install-tools.sh
 RUN chmod +x /usr/local/bin/install-tools.sh
 
 USER dev
+ENV TERM=xterm-256color
 RUN /usr/local/bin/install-tools.sh
 
 CMD ["zsh"]
diff --git a/web-stack/docker-build b/web-stack/docker-build
new file mode 100755
index 0000000..02659b6
--- /dev/null
+++ b/web-stack/docker-build
@@ -0,0 +1,4 @@
+docker build -t web-stack \
+--no-cache \
+--build-arg UID=$(id -u) \
+--build-arg GID=$(id -g) .