diff --git a/bionic/x86/Dockerfile b/bionic/x86/Dockerfile
index 315a2b216f54676e2bc06f49912597959fb2be7a..8a3f176afef30f0422eb2178c3f8d585d0b84316 100644
--- a/bionic/x86/Dockerfile
+++ b/bionic/x86/Dockerfile
@@ -20,7 +20,8 @@ RUN groupadd -g 1000 build \
  && 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
+RUN icinga-provide-go
+USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/bionic/x86_64/Dockerfile b/bionic/x86_64/Dockerfile
index ba9a23412c501c87917ef57f7a3c9059c2670435..44ecba2ddc6cba38e25bd72008b3397f1d6a4357 100644
--- a/bionic/x86_64/Dockerfile
+++ b/bionic/x86_64/Dockerfile
@@ -28,7 +28,8 @@ RUN groupadd -g 1000 build \
  && 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
+RUN icinga-provide-go
+USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/focal/x86_64/Dockerfile b/focal/x86_64/Dockerfile
index 433d1c65c3a09fa35084914aea5f096811f74097..d6af05d374fd310e6677611de668f5bc0e4cec55 100644
--- a/focal/x86_64/Dockerfile
+++ b/focal/x86_64/Dockerfile
@@ -20,7 +20,8 @@ RUN groupadd -g 1000 build \
  && 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
+RUN icinga-provide-go
+USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/groovy/x86_64/Dockerfile b/groovy/x86_64/Dockerfile
index 2c817dfa35fab1747820ee8d62655c6ab836c722..0aad3ca8bc1c437e96cf62b82a6335ebcfd36401 100644
--- a/groovy/x86_64/Dockerfile
+++ b/groovy/x86_64/Dockerfile
@@ -20,7 +20,8 @@ RUN groupadd -g 1000 build \
  && 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
+RUN icinga-provide-go
+USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]
diff --git a/hirsute/x86_64/Dockerfile b/hirsute/x86_64/Dockerfile
index a9993a74663ad37883b05c4a95bf21dc6ac0f059..4a88d66b0de18e858a968d8d6dbf266bf55c0594 100644
--- a/hirsute/x86_64/Dockerfile
+++ b/hirsute/x86_64/Dockerfile
@@ -20,7 +20,8 @@ RUN groupadd -g 1000 build \
  && 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
+RUN icinga-provide-go
+USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]