diff --git a/docker/cuda/Dockerfile b/docker/cuda/Dockerfile
index ad42dd74..b2144fc6 100644
--- a/docker/cuda/Dockerfile
+++ b/docker/cuda/Dockerfile
@@ -17,6 +17,8 @@ RUN apt-get update && apt-get install -y \
 
 ENV FFTWDIR "/usr"
 
+run git config --global --add safe.directory "*"
+
 RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
     KEYDUMP_FILE=keydump && \
     wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
diff --git a/docker/hip/Dockerfile b/docker/hip/Dockerfile
index 4e2e9be9..4c380274 100644
--- a/docker/hip/Dockerfile
+++ b/docker/hip/Dockerfile
@@ -16,10 +16,14 @@ RUN apt-get update && apt-get install -y \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+ENV FFTWDIR "/usr"
+
 ENV PATH=/opt/rocm/bin:$PATH
 ENV LD_LIBRARY_PATH /opt/rocm/hipfft/lib:$LD_LIBRARY_PATH
 ENV CMAKE_PREFIX_PATH /opt/rocm/hip/:/opt/rocm/:$CMAKE_PREFIX_PATH
 
+run git config --global --add safe.directory "*"
+
 RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
     KEYDUMP_FILE=keydump && \
     wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
diff --git a/docker/openmp/Dockerfile b/docker/openmp/Dockerfile
index 247c84fc..48f7fee9 100644
--- a/docker/openmp/Dockerfile
+++ b/docker/openmp/Dockerfile
@@ -15,6 +15,8 @@ RUN apt-get update && apt-get install -y \
 
 ENV FFTWDIR "/usr"
 
+run git config --global --add safe.directory "*"
+
 ARG GCC_VERSION=8
 RUN echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main" >> /etc/apt/sources.list && \
     echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe" >> /etc/apt/sources.list && \
diff --git a/docker/sycl/Dockerfile b/docker/sycl/Dockerfile
index f9d0e1eb..69c7eea6 100644
--- a/docker/sycl/Dockerfile
+++ b/docker/sycl/Dockerfile
@@ -15,8 +15,7 @@ RUN apt-get update && apt-get install -y \
 
 ENV FFTWDIR "/usr"
 
-RUN git config --global --add safe.directory '/work' && \
-    git config --global --add safe.directory '/work/tpls/kokkos'
+run git config --global --add safe.directory "*"
 
 RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
     KEYDUMP_FILE=keydump && \