diff --git a/builder/build-tarball b/builder/build-tarball
index 3733bd6..ba4bc8d 100755
--- a/builder/build-tarball
+++ b/builder/build-tarball
@@ -14,7 +14,7 @@ build_www_dir
 
 docker pull "$os_image"
 docker build -t kasmvncbuilder:$os_ver \
--f builder/dockerfile.ubuntu${os_ver_dockerfile}.build .
+-f builder/dockerfile.${os}${os_ver_dockerfile}.build .
 mkdir -p builder/build
 docker run -v /tmp:/build --rm kasmvncbuilder:$os_ver
 
diff --git a/builder/dockerfile.debian10.deb.build b/builder/dockerfile.debian10.deb.build
new file mode 100644
index 0000000..d3d4e9b
--- /dev/null
+++ b/builder/dockerfile.debian10.deb.build
@@ -0,0 +1,12 @@
+FROM debian:buster
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && \
+      apt-get -y install vim build-essential devscripts equivs
+
+# Install build-deps for the package.
+COPY ./debian/control /tmp
+RUN echo YYY | mk-build-deps --install --remove /tmp/control
+
+USER 1000
diff --git a/builder/dockerfile.debian10.deb.test b/builder/dockerfile.debian10.deb.test
new file mode 100644
index 0000000..0273917
--- /dev/null
+++ b/builder/dockerfile.debian10.deb.test
@@ -0,0 +1,53 @@
+FROM debian:buster-slim
+
+ENV DISPLAY=:1 \
+    VNC_PORT=8443 \
+    VNC_RESOLUTION=1280x720 \
+    MAX_FRAME_RATE=24 \
+    VNCOPTIONS="-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7" \
+    HOME=/home/user \
+    TERM=xterm \
+    STARTUPDIR=/dockerstartup \
+    INST_SCRIPTS=/dockerstartup/install \
+    KASM_RX_HOME=/dockerstartup/kasmrx \
+    DEBIAN_FRONTEND=noninteractive \
+    VNC_COL_DEPTH=24 \
+    VNC_RESOLUTION=1280x1024 \
+    VNC_PW=vncpassword \
+    VNC_USER=user \
+    VNC_VIEW_ONLY_PW=vncviewonlypassword \
+    LD_LIBRARY_PATH=/usr/local/lib/ \
+    OMP_WAIT_POLICY=PASSIVE \
+    SHELL=/bin/bash \
+    SINGLE_APPLICATION=0 \
+    KASMVNC_BUILD_OS=ubuntu \
+    KASMVNC_BUILD_OS_VER=18.04
+
+EXPOSE $VNC_PORT
+
+WORKDIR $HOME
+
+### REQUIRED STUFF ###
+
+RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget procps
+RUN apt-get purge -y pm-utils xscreensaver*
+RUN apt-get update && apt-get install -y vim less
+
+RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
+
+RUN mkdir -p $STARTUPDIR
+COPY startup/ $STARTUPDIR
+
+### START CUSTOM STUFF ####
+
+ARG KASMVNC_PACKAGE_DIR
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
+RUN dpkg -i /tmp/*.deb; apt-get -yf install
+
+### END CUSTOM STUFF ###
+
+RUN chown -R 1000:0 $HOME
+USER 1000:ssl-cert
+WORKDIR $HOME
+
+ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
diff --git a/builder/test-deb b/builder/test-deb
index 11d1eac..f451714 100755
--- a/builder/test-deb
+++ b/builder/test-deb
@@ -6,6 +6,6 @@ cd "$(dirname "$0")"
 . ./os_ver_cli.sh
 
 docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os}_${os_ver}" \
-  -t kasmvnctester-deb:$os_ver \
+  -t kasmvnctester_${os}:$os_ver \
   -f dockerfile.${os}${os_ver_dockerfile}.deb.test .
-#docker run -it -p 443:8443 --rm -e "VNC_USER=username" -e "VNC_PW=password123" kasmvnctester-deb:18.04
+echo docker run -it -p 443:8443 --rm -e "VNC_USER=foo" -e "VNC_PW=bar" kasmvnctester_${os}:$os_ver