diff --git a/Dockerfile b/Dockerfile
index ced9696..7c70b1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM archlinux:base-devel
+# syntax=docker/dockerfile:1.8-labs
+FROM archlinux:base-devel AS kbs_base
 
 RUN pacman-key --init && \
     pacman -Sy --noconfirm archlinux-keyring && \
@@ -15,17 +16,28 @@ RUN sed -i "s/EUID == 0/EUID == -1/g" "$(which makepkg)"
 RUN yes | pacman -Scc
 
 RUN sed -i "s/SigLevel.*/SigLevel = Never/g" /etc/pacman.conf
-
-ENV KUPFERBOOTSTRAP_WRAPPED=DOCKER
-ENV PATH=/app/bin:/app/local/bin:/app/venv/bin:$PATH
-WORKDIR /app
-
-COPY . .
-RUN python3 -m venv /app/venv
-RUN /app/venv/bin/pip3 install -r requirements.txt
-
-RUN /app/venv/bin/python3 -c "from kupferbootstrap.distro import distro; distro.get_kupfer_local(arch=None,in_chroot=False).repos_config_snippet()" | tee -a /etc/pacman.conf
 RUN useradd -m -g users kupfer
 RUN echo "kupfer ALL=(ALL) NOPASSWD: ALL" | tee /etc/sudoers.d/kupfer
 
+ENV KUPFERBOOTSTRAP_WRAPPED=DOCKER
+ENV PATH=/app/bin:/src/local/bin:/usr/local/bin:/usr/bin
+WORKDIR /src
+
+ADD src pyproject.toml requirements.txt Makefile .
+RUN python3 -m venv /app
+RUN --mount=type=bind,source=src/kupferbootstrap,target=/src/src/kupferbootstrap  /app/bin/pip3 install -e '.[all]'
+RUN mkdir -p /app/local/bin
+RUN ln -sfr /app/bin/kupferbootstrap_wrapper_su_helper /app/bin/wrapper_su_helper
+
+
+FROM kbs_base AS kbs_with_src
+WORKDIR /src
+ADD . .
+
+FROM kbs_with_src AS kbs_fully_installed
 WORKDIR /
+RUN /app/bin/python3 -c "from kupferbootstrap.distro import distro; distro.get_kupfer_local(arch=None,in_chroot=False).repos_config_snippet()" | tee -a /etc/pacman.conf
+
+
+FROM kbs_fully_installed AS kbs_with_git
+ADD --link .git .gitignore .