diff --git a/bitnami/openldap/2.6/debian-11/Dockerfile b/bitnami/openldap/2.6/debian-11/Dockerfile
index 3735fc40c86a..e79731dbb963 100644
--- a/bitnami/openldap/2.6/debian-11/Dockerfile
+++ b/bitnami/openldap/2.6/debian-11/Dockerfile
@@ -1,35 +1,40 @@
 FROM docker.io/bitnami/minideb:bullseye
-ENV HOME="/" \
-    OS_ARCH="amd64" \
-    OS_FLAVOUR="debian-11" \
-    OS_NAME="linux"
+
+ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="2.6.3-debian-11-r20" \
+      org.opencontainers.image.ref.name="2.6.3-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." \
       org.opencontainers.image.version="2.6.3"
 
+ENV HOME="/" \
+    OS_ARCH="${TARGETARCH:-amd64}" \
+    OS_FLAVOUR="debian-11" \
+    OS_NAME="linux"
+
 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 libodbc1 libperl5.32 libsasl2-2 libssl1.1 libtirpc3 libwrap0 mdbtools procps psmisc tar
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f openldap-2.6.3-5-linux-amd64-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/openldap-2.6.3-5-linux-amd64-debian-11.tar.gz -O ; \
+    if [ ! -f openldap-2.6.3-5-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/openldap-2.6.3-5-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/openldap-2.6.3-5-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    echo "0426cad0c6eb7405149a684a51d3ab0ba082dca0f6060bf3c9cec087fdf6c27f  openldap-2.6.3-5-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf openldap-2.6.3-5-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf openldap-2.6.3-5-linux-amd64-debian-11.tar.gz
+    sha256sum -c openldap-2.6.3-5-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf openldap-2.6.3-5-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf openldap-2.6.3-5-linux-${OS_ARCH}-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 ; \
+    if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -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
+    sha256sum -c gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-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/README.md b/bitnami/openldap/README.md
index 51e32b0ce3d7..3c2fa0a0e5fd 100644
--- a/bitnami/openldap/README.md
+++ b/bitnami/openldap/README.md
@@ -39,7 +39,7 @@ Non-root container images add an extra layer of security and are generally recom
 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.6`, `2.6-debian-11`, `2.6.3`, `2.6.3-debian-11-r20`, `latest` (2.6/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/openldap/2.6/debian-11/Dockerfile)
+* [`2.6`, `2.6-debian-11`, `2.6.3`, `2.6.3-debian-11-r21`, `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-r24` (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).