diff --git a/Dockerfile b/Dockerfile
index 905a5bd5ad7b82f793394a52947d6d40345c03a6..8eb91f1fdf0c604a09aff14c320b0a0a7e5f35c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,17 +12,18 @@ LABEL com.example.vendor="LakeDrops" \
 
 ARG ALPINE_VERSION
 ARG PHP_MAJOR_VERSION
-ARG compose_version=1.29.2
+ARG compose_version=2.4.1
 ARG glibc_version=2.28-r0
 ARG apkArch
 ARG dockerArch
 ARG DOCKER_CHANNEL=stable
-ARG DOCKER_VERSION=19.03.5
-ARG GIT_EXTRAS_VERSION=5.1.0
+ARG DOCKER_VERSION=20.10.9
+ARG GIT_EXTRAS_VERSION=6.3.0
 ARG AHOY_VERSION=2.0.0
 
 ADD usrbin/column /usr/bin/column
 ADD bin/* /usr/local/bin/
+ADD etc/* /etc/
 
 RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     set -eux && \
@@ -84,7 +85,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     chmod +x /usr/local/bin/ahoy && \
     \
     mkdir -p /usr/local/lib/docker/cli-plugins && \
-    curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && \
+    curl -SL https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && \
     chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
     \
     wget -q https://getcomposer.org/composer.phar -O /usr/local/bin/composer && \
diff --git a/etc/gitconfig b/etc/gitconfig
new file mode 100644
index 0000000000000000000000000000000000000000..6bad35f01ce71c03115f834d68374d1f09bda876
--- /dev/null
+++ b/etc/gitconfig
@@ -0,0 +1,2 @@
+[safe]
+directory = *