diff --git a/.dockerignore b/.dockerignore
index 12e17715871ca..01813401eefc7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -28,4 +28,6 @@ examples/
 !hack/gpg-wrapper.sh
 !hack/git-verify-wrapper.sh
 !hack/tool-versions.sh
-!hack/install.sh
\ No newline at end of file
+!hack/install.sh
+!hack/gitconfig
+
diff --git a/Dockerfile b/Dockerfile
index c63011a18fa28..64c18e5b74324 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,6 +62,7 @@ COPY hack/gpg-wrapper.sh \
     hack/git-verify-wrapper.sh \
     entrypoint.sh \
     /usr/local/bin/
+COPY hack/gitconfig /etc/gitconfig
 COPY --from=builder /usr/local/bin/helm /usr/local/bin/helm
 COPY --from=builder /usr/local/bin/kustomize /usr/local/bin/kustomize
 
diff --git a/hack/gitconfig b/hack/gitconfig
new file mode 100644
index 0000000000000..cfb52bc5ee68d
--- /dev/null
+++ b/hack/gitconfig
@@ -0,0 +1,4 @@
+[maintenance]
+autoDetach = false
+[gc]
+autoDetach = false