diff --git a/docker/Dockerfile_dev-base b/docker/Dockerfile_dev-base
index bed3d54..f39bc6f 100644
--- a/docker/Dockerfile_dev-base
+++ b/docker/Dockerfile_dev-base
@@ -38,7 +38,7 @@ RUN apt-get update \
 
 RUN python -m pip install --no-cache-dir -U future lxml pexpect flake8==4.0.1 pycodestyle==2.8.0 empy pyelftools tabulate
 
-RUN mkdir -p /__w/ardupilot/ardupilot && git config --global --add safe.directory /__w/ardupilot/ardupilot && git config --global --add safe.directory '*'
+RUN mkdir -p /__w/ardupilot/ardupilot && git config --global --add safe.directory /__w/ardupilot/ardupilot && git config --system --add safe.directory /__w/ardupilot/ardupilot
 
 # Set ccache to the PATH
 ENV PATH="/usr/lib/ccache:$PATH"
diff --git a/docker/Dockerfile_dev-chibios-py2 b/docker/Dockerfile_dev-chibios-py2
index e3760c2..509f3ee 100644
--- a/docker/Dockerfile_dev-chibios-py2
+++ b/docker/Dockerfile_dev-chibios-py2
@@ -36,7 +36,7 @@ RUN apt-get update \
 RUN wget -q https://bootstrap.pypa.io/pip/2.7/get-pip.py && python get-pip.py && rm -f get-pip.py
 RUN python -m pip install --no-cache-dir -U future lxml pexpect flake8 pycodestyle empy pyserial
 
-RUN mkdir -p /__w/ardupilot/ardupilot && git config --global --add safe.directory /__w/ardupilot/ardupilot && git config --global --add safe.directory '*'
+RUN mkdir -p /__w/ardupilot/ardupilot && git config --global --add safe.directory /__w/ardupilot/ardupilot && git config --system --add safe.directory /__w/ardupilot/ardupilot
 
 # Set ccache to the PATH
 ENV PATH="/usr/lib/ccache:$PATH"