diff --git a/bullseye/x86/Dockerfile b/bullseye/x86/Dockerfile
index fdd2dd20d2d8bd9500cdb90a52467cde3f2e03ca..e593f2588a501c720093c1a1105356e3b380a7d8 100644
--- a/bullseye/x86/Dockerfile
+++ b/bullseye/x86/Dockerfile
@@ -22,7 +22,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/bullseye/x86_64/Dockerfile b/bullseye/x86_64/Dockerfile
index 82bd868397d97c7b980395a1a0ea3106dd116da8..cbdd1e0111195ec948588ba7055a44dde6163c38 100644
--- a/bullseye/x86_64/Dockerfile
+++ b/bullseye/x86_64/Dockerfile
@@ -22,7 +22,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/buster/x86/Dockerfile b/buster/x86/Dockerfile
index 88803e6fd3d04c4a7008d0348f5f03e6b880a2f7..490863750df81030263325e4f94bd97ab0aab373 100644
--- a/buster/x86/Dockerfile
+++ b/buster/x86/Dockerfile
@@ -22,7 +22,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/buster/x86_64/Dockerfile b/buster/x86_64/Dockerfile
index 49958f7ac56c04ad024b7e549785ab60a83b986b..c35c29c6cbdd764ea60640c578839534f443baab 100644
--- a/buster/x86_64/Dockerfile
+++ b/buster/x86_64/Dockerfile
@@ -22,7 +22,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"]