diff --git a/stretch/x86/Dockerfile b/stretch/x86/Dockerfile
index 0f1c416d9b81a777483d3916106f23d9e5b6eb2d..2f5a79ae3036a2db6bb6f204a34d515674b5ba8a 100644
--- a/stretch/x86/Dockerfile
+++ b/stretch/x86/Dockerfile
@@ -21,7 +21,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/stretch/x86_64/Dockerfile b/stretch/x86_64/Dockerfile
index c8820e4eb79a9b149df58f0975e4aafd57f41de3..bfbae387e16b43bafdbcef28ed446bc586acc598 100644
--- a/stretch/x86_64/Dockerfile
+++ b/stretch/x86_64/Dockerfile
@@ -21,7 +21,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"]