diff --git a/bitnami/openldap/2.5/debian-12/Dockerfile b/bitnami/openldap/2.5/debian-12/Dockerfile
index 2a2a5f16cc47..268902583c89 100644
--- a/bitnami/openldap/2.5/debian-12/Dockerfile
+++ b/bitnami/openldap/2.5/debian-12/Dockerfile
@@ -7,15 +7,15 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-05-13T23:03:56Z" \
+      org.opencontainers.image.created="2024-05-22T07:15:55Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/openldap/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.5.17-debian-12-r27" \
+      org.opencontainers.image.ref.name="2.5.18-debian-12-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/openldap" \
       org.opencontainers.image.title="openldap" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
-      org.opencontainers.image.version="2.5.17"
+      org.opencontainers.image.version="2.5.18"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libargon2-1 libcap2-bin libcom-err2 libcrypt1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libltdl7 libnsl2 libnss3-tools libodbc2 libsasl2-2 libssl3 libtirpc3 libwrap0 mdbtools procps psmisc
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "openldap-2.5.17-2-linux-${OS_ARCH}-debian-12" \
+      "openldap-2.5.18-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -47,7 +47,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/openldap/postunpack.sh
-ENV APP_VERSION="2.5.17" \
+ENV APP_VERSION="2.5.18" \
     BITNAMI_APP_NAME="openldap" \
     PATH="/opt/bitnami/openldap/bin:/opt/bitnami/openldap/sbin:$PATH"
 
diff --git a/bitnami/openldap/2.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/openldap/2.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 9aec8a5aaa28..ce0e09601f01 100644
--- a/bitnami/openldap/2.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/openldap/2.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "2.5.17-2"
+        "version": "2.5.18-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/openldap/2.5/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/openldap/2.5/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh
index 90652245c2a7..004e426fba17 100644
--- a/bitnami/openldap/2.5/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/openldap/2.5/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh
@@ -8,6 +8,7 @@
 
 # Load Generic Libraries
 . /opt/bitnami/scripts/liblog.sh
+. /opt/bitnami/scripts/libvalidations.sh
 
 # Functions
 
@@ -68,7 +69,12 @@ get_machine_ip() {
         error "Could not find any IP address associated to hostname ${hostname}"
         exit 1
     fi
-    echo "${ip_addresses[0]}"
+    # Check if the first IP address is IPv6 to add brackets
+    if validate_ipv6 "${ip_addresses[0]}" ; then
+        echo "[${ip_addresses[0]}]"
+    else
+        echo "${ip_addresses[0]}"
+    fi
 }
 
 ########################
diff --git a/bitnami/openldap/2.5/debian-12/tags-info.yaml b/bitnami/openldap/2.5/debian-12/tags-info.yaml
index 44448d054ac0..805db02ffa1e 100644
--- a/bitnami/openldap/2.5/debian-12/tags-info.yaml
+++ b/bitnami/openldap/2.5/debian-12/tags-info.yaml
@@ -1,4 +1,4 @@
 rolling-tags:
 - "2.5"
 - 2.5-debian-12
-- 2.5.17
+- 2.5.18