diff --git a/bitnami/git/2/debian-11/Dockerfile b/bitnami/git/2/debian-11/Dockerfile
index 7e66acacd671..a11ebecc5e6a 100644
--- a/bitnami/git/2/debian-11/Dockerfile
+++ b/bitnami/git/2/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-08-08T16:55:58Z" \
+      org.opencontainers.image.created="2023-08-10T15:25:14Z" \
       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-r67" \
+      org.opencontainers.image.ref.name="2.41.0-debian-11-r69" \
       org.opencontainers.image.title="git" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.41.0"
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 bb20632014ce..c60650214f8f 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
@@ -2,21 +2,30 @@
 # Copyright VMware, Inc.
 # SPDX-License-Identifier: APACHE-2.0
 
-
 set -o errexit
 set -o nounset
 set -o pipefail
 #set -o xtrace
 
+# Load libraries
+. /opt/bitnami/scripts/libbitnami.sh
+. /opt/bitnami/scripts/liblog.sh
+. /opt/bitnami/scripts/libos.sh
+
+print_welcome_page
+
 # 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"
+if ! am_i_root; then
+    export LNAME="git"
+    export LD_PRELOAD="/opt/bitnami/common/lib/libnss_wrapper.so"
+    if ! user_exists "$(id -u)" && [[ -f "$LD_PRELOAD" ]]; then
+        # 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
 fi
 
 # Generate new SSH key pairs if they don't exist