diff --git a/bitnami/openldap/2.5/debian-11/Dockerfile b/bitnami/openldap/2.5/debian-11/Dockerfile
index 21d8f41fb104..9491b9ac3bcb 100644
--- a/bitnami/openldap/2.5/debian-11/Dockerfile
+++ b/bitnami/openldap/2.5/debian-11/Dockerfile
@@ -6,7 +6,7 @@ ENV HOME="/" \
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="2.5.13-debian-11-r20" \
+      org.opencontainers.image.ref.name="2.5.13-debian-11-r21" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/openldap" \
       org.opencontainers.image.title="openldap" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -16,8 +16,20 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libc6 libcom-err2 libcrypt1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libltdl7 libnsl2 libnss3-tools libsasl2-2 libssl1.1 libtirpc3 libwrap0 mdbtools procps psmisc tar
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "openldap" "2.5.13-5" --checksum c7fd049c39ee498be41fd8631ad0465e1e75efbc1eccdcc7bf060da92d591b8c
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-154" --checksum e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f openldap-2.5.13-5-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/openldap-2.5.13-5-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "c7fd049c39ee498be41fd8631ad0465e1e75efbc1eccdcc7bf060da92d591b8c  openldap-2.5.13-5-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf openldap-2.5.13-5-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf openldap-2.5.13-5-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab  gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
diff --git a/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
deleted file mode 100644
index a7b60696daa6..000000000000
--- a/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-# Library for managing Bitnami components
-
-# Constants
-CACHE_ROOT="/tmp/bitnami/pkg/cache"
-DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith"
-
-# Functions
-
-########################
-# Download and unpack a Bitnami package
-# Globals:
-#   OS_NAME
-#   OS_ARCH
-#   OS_FLAVOUR
-# Arguments:
-#   $1 - component's name
-#   $2 - component's version
-# Returns:
-#   None
-#########################
-component_unpack() {
-    local name="${1:?name is required}"
-    local version="${2:?version is required}"
-    local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}"
-    local package_sha256=""
-    local directory="/opt/bitnami"
-
-    # Validate arguments
-    shift 2
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -c|--checksum)
-                shift
-                package_sha256="${1:?missing package checksum}"
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    echo "Downloading $base_name package"
-    if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then
-        echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download."
-        cp "${CACHE_ROOT}/${base_name}.tar.gz" .
-        rm "${CACHE_ROOT}/${base_name}.tar.gz"
-        if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then
-            echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256"
-            package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")"
-            rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256"
-        fi
-    else
-	curl --remote-name --silent --show-error --fail "${DOWNLOAD_URL}/${base_name}.tar.gz"
-    fi
-    if [ -n "$package_sha256" ]; then
-        echo "Verifying package integrity"
-        echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check - || return "$?"
-    fi
-    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 || return "$?"
-    rm "${base_name}.tar.gz"
-}
diff --git a/bitnami/openldap/README.md b/bitnami/openldap/README.md
index fdf64613eea4..70c39f80f6f7 100644
--- a/bitnami/openldap/README.md
+++ b/bitnami/openldap/README.md
@@ -40,7 +40,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`2.6`, `2.6-debian-11`, `2.6.3`, `2.6.3-debian-11-r16`, `latest` (2.6/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/openldap/2.6/debian-11/Dockerfile)
-* [`2.5`, `2.5-debian-11`, `2.5.13`, `2.5.13-debian-11-r20` (2.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/openldap/2.5/debian-11/Dockerfile)
+* [`2.5`, `2.5-debian-11`, `2.5.13`, `2.5.13-debian-11-r21` (2.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/openldap/2.5/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).