diff --git a/bionic/x86/Dockerfile b/bionic/x86/Dockerfile
index a13291f05eca2eb7f3535a4a6160c64e6164b187..1fa145b4c36951adab3fea5960b7a2782b133191 100644
--- a/bionic/x86/Dockerfile
+++ b/bionic/x86/Dockerfile
@@ -22,9 +22,7 @@ RUN groupadd -g 1000 build \
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 RUN icinga-provide-go 386
-RUN git config --global --add safe.directory '*' \
-    && echo 'safe.directory=*' > /home/build/.gitconfig \
-    && chown build. /home/build/.gitconfig
+RUN sudo -u build -- git config --global --add safe.directory '*'
 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 0da85815cafb8f680cca9ba01a5c20d8f851018c..c06c8924e92cabc40d8e0012a9a4e3afc8fb543d 100644
--- a/bionic/x86_64/Dockerfile
+++ b/bionic/x86_64/Dockerfile
@@ -30,9 +30,7 @@ RUN groupadd -g 1000 build \
 
 RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
 RUN icinga-provide-go
-RUN git config --global --add safe.directory '*' \
-    && echo 'safe.directory=*' > /home/build/.gitconfig \
-    && chown build. /home/build/.gitconfig
+RUN sudo -u build -- git config --global --add safe.directory '*'
 USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]