diff --git a/bitnami/keydb/6/debian-12/Dockerfile b/bitnami/keydb/6/debian-12/Dockerfile
index 39f4b0db6f96..d36e03de144a 100644
--- a/bitnami/keydb/6/debian-12/Dockerfile
+++ b/bitnami/keydb/6/debian-12/Dockerfile
@@ -8,10 +8,9 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-05-30T15:01:31Z" \
+      org.opencontainers.image.created="2025-06-29T15:23:55Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/keydb/README.md" \
-      org.opencontainers.image.ref.name="6.3.4-debian-12-r21" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/keydb" \
       org.opencontainers.image.title="keydb" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -26,9 +25,11 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi8 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.5-0 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl3 libstdc++6 libtasn1-6 libunistring2 libuuid1 libzstd1 procps zlib1g
-RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
+RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
+    DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
+    mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "wait-for-port-1.0.8-16-linux-${OS_ARCH}-debian-12" \
+      "wait-for-port-1.0.9-0-linux-${OS_ARCH}-debian-12" \
       "keydb-6.3.4-2-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -44,6 +45,7 @@ RUN apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
+RUN uninstall_packages curl
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/keydb/postunpack.sh
diff --git a/bitnami/keydb/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/keydb/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 52d868bc8197..8ce6c805fa9f 100644
--- a/bitnami/keydb/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/keydb/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,6 +9,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.8-16"
+        "version": "1.0.9-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/keydb/6/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/keydb/6/debian-12/prebuildfs/usr/sbin/uninstall_packages
new file mode 100755
index 000000000000..615c430e4e68
--- /dev/null
+++ b/bitnami/keydb/6/debian-12/prebuildfs/usr/sbin/uninstall_packages
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Copyright Broadcom, Inc. All Rights Reserved.
+# SPDX-License-Identifier: APACHE-2.0
+set -eu
+
+n=0
+max=2
+export DEBIAN_FRONTEND=noninteractive
+
+until [ $n -gt $max ]; do
+    set +e
+    (
+        apt-get autoremove --purge -y "$@"
+    )
+    CODE=$?
+    set -e
+    if [ $CODE -eq 0 ]; then
+        break
+    fi
+    if [ $n -eq $max ]; then
+        exit $CODE
+    fi
+    echo "apt failed, retrying"
+    n=$(($n + 1))
+done
+apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/keydb/6/debian-12/tags-info.yaml b/bitnami/keydb/6/debian-12/tags-info.yaml
index 86ad35a5ec8b..ab3dba5b34ad 100644
--- a/bitnami/keydb/6/debian-12/tags-info.yaml
+++ b/bitnami/keydb/6/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
-- "6"
-- 6-debian-12
-- 6.3.4
-- latest
+  - "6"
+  - 6-debian-12
+  - 6.3.4
+  - latest
diff --git a/bitnami/keydb/README.md b/bitnami/keydb/README.md
index 5f93280e8429..631858c3fbdb 100644
--- a/bitnami/keydb/README.md
+++ b/bitnami/keydb/README.md
@@ -144,13 +144,13 @@ networks:
 
 services:
   keydb:
-    image: 'bitnami/keydb:latest'
+    image: bitnami/keydb:latest
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
     networks:
       - app-tier
   myapp:
-    image: 'YOUR_APPLICATION_IMAGE'
+    image: YOUR_APPLICATION_IMAGE
     networks:
       - app-tier
 ```
@@ -376,7 +376,7 @@ services:
       - KEYDB_PORT_NUMBER=7000
     ...
     ports:
-      - '7000:7000'
+      - 7000:7000
   ....
 ```
 
@@ -445,19 +445,19 @@ version: '2'
 
 services:
   keydb-master:
-    image: 'bitnami/keydb:latest'
+    image: bitnami/keydb:latest
     ports:
-      - '6379'
+      - 6379
     environment:
       - KEYDB_REPLICATION_MODE=master
       - KEYDB_PASSWORD=my_master_password
     volumes:
-      - '/path/to/keydb-persistence:/bitnami'
+      - /path/to/keydb-persistence:/bitnami
 
   keydb-replica:
-    image: 'bitnami/keydb:latest'
+    image: bitnami/keydb:latest
     ports:
-      - '6379'
+      - 6379
     depends_on:
       - keydb-master
     environment: