diff --git a/bionic/x86/Dockerfile b/bionic/x86/Dockerfile
index dbb4b4cac299251cd8516f45816b7f2b4aad04dd..403cc2bbea0d294a2619630b5702d8e390723d29 100644
--- a/bionic/x86/Dockerfile
+++ b/bionic/x86/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update \
  && eatmydata apt-get upgrade -y
 
 RUN eatmydata apt-get install -y \
-  sudo wget curl tar expect git \
+  sudo wget curl tar expect git-man=1:2.17.0-1ubuntu1 git=1:2.17.0-1ubuntu1 \
   devscripts build-essential lintian ccache pbuilder aptitude apt-utils
 
 RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
@@ -22,7 +22,6 @@ 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 '*'
 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..ea97b9fcb6afa130df88e1346ae93f31f8aa3e01 100644
--- a/bionic/x86_64/Dockerfile
+++ b/bionic/x86_64/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update \
  && eatmydata apt-get upgrade -y
 
 RUN eatmydata apt-get install -y \
-  sudo wget curl tar expect git \
+  sudo wget curl tar expect git-man=1:2.17.0-1ubuntu1 git=1:2.17.0-1ubuntu1 \
   devscripts build-essential lintian ccache pbuilder aptitude apt-utils golang-1.11-go
 
 RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
@@ -30,7 +30,6 @@ 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 '*'
 USER build
 ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
 CMD ["icinga-build-package"]