diff --git a/bitnami/git/2/debian-11/Dockerfile b/bitnami/git/2/debian-11/Dockerfile
index d74fb6992d9e..1cbc48d7cdca 100644
--- a/bitnami/git/2/debian-11/Dockerfile
+++ b/bitnami/git/2/debian-11/Dockerfile
@@ -6,10 +6,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-15T18:25:18Z" \
+      org.opencontainers.image.created="2023-07-17T10:17:09Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.41.0-debian-11-r15" \
+      org.opencontainers.image.ref.name="2.41.0-debian-11-r16" \
       org.opencontainers.image.title="git" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.41.0"
@@ -24,7 +24,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl git-lfs less libbrotli1 libcom-err2 libcurl4 libffi7 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "git-2.41.0-1-linux-${OS_ARCH}-debian-11" \
+      "git-2.41.0-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -40,7 +40,8 @@ RUN apt-get update && apt-get upgrade -y && \
 
 COPY rootfs /
 RUN install_packages ssh && \
-    rm -f /etc/ssh/ssh_host_* > /dev/null 2>&1
+    rm -f /etc/ssh/ssh_host_* > /dev/null 2>&1 && \
+    chmod g+w /etc/ssh
 ENV APP_VERSION="2.41.0" \
     BITNAMI_APP_NAME="git" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 6b30ebad7b48..669be9586d33 100644
--- a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.41.0-1"
+        "version": "2.41.0-2"
     }
 }
\ No newline at end of file
diff --git a/bitnami/git/2/debian-11/rootfs/opt/bitnami/scripts/git/entrypoint.sh b/bitnami/git/2/debian-11/rootfs/opt/bitnami/scripts/git/entrypoint.sh
index bd9ac83c84e3..bb20632014ce 100755
--- a/bitnami/git/2/debian-11/rootfs/opt/bitnami/scripts/git/entrypoint.sh
+++ b/bitnami/git/2/debian-11/rootfs/opt/bitnami/scripts/git/entrypoint.sh
@@ -8,6 +8,17 @@ set -o nounset
 set -o pipefail
 #set -o xtrace
 
+# Configure NSS wrapper
+if ! getent passwd "$(id -u)" &>/dev/null && [ -e "$NSS_WRAPPER_LIB" ]; then
+    export LD_PRELOAD="$NSS_WRAPPER_LIB"
+    # shellcheck disable=SC2155
+    export NSS_WRAPPER_PASSWD="$(mktemp)"
+    # shellcheck disable=SC2155
+    export NSS_WRAPPER_GROUP="$(mktemp)"
+    echo "git:x:$(id -u):$(id -g):Git:${HOME}:/bin/false" >"$NSS_WRAPPER_PASSWD"
+    echo "git:x:$(id -g):" >"$NSS_WRAPPER_GROUP"
+fi
+
 # Generate new SSH key pairs if they don't exist
 if [[ ! -f /etc/ssh/ssh_host_rsa_key ]]; then
     ssh-keygen -q -t rsa -f /etc/ssh/ssh_host_rsa_key -N "" <<<y >/dev/null 2>&1
@@ -21,14 +32,4 @@ if [[ ! -f /etc/ssh/ssh_host_ed25519_key ]]; then
     ssh-keygen -q -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N "" <<<y >/dev/null 2>&1
 fi
 
-if ! getent passwd "$(id -u)" &>/dev/null && [ -e "$NSS_WRAPPER_LIB" ]; then
-    export LD_PRELOAD="$NSS_WRAPPER_LIB"
-    # shellcheck disable=SC2155
-    export NSS_WRAPPER_PASSWD="$(mktemp)"
-    # shellcheck disable=SC2155
-    export NSS_WRAPPER_GROUP="$(mktemp)"
-    echo "git:x:$(id -u):$(id -g):Git:${HOME}:/bin/false" >"$NSS_WRAPPER_PASSWD"
-    echo "git:x:$(id -g):" >"$NSS_WRAPPER_GROUP"
-fi
-
 [ "$#" -eq 0 ] || exec "$@"