diff --git a/packaging/Dockerfile.build_env b/packaging/Dockerfile.build_env
index fdccbe639e29..5e05bf8331c3 100644
--- a/packaging/Dockerfile.build_env
+++ b/packaging/Dockerfile.build_env
@@ -4,7 +4,7 @@ FROM ghcr.io/tiiuae/px4-firmware-builder-base:latest
 ARG UID=1000
 ARG GID=1000
 
-RUN groupadd -g $GID builder && \
+RUN groupadd -o -g $GID builder && \
     useradd -m -u $UID -g $GID -g builder builder && \
     usermod -aG sudo builder && \
     echo 'builder ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
@@ -16,3 +16,5 @@ USER builder
 
 VOLUME /px4-firmware/sources
 WORKDIR /px4-firmware/sources
+
+RUN git config --global --add safe.directory /px4-firmware/sources