diff --git a/bionic/x86/Dockerfile b/bionic/x86/Dockerfile
index c6203842a0e820335b1f33da930096dccdab94ea..7f888c03b7f1d1420d637cf7bdf73e8202e68bbd 100644
--- a/bionic/x86/Dockerfile
+++ b/bionic/x86/Dockerfile
@@ -17,8 +17,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/bionic/x86_64/Dockerfile b/bionic/x86_64/Dockerfile
index 8e021f2ff61ff9c275545068ef5e7a597d46a902..ae5cc7704dff35c42e19baadc78217aaca338e51 100644
--- a/bionic/x86_64/Dockerfile
+++ b/bionic/x86_64/Dockerfile
@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
  && apt-get -y install apt-transport-https gnupg
 
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 308C15A29AD198E9 
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 308C15A29AD198E9
 
 RUN echo 'deb http://ppa.launchpad.net/gophers/archive/ubuntu bionic main \n\
 deb-src http://ppa.launchpad.net/gophers/archive/ubuntu bionic main' > /etc/apt/sources.list.d/gophers.list
@@ -25,8 +25,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/focal/x86_64/Dockerfile b/focal/x86_64/Dockerfile
index 4c3742c7c2ca0e994fecafb770736a03595bb0a7..c59cdac2e1ff6a63ee53c96bc71f4d6886184fe0 100644
--- a/focal/x86_64/Dockerfile
+++ b/focal/x86_64/Dockerfile
@@ -17,8 +17,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/hirsute/x86_64/Dockerfile b/hirsute/x86_64/Dockerfile
index fd26df5cca68f8137d091d1ee149ae31a80da03e..5edcef9fa63c5a4d85462f08d59f0497e9d9842b 100644
--- a/hirsute/x86_64/Dockerfile
+++ b/hirsute/x86_64/Dockerfile
@@ -17,8 +17,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/impish/x86_64/Dockerfile b/impish/x86_64/Dockerfile
index 28233508e6874b30d6c31500d85762279489918e..1f60976d44ceea4797b80ffcb945d29a29d8a213 100644
--- a/impish/x86_64/Dockerfile
+++ b/impish/x86_64/Dockerfile
@@ -17,8 +17,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/jammy/x86_64/Dockerfile b/jammy/x86_64/Dockerfile
index e3044e2022bb5462417b193791848c7c5e11df39..1cfdfdc23592bb97c26a6ea89647b474746194af 100644
--- a/jammy/x86_64/Dockerfile
+++ b/jammy/x86_64/Dockerfile
@@ -17,8 +17,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