diff --git a/33/Dockerfile b/33/Dockerfile
index 9d3d0dbdd4dc86dee67c5747c84d96ce234c43af..462d531d1a1f13b1c907011d7d4124ad89a26785 100644
--- a/33/Dockerfile
+++ b/33/Dockerfile
@@ -18,7 +18,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/34/Dockerfile b/34/Dockerfile
index e5a72820e3c553fc522b50a06a1e776c466f6629..dcb5f853a6305a3c31064c187e1228f13107822e 100644
--- a/34/Dockerfile
+++ b/34/Dockerfile
@@ -18,7 +18,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"]