diff --git a/Dockerfile b/Dockerfile
index f8adb20..4c86d98 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
-LABEL maintainer="tkl@blackfinn.de"
+LABEL maintainer="thomas.klaehn@perinet.io"
 
 # Enable contrip section for "repo"
 RUN sed -i -e 's/.main$/ main contrib/' /etc/apt/sources.list
@@ -10,10 +10,6 @@ RUN apt-get update && apt-get install -yq gawk wget git-core diffstat unzip \
 	texinfo gcc-multilib build-essential chrpath socat cpio python python3 \
 	python3-pip python3-pexpect xz-utils debianutils iputils-ping
 
-# Install jenkins dependencies
-RUN mkdir -p /usr/share/man/man1/
-RUN apt-get install -yq openjdk-8-jre-headless
-
 # Install repo
 RUN apt-get install -yq repo
 
@@ -29,10 +25,12 @@ RUN apt-get install -yq locales && \
 
 ENV LANG en_US.UTF-8
 
-RUN useradd -ms /bin/bash jenkins
-RUN echo "jenkins:jenkins" | chpasswd
+RUN useradd -ms /bin/bash builder
+RUN echo "builder:builder" | chpasswd
 
 ADD init.sh /usr/local/bin/init.sh
 
+WORKDIR = /work
+
 ENTRYPOINT ["/usr/local/bin/init.sh"]