diff --git a/cache-config/testing/docker/ort_test/Dockerfile b/cache-config/testing/docker/ort_test/Dockerfile
index 40b52fdfd7..dffc596605 100644
--- a/cache-config/testing/docker/ort_test/Dockerfile
+++ b/cache-config/testing/docker/ort_test/Dockerfile
@@ -32,7 +32,9 @@ EXPOSE 80 443
 
 RUN yum install -y epel-release && \
 	yum install -y initscripts git jq gcc lua nmap-ncat && \
-	yum clean all
+	yum clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 # Note that if more than one t3c RPM matches this wildcard, this Dockerfile will
 # break because this will create a directory instead of an RPM file, which it
diff --git a/infrastructure/docker/build/Dockerfile-cache-config b/infrastructure/docker/build/Dockerfile-cache-config
index a0a40e0844..c785bff118 100644
--- a/infrastructure/docker/build/Dockerfile-cache-config
+++ b/infrastructure/docker/build/Dockerfile-cache-config
@@ -36,7 +36,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rsync \
 		gzip \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 # CentOS 7 has pandoc in epel (which we installed above), 8 has it in [pP]ower[tT]ools
 RUN if [[ ${RHEL_VERSION%%.*} -ge 8 ]]; then \
diff --git a/infrastructure/docker/build/Dockerfile-docs b/infrastructure/docker/build/Dockerfile-docs
index 2ffa2335da..af1ec21979 100644
--- a/infrastructure/docker/build/Dockerfile-docs
+++ b/infrastructure/docker/build/Dockerfile-docs
@@ -35,7 +35,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rpm-build \
 		rsync \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 ### docs specific requirements
 FROM common-dependencies AS docs
diff --git a/infrastructure/docker/build/Dockerfile-fakeOrigin b/infrastructure/docker/build/Dockerfile-fakeOrigin
index 6d03d2fb78..b903f43762 100644
--- a/infrastructure/docker/build/Dockerfile-fakeOrigin
+++ b/infrastructure/docker/build/Dockerfile-fakeOrigin
@@ -35,7 +35,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rpm-build \
 		rsync \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 ### fakeOrigin specific requirements
 FROM common-dependencies AS fakeOrigin
diff --git a/infrastructure/docker/build/Dockerfile-grove b/infrastructure/docker/build/Dockerfile-grove
index bfca250a37..3bef117c7f 100644
--- a/infrastructure/docker/build/Dockerfile-grove
+++ b/infrastructure/docker/build/Dockerfile-grove
@@ -35,7 +35,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rpm-build \
 		rsync \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 ### grove specific requirements
 FROM common-dependencies AS grove
diff --git a/infrastructure/docker/build/Dockerfile-grovetccfg b/infrastructure/docker/build/Dockerfile-grovetccfg
index 0eb9582819..820b5885d9 100644
--- a/infrastructure/docker/build/Dockerfile-grovetccfg
+++ b/infrastructure/docker/build/Dockerfile-grovetccfg
@@ -35,7 +35,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rpm-build \
 		rsync \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 ### grovetccfg specific requirements
 FROM common-dependencies AS grovetccfg
diff --git a/infrastructure/docker/build/Dockerfile-source b/infrastructure/docker/build/Dockerfile-source
index df5d94b1d0..20b834a9d3 100644
--- a/infrastructure/docker/build/Dockerfile-source
+++ b/infrastructure/docker/build/Dockerfile-source
@@ -35,7 +35,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rpm-build \
 		rsync \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 ### source specific requirements
 FROM common-dependencies AS source
diff --git a/infrastructure/docker/build/Dockerfile-tc-health-client b/infrastructure/docker/build/Dockerfile-tc-health-client
index 795776d446..45b6138637 100644
--- a/infrastructure/docker/build/Dockerfile-tc-health-client
+++ b/infrastructure/docker/build/Dockerfile-tc-health-client
@@ -36,7 +36,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rsync \
 		gzip \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 # CentOS 7 has pandoc in epel (which we installed above), 8 has it in [pP]ower[tT]ools
 RUN if [[ ${RHEL_VERSION%%.*} -ge 8 ]]; then \
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index d0b031f22b..05db65f785 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -35,7 +35,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rpm-build \
 		rsync \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 ### traffic_monitor specific requirements
 FROM common-dependencies AS traffic-monitor
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index bfe4c9214a..f50dae1b87 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -35,7 +35,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rpm-build \
 		rsync \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 ### traffic_ops specific requirements
 FROM common-dependencies AS traffic-ops
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index a0b435ae32..4e57b7ecf8 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -34,7 +34,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rpm-build \
 		rsync \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 RUN	curl -sL https://rpm.nodesource.com/setup_16.x | bash - && \
 	yum -y install nodejs
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index bcc189e234..03cd35e6b6 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -35,7 +35,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rpm-build \
 		rsync \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 ### traffic_router specific requirements
 FROM common-dependencies AS traffic-router
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index b165e80171..8b946d33c5 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -35,7 +35,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
 		rpm-build \
 		rsync \
 		epel-release && \
-	yum -y clean all
+	yum -y clean all && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 
 ### traffic_stats specific requirements
 FROM common-dependencies AS traffic-stats
diff --git a/infrastructure/docker/build/Dockerfile-tsb b/infrastructure/docker/build/Dockerfile-tsb
index 2e3d48451b..31481d150f 100644
--- a/infrastructure/docker/build/Dockerfile-tsb
+++ b/infrastructure/docker/build/Dockerfile-tsb
@@ -19,7 +19,9 @@
 ARG BASE_IMAGE=rockylinux \
     RHEL_VERSION=8
 FROM ${BASE_IMAGE}:${RHEL_VERSION} as tsb-build
-RUN yum clean all && yum -y install git
+RUN yum clean all && yum -y install git && \
+	# Add skip git's safe.directory check
+	git config --global --add safe.directory '*'
 COPY GO_VERSION /
 RUN curl -L https://dl.google.com/go/go$(cat /GO_VERSION).linux-amd64.tar.gz | tar -C /usr/local -xz && ln -s /usr/local/go/bin/go /usr/bin/go
 # Fetch tested version of tsb: