diff --git a/6-i386/Dockerfile b/6-i386/Dockerfile
index 28ff75e6768fc0a04ee844321d9d842746ed7909..5169ebb789aa8d35531e4be04541a0d86c66cd55 100644
--- a/6-i386/Dockerfile
+++ b/6-i386/Dockerfile
@@ -25,11 +25,6 @@ RUN yum install -y \
   gcc gcc-c++ \
  && yum clean all
 
-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
-
 # not available on EL6
 #RUN yum install -y centos-release-scl centos-release-scl-rh
 
@@ -39,6 +34,13 @@ RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
 RUN wget -O /etc/yum.repos.d/devtoolset-2.repo https://people.centos.org/tru/devtools-2/devtools-2.repo \
  && yum install -y devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils
 
+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/6/Dockerfile b/6/Dockerfile
index 34d1183acd3a6b68f5520c356fdde74581606c9b..e76661baf03cf4bbfaf26494b522ef5028e3ec22 100644
--- a/6/Dockerfile
+++ b/6/Dockerfile
@@ -22,11 +22,6 @@ RUN yum install -y \
   gcc gcc-c++ \
  && yum clean all
 
-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 yum install -y centos-release-scl centos-release-scl-rh
 
 RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
@@ -35,6 +30,13 @@ RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
 RUN wget -O /etc/yum.repos.d/devtoolset-2.repo https://people.centos.org/tru/devtools-2/devtools-2.repo \
  && yum install -y devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils
 
+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/7/Dockerfile b/7/Dockerfile
index 5ac1049cc1a16170bb39f7caf1c3520012d2a4fe..2d6caa39978c8f4bf4f5d28405d4c145e9346296 100644
--- a/7/Dockerfile
+++ b/7/Dockerfile
@@ -22,11 +22,6 @@ RUN yum install -y \
   gcc gcc-c++ \
  && yum clean all
 
-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
-
 # Note: we are disabling scl-rh source since it disappeared from vault
 RUN yum install -y centos-release-scl centos-release-scl-rh scl-utils-build \
  && sed -i -e '/centos-sclo-rh-source/,+5 s/^/#/' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
@@ -34,6 +29,13 @@ RUN yum install -y centos-release-scl centos-release-scl-rh scl-utils-build \
 RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
  https://packages.icinga.com/epel/ICINGA-release.repo
 
+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"]