diff --git a/15.0/Dockerfile b/15.0/Dockerfile
index 7b25dab6a07819fcfb8012b99daedad4d58e8bc1..f1641de802d6422d2fabc782fb2ab8269212875d 100644
--- a/15.0/Dockerfile
+++ b/15.0/Dockerfile
@@ -13,11 +13,6 @@ RUN zypper --non-interactive install --no-recommends \
   cmake libopenssl-devel ccache \
  && zypper clean
 
-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 OBS_DIST=openSUSE_Leap_15.0 \
  && zypper --non-interactive addrepo --refresh https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/languages:/go/"${OBS_DIST}"/home:lazyfrosch:devel:languages:go.repo \
  && zypper --non-interactive addrepo --refresh https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/tools/"${OBS_DIST}"/home:lazyfrosch:devel:tools.repo \
@@ -29,6 +24,13 @@ RUN rpm --import https://packages.icinga.com/icinga.key \
  && zypper --non-interactive refresh \
  && zypper clean -a
 
+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/42.3/Dockerfile b/42.3/Dockerfile
index b7c746edd4de8891e5bfc4d60102e4d6011f2a88..9e78f518d34d86d3e40981e88cac5b9dda716785 100644
--- a/42.3/Dockerfile
+++ b/42.3/Dockerfile
@@ -13,11 +13,6 @@ RUN zypper --non-interactive install --no-recommends \
   cmake libopenssl-devel ccache \
  && zypper clean
 
-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 OBS_DIST=openSUSE_Leap_42.3 \
  && zypper --non-interactive addrepo --refresh https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/languages:/go/"${OBS_DIST}"/home:lazyfrosch:devel:languages:go.repo \
  && zypper --non-interactive addrepo --refresh https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/tools/"${OBS_DIST}"/home:lazyfrosch:devel:tools.repo \
@@ -29,6 +24,13 @@ RUN rpm --import https://packages.icinga.com/icinga.key \
  && zypper --non-interactive refresh \
  && zypper clean -a
 
+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"]