diff --git a/buster/x86/Dockerfile b/buster/x86/Dockerfile
index d310b9a629d723a7f85df6501c176ae6df867190..88803e6fd3d04c4a7008d0348f5f03e6b880a2f7 100644
--- a/buster/x86/Dockerfile
+++ b/buster/x86/Dockerfile
@@ -9,11 +9,6 @@ RUN apt-get install -y \
   sudo wget curl tar expect git \
   devscripts build-essential lintian ccache pbuilder aptitude apt-utils
 
-RUN groupadd -g 1000 jenkins \
- && useradd -u 1000 -g 1000 -m jenkins \
- && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
- && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
-
 RUN echo "deb http://deb.debian.org/debian buster-backports main" >/etc/apt/sources.list.d/backports.list
 
 RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
@@ -21,6 +16,13 @@ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
  && DIST=buster \
  && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
 
+RUN groupadd -g 1000 build \
+ && useradd -u 1000 -g 1000 -m build \
+ && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
+ && chown build.build /usr/local/bin
+
+USER build
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/buster/x86_64/Dockerfile b/buster/x86_64/Dockerfile
index 45b91e402ac380da3e3194eaa78c4beb1c0293e1..49958f7ac56c04ad024b7e549785ab60a83b986b 100644
--- a/buster/x86_64/Dockerfile
+++ b/buster/x86_64/Dockerfile
@@ -9,11 +9,6 @@ RUN apt-get install -y \
   sudo wget curl tar expect git \
   devscripts build-essential lintian ccache pbuilder aptitude apt-utils
 
-RUN groupadd -g 1000 jenkins \
- && useradd -u 1000 -g 1000 -m jenkins \
- && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
- && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
-
 RUN echo "deb http://deb.debian.org/debian buster-backports main" >/etc/apt/sources.list.d/backports.list
 
 RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
@@ -21,6 +16,13 @@ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
  && DIST=buster \
  && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
 
+RUN groupadd -g 1000 build \
+ && useradd -u 1000 -g 1000 -m build \
+ && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
+ && chown build.build /usr/local/bin
+
+USER build
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/jessie/x86/Dockerfile b/jessie/x86/Dockerfile
index fda7a819792a8e777ed1d23958933b3533124d93..0baa92dcb2f45d5eff4cc2e60a0bcbb97b9ad502 100644
--- a/jessie/x86/Dockerfile
+++ b/jessie/x86/Dockerfile
@@ -9,11 +9,6 @@ RUN apt-get install -y \
   sudo wget curl tar expect git \
   devscripts build-essential lintian ccache pbuilder aptitude apt-utils
 
-RUN groupadd -g 1000 jenkins \
- && useradd -u 1000 -g 1000 -m jenkins \
- && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
- && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
-
 RUN echo "deb http://archive.debian.org/debian jessie-backports main" >/etc/apt/sources.list.d/backports.list \
  && echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
 
@@ -21,6 +16,13 @@ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
  && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \
  && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
 
+RUN groupadd -g 1000 build \
+ && useradd -u 1000 -g 1000 -m build \
+ && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
+ && chown build.build /usr/local/bin
+
+USER build
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/jessie/x86_64/Dockerfile b/jessie/x86_64/Dockerfile
index 36c76de8eb0b900e997a71fd7742cb1d35d40cb7..35ce933d67a7b643a8ea472434a2e612c9400d34 100644
--- a/jessie/x86_64/Dockerfile
+++ b/jessie/x86_64/Dockerfile
@@ -9,11 +9,6 @@ RUN apt-get install -y \
   sudo wget curl tar expect git \
   devscripts build-essential lintian ccache pbuilder aptitude apt-utils
 
-RUN groupadd -g 1000 jenkins \
- && useradd -u 1000 -g 1000 -m jenkins \
- && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
- && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
-
 RUN echo "deb http://archive.debian.org/debian jessie-backports main" >/etc/apt/sources.list.d/backports.list \
  && echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
 
@@ -21,6 +16,13 @@ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
  && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \
  && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
 
+RUN groupadd -g 1000 build \
+ && useradd -u 1000 -g 1000 -m build \
+ && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
+ && chown build.build /usr/local/bin
+
+USER build
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/stretch/x86/Dockerfile b/stretch/x86/Dockerfile
index a7738499cb9c61bbf0b1f81466ddbe990a1342d9..0f1c416d9b81a777483d3916106f23d9e5b6eb2d 100644
--- a/stretch/x86/Dockerfile
+++ b/stretch/x86/Dockerfile
@@ -9,17 +9,19 @@ RUN apt-get install -y \
   sudo wget curl tar expect git \
   devscripts build-essential lintian ccache pbuilder aptitude apt-utils
 
-RUN groupadd -g 1000 jenkins \
- && useradd -u 1000 -g 1000 -m jenkins \
- && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
- && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
-
 RUN echo "deb http://deb.debian.org/debian stretch-backports main" >/etc/apt/sources.list.d/backports.list
 
 RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
  && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \
  && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
 
+RUN groupadd -g 1000 build \
+ && useradd -u 1000 -g 1000 -m build \
+ && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
+ && chown build.build /usr/local/bin
+
+USER build
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/stretch/x86_64/Dockerfile b/stretch/x86_64/Dockerfile
index 041e661c0b0c50b7f6dc4b2503726bd24b4b5eca..c8820e4eb79a9b149df58f0975e4aafd57f41de3 100644
--- a/stretch/x86_64/Dockerfile
+++ b/stretch/x86_64/Dockerfile
@@ -9,17 +9,19 @@ RUN apt-get install -y \
   sudo wget curl tar expect git \
   devscripts build-essential lintian ccache pbuilder aptitude apt-utils
 
-RUN groupadd -g 1000 jenkins \
- && useradd -u 1000 -g 1000 -m jenkins \
- && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
- && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
-
 RUN echo "deb http://deb.debian.org/debian stretch-backports main" >/etc/apt/sources.list.d/backports.list
 
 RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
  && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \
  && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
 
+RUN groupadd -g 1000 build \
+ && useradd -u 1000 -g 1000 -m build \
+ && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
+ && chown build.build /usr/local/bin
+
+USER build
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]