diff --git a/base-debian/Dockerfile b/base-debian/Dockerfile
new file mode 100644
index 0000000..e5bf5fe
--- /dev/null
+++ b/base-debian/Dockerfile
@@ -0,0 +1,23 @@
+ARG VARIANT="bookworm"
+FROM debian:${VARIANT}
+
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+  && apt-get -y install --no-install-recommends \
+    zsh \
+    vim \
+    tmux \
+    curl \
+    git \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN useradd -ms /bin/zsh dev
+USER dev
+
+RUN mkdir /home/dev/_app
+
+SHELL ["/bin/zsh", "-c"]
+WORKDIR /home/dev/_app
+
+CMD ["zsh"]
+
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index e52610c..a89c084 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,41 +1,36 @@
 FROM debian:bookworm
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+  && apt-get install -y --no-install-recommends \
   zsh \
   vim \
   tmux \
   curl \
   git \
-  nodejs \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-RUN useradd -ms /bin/zsh dev \
-  && mkdir /home/dev/bin \
-  && chown -R dev:dev /home/dev
-
-
+RUN useradd -ms /bin/zsh dev
 USER dev
 
-export NVM_DIR="/home/dev/.nvm"
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash \
-  && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" \
+RUN mkdir /home/dev/.nvm
+ENV NVM_DIR="/home/dev/.nvm"
+RUN curl https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash \
+  && . $NVM_DIR/nvm.sh \
   && nvm install 18 \
   && nvm install 20 \
   && nvm install 22 \
-  && nvm instal install --lts \
-  && nvm use --lts \
-  && nvm alias default lts/*
+  && nvm install --lts \
+  && nvm aliast default lts/* \
+  && nvm use default
 
+RUN corepack enable npm
 RUN corepack enable yarn
 RUN corepack enable pnpm
 
 RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 
-COPY --chown=dev:dev .vim /home/dev/.vim
-COPY --chown=dev:dev .tmux.conf /home/dev/.tmux.conf
-COPY --chown=dev:dev .zshrc /home/dev/.zshrc
-COPY --chown=dev:dev bin /home/dev/bin
+ADD --chown=dev:dev tmp /home/dev
 
 ENV PATH="/home/dev/bin:$PATH"
 
diff --git a/test/Dockerfile b/test/Dockerfile
new file mode 100644
index 0000000..5435d57
--- /dev/null
+++ b/test/Dockerfile
@@ -0,0 +1,25 @@
+ARG VARIANT="bookworm"
+FROM debian:${VARIANT}
+
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+  && apt-get -y install --no-install-recommends \
+    ca-certificates \
+    zsh \
+    vim \
+    tmux \
+    curl \
+    git \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN useradd --system --create-home --shell=/bin/zsh --groups=sudo dev
+RUN mkdir /workspace && chown -R dev:dev /workspace
+USER dev
+
+RUN git clone https://gitea.tomastm.com/tomas.mirchev/dotfiles.git ~/.dotfiles
+RUN ~/.dotfiles/install.sh
+
+WORKDIR /workspace
+ENV w=/workspace
+
+CMD ["zsh"]