diff --git a/Dockerfile b/Dockerfile
index 27c2d80..4139105 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,11 +66,10 @@ RUN python3 -m venv /venv && \
     /venv/bin/pip install --upgrade pip && \
     /venv/bin/pip install --no-cache-dir -r /requirements.txt
 
-# Allow git access to mounted build directories
-RUN git config --global --add safe.directory /build
-RUN mkdir -p /opt/atlassian/pipelines/agent/build
-RUN git config --global --add safe.directory /opt/atlassian/pipelines/agent/build
-RUN mkdir -p /github/workspace
-RUN git config --global --add safe.directory /github/workspace
+# Allow git access to mounted build directories.
+RUN mkdir -p /opt/atlassian/pipelines/agent/build /github/workspace && \
+    git config --system --add safe.directory /build && \
+    git config --system --add safe.directory /opt/atlassian/pipelines/agent/build && \
+    git config --system --add safe.directory /github/workspace
 
 ENTRYPOINT ["/pipe.py"]