diff --git a/bitnami/git/2/debian-10/Dockerfile b/bitnami/git/2/debian-10/Dockerfile
index 0061c5f0b125..2022371d8569 100644
--- a/bitnami/git/2/debian-10/Dockerfile
+++ b/bitnami/git/2/debian-10/Dockerfile
@@ -16,7 +16,7 @@ RUN /build/bitnami-user.sh
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="git" \
-    BITNAMI_IMAGE_VERSION="2.35.1-debian-10-r4" \
+    BITNAMI_IMAGE_VERSION="2.35.1-debian-10-r5" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/git/bin:$PATH"
 
diff --git a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
index 94abe7e64562..e3098a93b7c0 100644
--- a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
+++ b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
@@ -60,6 +60,6 @@ component_unpack() {
         echo "Verifying package integrity"
         echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check - || exit "$?"
     fi
-    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 "${base_name}/files/"
+    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2
     rm "${base_name}.tar.gz"
 }
diff --git a/bitnami/git/README.md b/bitnami/git/README.md
index 3186c7e2c5d1..cae22b888191 100644
--- a/bitnami/git/README.md
+++ b/bitnami/git/README.md
@@ -31,7 +31,7 @@ $ docker run --name git bitnami/git:latest
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`2`, `2-debian-10`, `2.35.1`, `2.35.1-debian-10-r4`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.35.1-debian-10-r4/2/debian-10/Dockerfile)
+* [`2`, `2-debian-10`, `2.35.1`, `2.35.1-debian-10-r5`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.35.1-debian-10-r5/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/bitnami-docker-git).