diff --git a/bionic/x86/Dockerfile b/bionic/x86/Dockerfile
index dbb4b4cac299251cd8516f45816b7f2b4aad04dd..a13291f05eca2eb7f3535a4a6160c64e6164b187 100644
--- a/bionic/x86/Dockerfile
+++ b/bionic/x86/Dockerfile
@@ -22,7 +22,9 @@ 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 '*'
+RUN git config --global --add safe.directory '*' \
+    && echo 'safe.directory=*' > /home/build/.gitconfig \
+    && chown build. /home/build/.gitconfig
 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 7da9c94e73c7f0313427273067a2b758699c0b82..0da85815cafb8f680cca9ba01a5c20d8f851018c 100644
--- a/bionic/x86_64/Dockerfile
+++ b/bionic/x86_64/Dockerfile
@@ -30,7 +30,9 @@ 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 '*'
+RUN git config --global --add safe.directory '*' \
+    && echo 'safe.directory=*' > /home/build/.gitconfig \
+    && chown build. /home/build/.gitconfig
 USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]