diff --git a/crates/cargo-test-support/containers/apache/Dockerfile b/crates/cargo-test-support/containers/apache/Dockerfile
index 87260241018..926f4c35365 100644
--- a/crates/cargo-test-support/containers/apache/Dockerfile
+++ b/crates/cargo-test-support/containers/apache/Dockerfile
@@ -6,13 +6,13 @@ COPY bar /repos/bar
 WORKDIR /repos/bar
 RUN git config --global user.email "testuser@example.com" &&\
     git config --global user.name "Test User" &&\
+    git config --system --add safe.directory '*' &&\
     git init -b master . &&\
     git add Cargo.toml src &&\
     git commit -m "Initial commit" &&\
-    mv .git ../bar.git &&\
-    cd ../bar.git &&\
-    git config --bool core.bare true &&\
-    rm -rf ../bar
+    cd .. &&\
+    git clone --bare bar bar.git &&\
+    rm -rf bar
 WORKDIR /
 
 EXPOSE 443
diff --git a/crates/cargo-test-support/containers/sshd/Dockerfile b/crates/cargo-test-support/containers/sshd/Dockerfile
index 2c055bbc200..e6187750aee 100644
--- a/crates/cargo-test-support/containers/sshd/Dockerfile
+++ b/crates/cargo-test-support/containers/sshd/Dockerfile
@@ -17,10 +17,9 @@ RUN git config --global user.email "testuser@example.com" &&\
     git init -b master . &&\
     git add Cargo.toml src &&\
     git commit -m "Initial commit" &&\
-    mv .git ../bar.git &&\
-    cd ../bar.git &&\
-    git config --bool core.bare true &&\
-    rm -rf ../bar
+    cd .. &&\
+    git clone --bare bar bar.git &&\
+    rm -rf bar
 WORKDIR /
 USER root