diff --git a/bullseye/x86/Dockerfile b/bullseye/x86/Dockerfile
index a66b6714e573f36dafe21fb6cbb38c7219e70d4d..97623fa35bfb4fd1c068aeaddda4cffbcd7d8e55 100644
--- a/bullseye/x86/Dockerfile
+++ b/bullseye/x86/Dockerfile
@@ -19,8 +19,7 @@ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
 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
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 RUN icinga-provide-go 386
diff --git a/bullseye/x86_64/Dockerfile b/bullseye/x86_64/Dockerfile
index 63517a7932ca504cfa33098515209898789804dc..bb776ef6fe5bea7911d58cdfbacf6f5a0885c0a0 100644
--- a/bullseye/x86_64/Dockerfile
+++ b/bullseye/x86_64/Dockerfile
@@ -19,8 +19,7 @@ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
 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
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 RUN icinga-provide-go
diff --git a/buster/x86/Dockerfile b/buster/x86/Dockerfile
index 5a0013537f75d0dccbfdeca8a53b199a9e64256d..f9c3f3f25d445e84337204ae167c04cfb89483c3 100644
--- a/buster/x86/Dockerfile
+++ b/buster/x86/Dockerfile
@@ -19,8 +19,7 @@ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
 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
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 RUN icinga-provide-go 386
diff --git a/buster/x86_64/Dockerfile b/buster/x86_64/Dockerfile
index ac60453eaf12e8920fef5e8e6cccb7d3d7850166..72bdf43b1dd60d8dfe967a12559202778743c001 100644
--- a/buster/x86_64/Dockerfile
+++ b/buster/x86_64/Dockerfile
@@ -19,8 +19,7 @@ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
 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
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 RUN icinga-provide-go
diff --git a/stretch/x86/Dockerfile b/stretch/x86/Dockerfile
index df64f8923247eb42122f55e499d734f0f6c15c27..17ce591d57931a2bc6b9e3f5bec2dbfd330f506c 100644
--- a/stretch/x86/Dockerfile
+++ b/stretch/x86/Dockerfile
@@ -18,8 +18,7 @@ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
 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
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 RUN icinga-provide-go 386
diff --git a/stretch/x86_64/Dockerfile b/stretch/x86_64/Dockerfile
index de04631239dd92830033eda4e02bba71db39a124..dfec8f773a7b40d79ee34852a9066a1e1eb09484 100644
--- a/stretch/x86_64/Dockerfile
+++ b/stretch/x86_64/Dockerfile
@@ -18,8 +18,7 @@ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
 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
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 RUN icinga-provide-go