diff --git a/7/Dockerfile b/7/Dockerfile
index a2a36d2a491fa87d71d8221c60cb07b899d6a041..d5ac2acefb0673c492bc830d181b2f5b9a9a3665 100644
--- a/7/Dockerfile
+++ b/7/Dockerfile
@@ -42,7 +42,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/8/Dockerfile b/8/Dockerfile
index d726767def32c447342af50d5d7f134fd405f8ff..aa0c60a39c1547e012abe753e52bd6088cb6c597 100644
--- a/8/Dockerfile
+++ b/8/Dockerfile
@@ -32,7 +32,9 @@ 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"]