diff --git a/bitnami/git/2/debian-10/Dockerfile b/bitnami/git/2/debian-10/Dockerfile
index cd6b9d1cc0fb..4a8542ee4d0f 100644
--- a/bitnami/git/2/debian-10/Dockerfile
+++ b/bitnami/git/2/debian-10/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get upgrade -y && \
 RUN /build/bitnami-user.sh
 
 ENV BITNAMI_APP_NAME="git" \
-    BITNAMI_IMAGE_VERSION="2.27.0-debian-10-r24" \
+    BITNAMI_IMAGE_VERSION="2.27.0-debian-10-r25" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/git/bin:$PATH"
 
 ENTRYPOINT [ "git" ]
diff --git a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 257c4297590a..8f37ecbd823e 100644
--- a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -106,7 +106,7 @@ is_file_writable() {
 relativize() {
     local -r path="${1:?missing path}"
     local -r base="${2:?missing base}"
-    pushd / >/dev/null
+    pushd "$base" >/dev/null
     realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||'
     popd >/dev/null
 }
diff --git a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
index dce83ffca153..6e42c882dbff 100644
--- a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
+++ b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
@@ -39,6 +39,10 @@ persist_app() {
     local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder
     local -r tmp_file="/tmp/perms.acl"
     for file_to_persist in "${files_to_persist[@]}"; do
+        if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then
+            error "Cannot persist '${file_to_persist}' because it does not exist"
+            return 1
+        fi
         file_to_persist_relative="$(relativize "$file_to_persist" "$install_dir")"
         file_to_persist_destination="${persist_dir}/${file_to_persist_relative}"
         file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")"
diff --git a/bitnami/git/README.md b/bitnami/git/README.md
index 4eecac1228ca..2fdd09ab0722 100644
--- a/bitnami/git/README.md
+++ b/bitnami/git/README.md
@@ -28,7 +28,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-debian-10`, `2.27.0-debian-10-r24`, `2`, `2.27.0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.27.0-debian-10-r24/2/debian-10/Dockerfile)
+* [`2-debian-10`, `2.27.0-debian-10-r25`, `2`, `2.27.0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.27.0-debian-10-r25/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/bitnami-docker-git).