diff --git a/.vib/kafka/goss/vars.yaml b/.vib/kafka/goss/vars.yaml
index fd106625b48c2..b358ba80d5404 100644
--- a/.vib/kafka/goss/vars.yaml
+++ b/.vib/kafka/goss/vars.yaml
@@ -16,7 +16,7 @@ directories:
       - /opt/bitnami/kafka/logs
 files:
   - paths:
-      - /opt/bitnami/kafka/config/server.properties
+      - /opt/bitnami/kafka/config/server.properties.original
 root_dir: /opt/bitnami
 version:
   bin_name: kafka-topics.sh
diff --git a/bitnami/apache-exporter/1/debian-11/Dockerfile b/bitnami/apache-exporter/1/debian-11/Dockerfile
index 904a617101027..98bad1d87b5fd 100644
--- a/bitnami/apache-exporter/1/debian-11/Dockerfile
+++ b/bitnami/apache-exporter/1/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-07-28T15:10:48Z" \
+      org.opencontainers.image.created="2023-07-30T15:46:39Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.0.1-debian-11-r0" \
+      org.opencontainers.image.ref.name="1.0.1-debian-11-r2" \
       org.opencontainers.image.title="apache-exporter" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.0.1"
diff --git a/bitnami/apisix-dashboard/3/debian-11/Dockerfile b/bitnami/apisix-dashboard/3/debian-11/Dockerfile
index 7b3e446f52892..05cf7fad578ea 100644
--- a/bitnami/apisix-dashboard/3/debian-11/Dockerfile
+++ b/bitnami/apisix-dashboard/3/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-07-28T17:40:43Z" \
+      org.opencontainers.image.created="2023-07-30T18:41:17Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.0.1-debian-11-r65" \
+      org.opencontainers.image.ref.name="3.0.1-debian-11-r67" \
       org.opencontainers.image.title="apisix-dashboard" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.0.1"
diff --git a/bitnami/argo-cd/2/debian-11/Dockerfile b/bitnami/argo-cd/2/debian-11/Dockerfile
index 774f4fb09708b..517f9f75fb234 100644
--- a/bitnami/argo-cd/2/debian-11/Dockerfile
+++ b/bitnami/argo-cd/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-07-28T05:49:22Z" \
+      org.opencontainers.image.created="2023-07-31T20:02:44Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.7.9-debian-11-r3" \
+      org.opencontainers.image.ref.name="2.7.9-debian-11-r5" \
       org.opencontainers.image.title="argo-cd" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.7.9"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl git git-lfs gnupg openssh-client procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "argo-cd-2.7.9-0-linux-${OS_ARCH}-debian-11" \
+      "argo-cd-2.7.9-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 77ab8fb7be2ba..603c070c03b20 100644
--- a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.7.9-0"
+        "version": "2.7.9-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/aws-cli/1/debian-11/Dockerfile b/bitnami/aws-cli/1/debian-11/Dockerfile
index 4fba0a392c4df..b6eb993ea9b55 100644
--- a/bitnami/aws-cli/1/debian-11/Dockerfile
+++ b/bitnami/aws-cli/1/debian-11/Dockerfile
@@ -7,13 +7,13 @@ 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-07-28T22:47:08Z" \
+      org.opencontainers.image.created="2023-07-31T22:51:58Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.29.15-debian-11-r0" \
+      org.opencontainers.image.ref.name="1.29.16-debian-11-r0" \
       org.opencontainers.image.title="aws-cli" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="1.29.15"
+      org.opencontainers.image.version="1.29.16"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -27,7 +27,7 @@ RUN install_packages ca-certificates curl groff-base libbz2-1.0 libcom-err2 libc
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "python-3.11.4-4-linux-${OS_ARCH}-debian-11" \
-      "aws-cli-1.29.15-0-linux-${OS_ARCH}-debian-11" \
+      "aws-cli-1.29.16-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 
-ENV APP_VERSION="1.29.15" \
+ENV APP_VERSION="1.29.16" \
     AWS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" \
     BITNAMI_APP_NAME="aws-cli" \
     PATH="/opt/bitnami/python/bin:/opt/bitnami/aws-cli/bin:/opt/bitnami/aws-cli/venv/bin:$PATH"
diff --git a/bitnami/aws-cli/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/aws-cli/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index be1357414eeea..2a55c38f92c15 100644
--- a/bitnami/aws-cli/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/aws-cli/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.29.15-0"
+        "version": "1.29.16-0"
     },
     "python": {
         "arch": "amd64",
diff --git a/bitnami/aws-cli/1/debian-11/tags-info.yaml b/bitnami/aws-cli/1/debian-11/tags-info.yaml
index 60407d0cc71a8..45deda20ada12 100644
--- a/bitnami/aws-cli/1/debian-11/tags-info.yaml
+++ b/bitnami/aws-cli/1/debian-11/tags-info.yaml
@@ -1,4 +1,4 @@
 rolling-tags:
 - "1"
 - 1-debian-11
-- 1.29.15
+- 1.29.16
diff --git a/bitnami/aws-cli/2/debian-11/Dockerfile b/bitnami/aws-cli/2/debian-11/Dockerfile
index ba8500112af93..9a0dbf3f3d7a1 100644
--- a/bitnami/aws-cli/2/debian-11/Dockerfile
+++ b/bitnami/aws-cli/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-07-28T19:47:44Z" \
+      org.opencontainers.image.created="2023-07-30T20:41:56Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.13.5-debian-11-r0" \
+      org.opencontainers.image.ref.name="2.13.5-debian-11-r2" \
       org.opencontainers.image.title="aws-cli" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.13.5"
diff --git a/bitnami/azure-cli/2/debian-11/Dockerfile b/bitnami/azure-cli/2/debian-11/Dockerfile
index 2bb6e3b56e1c1..9d48276042f26 100644
--- a/bitnami/azure-cli/2/debian-11/Dockerfile
+++ b/bitnami/azure-cli/2/debian-11/Dockerfile
@@ -7,13 +7,13 @@ 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-07-30T07:53:17Z" \
+      org.opencontainers.image.created="2023-08-01T04:42:57Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.50.0-debian-11-r21" \
+      org.opencontainers.image.ref.name="2.51.0-debian-11-r0" \
       org.opencontainers.image.title="azure-cli" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="2.50.0"
+      org.opencontainers.image.version="2.51.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -27,7 +27,7 @@ RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libff
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "python-3.9.17-4-linux-${OS_ARCH}-debian-11" \
-      "azure-cli-2.50.0-3-linux-${OS_ARCH}-debian-11" \
+      "azure-cli-2.51.0-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -44,7 +44,7 @@ RUN apt-get autoremove --purge -y curl && \
 RUN chmod g+rwX /opt/bitnami
 RUN mkdir /.azure /.azcopy && chmod g+rwX /.azure /.azcopy /bin
 
-ENV APP_VERSION="2.50.0" \
+ENV APP_VERSION="2.51.0" \
     BITNAMI_APP_NAME="azure-cli" \
     PATH="/opt/bitnami/python/bin:/opt/bitnami/azure-cli/bin:/opt/bitnami/azure-cli/venv/bin:$PATH"
 
diff --git a/bitnami/azure-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/azure-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index cfb67d3494f15..cde5f7d8a20c2 100644
--- a/bitnami/azure-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/azure-cli/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.50.0-3"
+        "version": "2.51.0-0"
     },
     "python": {
         "arch": "amd64",
diff --git a/bitnami/azure-cli/2/debian-11/tags-info.yaml b/bitnami/azure-cli/2/debian-11/tags-info.yaml
index 54e2a2620a6c0..6b4c9f6e34afb 100644
--- a/bitnami/azure-cli/2/debian-11/tags-info.yaml
+++ b/bitnami/azure-cli/2/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "2"
 - 2-debian-11
-- 2.50.0
+- 2.51.0
 - latest
diff --git a/bitnami/codeigniter/4/debian-11/Dockerfile b/bitnami/codeigniter/4/debian-11/Dockerfile
index 2f4167b5052e3..df63e819481c0 100644
--- a/bitnami/codeigniter/4/debian-11/Dockerfile
+++ b/bitnami/codeigniter/4/debian-11/Dockerfile
@@ -7,13 +7,13 @@ 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-07-28T09:56:04Z" \
+      org.opencontainers.image.created="2023-07-31T17:32:58Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.3.6-debian-11-r35" \
+      org.opencontainers.image.ref.name="4.3.7-debian-11-r0" \
       org.opencontainers.image.title="codeigniter" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="4.3.6"
+      org.opencontainers.image.version="4.3.7"
 
 ENV OS_ARCH="${TARGETARCH:-amd64}" \
     OS_FLAVOUR="debian-11" \
@@ -27,7 +27,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "php-8.1.21-3-linux-${OS_ARCH}-debian-11" \
       "mysql-client-10.11.4-1-linux-${OS_ARCH}-debian-11" \
-      "codeigniter-4.3.6-1-linux-${OS_ARCH}-debian-11" \
+      "codeigniter-4.3.7-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -46,7 +46,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/codeigniter/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
-ENV APP_VERSION="4.3.6" \
+ENV APP_VERSION="4.3.7" \
     BITNAMI_APP_NAME="codeigniter" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/codeigniter/bin:$PATH" \
     PHP_ENABLE_OPCACHE="0"
diff --git a/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 9665118c0272a..fbda02a148a13 100644
--- a/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.3.6-1"
+        "version": "4.3.7-0"
     },
     "mysql-client": {
         "arch": "amd64",
diff --git a/bitnami/codeigniter/4/debian-11/tags-info.yaml b/bitnami/codeigniter/4/debian-11/tags-info.yaml
index 6e33eaf7defdd..96ab55e783b82 100644
--- a/bitnami/codeigniter/4/debian-11/tags-info.yaml
+++ b/bitnami/codeigniter/4/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "4"
 - 4-debian-11
-- 4.3.6
+- 4.3.7
 - latest
diff --git a/bitnami/discourse/3/debian-11/Dockerfile b/bitnami/discourse/3/debian-11/Dockerfile
index f04db7cb7c57a..49a2deeb14d90 100644
--- a/bitnami/discourse/3/debian-11/Dockerfile
+++ b/bitnami/discourse/3/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-07-28T18:37:31Z" \
+      org.opencontainers.image.created="2023-07-30T23:45:43Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.0.6-debian-11-r0" \
+      org.opencontainers.image.ref.name="3.0.6-debian-11-r2" \
       org.opencontainers.image.title="discourse" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.0.6"
diff --git a/bitnami/drupal-nginx/9/debian-11/Dockerfile b/bitnami/drupal-nginx/9/debian-11/Dockerfile
index befe6a3899a72..0c797418a6ff7 100644
--- a/bitnami/drupal-nginx/9/debian-11/Dockerfile
+++ b/bitnami/drupal-nginx/9/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-07-27T10:31:03Z" \
+      org.opencontainers.image.created="2023-07-31T17:32:41Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.5.10-debian-11-r22" \
+      org.opencontainers.image.ref.name="9.5.10-debian-11-r23" \
       org.opencontainers.image.title="drupal-nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.5.10"
diff --git a/bitnami/drupal/10/debian-11/Dockerfile b/bitnami/drupal/10/debian-11/Dockerfile
index 29b712685aee1..79c0d65d22dac 100644
--- a/bitnami/drupal/10/debian-11/Dockerfile
+++ b/bitnami/drupal/10/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-07-27T10:32:29Z" \
+      org.opencontainers.image.created="2023-07-31T17:33:13Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.1.1-debian-11-r14" \
+      org.opencontainers.image.ref.name="10.1.1-debian-11-r15" \
       org.opencontainers.image.title="drupal" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.1.1"
diff --git a/bitnami/envoy/1.23/debian-11/Dockerfile b/bitnami/envoy/1.23/debian-11/Dockerfile
index 7960dba99c52c..f51eaf13e8712 100644
--- a/bitnami/envoy/1.23/debian-11/Dockerfile
+++ b/bitnami/envoy/1.23/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-07-28T02:30:33Z" \
+      org.opencontainers.image.created="2023-07-31T03:31:42Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.23.12-debian-11-r2" \
+      org.opencontainers.image.ref.name="1.23.12-debian-11-r5" \
       org.opencontainers.image.title="envoy" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.23.12"
diff --git a/bitnami/envoy/1.24/debian-11/Dockerfile b/bitnami/envoy/1.24/debian-11/Dockerfile
index 22685ea289a34..c4047f5a1a875 100644
--- a/bitnami/envoy/1.24/debian-11/Dockerfile
+++ b/bitnami/envoy/1.24/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-07-28T05:18:15Z" \
+      org.opencontainers.image.created="2023-07-31T06:07:25Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.24.10-debian-11-r2" \
+      org.opencontainers.image.ref.name="1.24.10-debian-11-r5" \
       org.opencontainers.image.title="envoy" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.24.10"
diff --git a/bitnami/ghost/5/debian-11/Dockerfile b/bitnami/ghost/5/debian-11/Dockerfile
index bb9778e5bfd8c..74f8f3d278d1d 100644
--- a/bitnami/ghost/5/debian-11/Dockerfile
+++ b/bitnami/ghost/5/debian-11/Dockerfile
@@ -7,13 +7,13 @@ 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-07-31T07:56:02Z" \
+      org.opencontainers.image.created="2023-07-31T23:11:58Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.56.0-debian-11-r0" \
+      org.opencontainers.image.ref.name="5.57.0-debian-11-r0" \
       org.opencontainers.image.title="ghost" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="5.56.0"
+      org.opencontainers.image.version="5.57.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -29,7 +29,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "python-3.9.17-4-linux-${OS_ARCH}-debian-11" \
       "node-16.20.1-2-linux-${OS_ARCH}-debian-11" \
       "mysql-client-10.11.4-1-linux-${OS_ARCH}-debian-11" \
-      "ghost-5.56.0-0-linux-${OS_ARCH}-debian-11" \
+      "ghost-5.57.0-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -47,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/ghost/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
-ENV APP_VERSION="5.56.0" \
+ENV APP_VERSION="5.57.0" \
     BITNAMI_APP_NAME="ghost" \
     PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:/opt/bitnami/ghost/bin:$PATH"
 
diff --git a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index ded25460422cd..edd1e41401ff0 100644
--- a/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/ghost/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "5.56.0-0"
+        "version": "5.57.0-0"
     },
     "mysql-client": {
         "arch": "amd64",
diff --git a/bitnami/ghost/5/debian-11/tags-info.yaml b/bitnami/ghost/5/debian-11/tags-info.yaml
index 46d8e2a81a0c1..ce3633b507d4c 100644
--- a/bitnami/ghost/5/debian-11/tags-info.yaml
+++ b/bitnami/ghost/5/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "5"
 - 5-debian-11
-- 5.56.0
+- 5.57.0
 - latest
diff --git a/bitnami/gitlab-runner-helper/16/debian-11/Dockerfile b/bitnami/gitlab-runner-helper/16/debian-11/Dockerfile
index 4e66a167dd1a3..a70bb0833b2ea 100644
--- a/bitnami/gitlab-runner-helper/16/debian-11/Dockerfile
+++ b/bitnami/gitlab-runner-helper/16/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-07-27T11:40:09Z" \
+      org.opencontainers.image.created="2023-07-31T17:35:04Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="16.2.0-debian-11-r6" \
+      org.opencontainers.image.ref.name="16.2.0-debian-11-r7" \
       org.opencontainers.image.title="gitlab-runner-helper" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="16.2.0"
diff --git a/bitnami/gitlab-runner/16/debian-11/Dockerfile b/bitnami/gitlab-runner/16/debian-11/Dockerfile
index 603b36189b17f..12f50f1b26ae4 100644
--- a/bitnami/gitlab-runner/16/debian-11/Dockerfile
+++ b/bitnami/gitlab-runner/16/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-07-27T11:40:34Z" \
+      org.opencontainers.image.created="2023-07-31T17:31:35Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="16.2.0-debian-11-r6" \
+      org.opencontainers.image.ref.name="16.2.0-debian-11-r7" \
       org.opencontainers.image.title="gitlab-runner" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="16.2.0"
diff --git a/bitnami/google-cloud-sdk/0/debian-11/Dockerfile b/bitnami/google-cloud-sdk/0/debian-11/Dockerfile
index 51b5a3e278abb..882ed37b7a321 100644
--- a/bitnami/google-cloud-sdk/0/debian-11/Dockerfile
+++ b/bitnami/google-cloud-sdk/0/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-07-27T21:50:23Z" \
+      org.opencontainers.image.created="2023-07-30T23:18:03Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.440.0-debian-11-r2" \
+      org.opencontainers.image.ref.name="0.440.0-debian-11-r5" \
       org.opencontainers.image.title="google-cloud-sdk" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.440.0"
diff --git a/bitnami/grafana-tempo-query/2/debian-11/Dockerfile b/bitnami/grafana-tempo-query/2/debian-11/Dockerfile
index 4f2cf16637172..d326b519b707d 100644
--- a/bitnami/grafana-tempo-query/2/debian-11/Dockerfile
+++ b/bitnami/grafana-tempo-query/2/debian-11/Dockerfile
@@ -7,13 +7,13 @@ 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-07-30T13:03:18Z" \
+      org.opencontainers.image.created="2023-07-31T20:03:48Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.1.1-debian-11-r92" \
+      org.opencontainers.image.ref.name="2.2.0-debian-11-r0" \
       org.opencontainers.image.title="grafana-tempo-query" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="2.1.1"
+      org.opencontainers.image.version="2.2.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "grafana-tempo-query-2.1.1-8-linux-${OS_ARCH}-debian-11" \
+      "grafana-tempo-query-2.2.0-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 
-ENV APP_VERSION="2.1.1" \
+ENV APP_VERSION="2.2.0" \
     BITNAMI_APP_NAME="grafana-tempo-query" \
     GRPC_STORAGE_PLUGIN_BINARY="/opt/bitnami/grafana-tempo-query/bin/tempo-query" \
     PATH="/opt/bitnami/grafana-tempo-query/bin:/opt/bitnami/jaeger-query/bin:$PATH" \
diff --git a/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 65641ffa4de21..e11f50cc6cf01 100644
--- a/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/grafana-tempo-query/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.1.1-8"
+        "version": "2.2.0-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/grafana-tempo-query/2/debian-11/tags-info.yaml b/bitnami/grafana-tempo-query/2/debian-11/tags-info.yaml
index b0186aa4e8d7a..9f995c3791950 100644
--- a/bitnami/grafana-tempo-query/2/debian-11/tags-info.yaml
+++ b/bitnami/grafana-tempo-query/2/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "2"
 - 2-debian-11
-- 2.1.1
+- 2.2.0
 - latest
diff --git a/bitnami/grafana-tempo-vulture/2/debian-11/Dockerfile b/bitnami/grafana-tempo-vulture/2/debian-11/Dockerfile
index dd279db98a064..a7dbed4859f37 100644
--- a/bitnami/grafana-tempo-vulture/2/debian-11/Dockerfile
+++ b/bitnami/grafana-tempo-vulture/2/debian-11/Dockerfile
@@ -7,13 +7,13 @@ 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-07-30T12:59:13Z" \
+      org.opencontainers.image.created="2023-07-31T20:03:39Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.1.1-debian-11-r89" \
+      org.opencontainers.image.ref.name="2.2.0-debian-11-r0" \
       org.opencontainers.image.title="grafana-tempo-vulture" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="2.1.1"
+      org.opencontainers.image.version="2.2.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "grafana-tempo-vulture-2.1.1-2-linux-${OS_ARCH}-debian-11" \
+      "grafana-tempo-vulture-2.2.0-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 
-ENV APP_VERSION="2.1.1" \
+ENV APP_VERSION="2.2.0" \
     BITNAMI_APP_NAME="grafana-tempo-vulture" \
     PATH="/opt/bitnami/grafana-tempo-vulture/bin:$PATH"
 
diff --git a/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 2ddb3ff69164d..8c3103cb9da90 100644
--- a/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/grafana-tempo-vulture/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.1.1-2"
+        "version": "2.2.0-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/grafana-tempo-vulture/2/debian-11/tags-info.yaml b/bitnami/grafana-tempo-vulture/2/debian-11/tags-info.yaml
index b0186aa4e8d7a..9f995c3791950 100644
--- a/bitnami/grafana-tempo-vulture/2/debian-11/tags-info.yaml
+++ b/bitnami/grafana-tempo-vulture/2/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "2"
 - 2-debian-11
-- 2.1.1
+- 2.2.0
 - latest
diff --git a/bitnami/grafana-tempo/2/debian-11/Dockerfile b/bitnami/grafana-tempo/2/debian-11/Dockerfile
index f30fb9323d9e1..36a5211f012db 100644
--- a/bitnami/grafana-tempo/2/debian-11/Dockerfile
+++ b/bitnami/grafana-tempo/2/debian-11/Dockerfile
@@ -7,13 +7,13 @@ 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-07-30T13:11:54Z" \
+      org.opencontainers.image.created="2023-07-31T20:05:29Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.1.1-debian-11-r89" \
+      org.opencontainers.image.ref.name="2.2.0-debian-11-r0" \
       org.opencontainers.image.title="grafana-tempo" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="2.1.1"
+      org.opencontainers.image.version="2.2.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "grafana-tempo-2.1.1-2-linux-${OS_ARCH}-debian-11" \
+      "grafana-tempo-2.2.0-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -43,7 +43,7 @@ RUN apt-get autoremove --purge -y curl && \
 RUN chmod g+rwX /opt/bitnami
 RUN mkdir -p /bitnami/grafana-tempo && chmod g+rwX /bitnami/grafana-tempo
 
-ENV APP_VERSION="2.1.1" \
+ENV APP_VERSION="2.2.0" \
     BITNAMI_APP_NAME="grafana-tempo" \
     PATH="/opt/bitnami/grafana-tempo/bin:$PATH"
 
diff --git a/bitnami/grafana-tempo/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana-tempo/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 3508a0dc7562c..65a537a189a22 100644
--- a/bitnami/grafana-tempo/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/grafana-tempo/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.1.1-2"
+        "version": "2.2.0-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/grafana-tempo/2/debian-11/tags-info.yaml b/bitnami/grafana-tempo/2/debian-11/tags-info.yaml
index b0186aa4e8d7a..9f995c3791950 100644
--- a/bitnami/grafana-tempo/2/debian-11/tags-info.yaml
+++ b/bitnami/grafana-tempo/2/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "2"
 - 2-debian-11
-- 2.1.1
+- 2.2.0
 - latest
diff --git a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile
index 4425064bd471f..39d686d471b24 100644
--- a/bitnami/harbor-adapter-trivy/2/debian-11/Dockerfile
+++ b/bitnami/harbor-adapter-trivy/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-07-27T11:14:57Z" \
+      org.opencontainers.image.created="2023-07-31T17:32:44Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.8.2-debian-11-r41" \
+      org.opencontainers.image.ref.name="2.8.2-debian-11-r42" \
       org.opencontainers.image.title="harbor-adapter-trivy" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.2"
diff --git a/bitnami/harbor-exporter/2/debian-11/Dockerfile b/bitnami/harbor-exporter/2/debian-11/Dockerfile
index 86b30d57f6268..21d09cd8c432b 100644
--- a/bitnami/harbor-exporter/2/debian-11/Dockerfile
+++ b/bitnami/harbor-exporter/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-07-27T11:21:33Z" \
+      org.opencontainers.image.created="2023-07-31T18:40:03Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.8.2-debian-11-r50" \
+      org.opencontainers.image.ref.name="2.8.2-debian-11-r51" \
       org.opencontainers.image.title="harbor-exporter" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.2"
diff --git a/bitnami/harbor-notary-server/2/debian-11/Dockerfile b/bitnami/harbor-notary-server/2/debian-11/Dockerfile
index 1990173a4df75..10f5bf864cbd1 100644
--- a/bitnami/harbor-notary-server/2/debian-11/Dockerfile
+++ b/bitnami/harbor-notary-server/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-07-28T07:51:11Z" \
+      org.opencontainers.image.created="2023-07-31T18:38:32Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.8.3-debian-11-r0" \
+      org.opencontainers.image.ref.name="2.8.3-debian-11-r1" \
       org.opencontainers.image.title="harbor-notary-server" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.3"
diff --git a/bitnami/harbor-notary-signer/2/debian-11/Dockerfile b/bitnami/harbor-notary-signer/2/debian-11/Dockerfile
index 1c4431498c879..c8473a1407d36 100644
--- a/bitnami/harbor-notary-signer/2/debian-11/Dockerfile
+++ b/bitnami/harbor-notary-signer/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-07-28T07:51:14Z" \
+      org.opencontainers.image.created="2023-07-31T18:38:46Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.8.3-debian-11-r0" \
+      org.opencontainers.image.ref.name="2.8.3-debian-11-r1" \
       org.opencontainers.image.title="harbor-notary-signer" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.3"
diff --git a/bitnami/harbor-portal/2/debian-11/Dockerfile b/bitnami/harbor-portal/2/debian-11/Dockerfile
index 96313bd3430ef..3274f5ba663d2 100644
--- a/bitnami/harbor-portal/2/debian-11/Dockerfile
+++ b/bitnami/harbor-portal/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-07-28T07:56:14Z" \
+      org.opencontainers.image.created="2023-07-31T17:33:51Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.8.3-debian-11-r0" \
+      org.opencontainers.image.ref.name="2.8.3-debian-11-r1" \
       org.opencontainers.image.title="harbor-portal" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.3"
diff --git a/bitnami/harbor-registryctl/2/debian-11/Dockerfile b/bitnami/harbor-registryctl/2/debian-11/Dockerfile
index a072973da8c59..a843cc64bdf5a 100644
--- a/bitnami/harbor-registryctl/2/debian-11/Dockerfile
+++ b/bitnami/harbor-registryctl/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-07-27T11:51:58Z" \
+      org.opencontainers.image.created="2023-07-31T17:32:16Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.8.2-debian-11-r50" \
+      org.opencontainers.image.ref.name="2.8.2-debian-11-r51" \
       org.opencontainers.image.title="harbor-registryctl" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.2"
@@ -27,7 +27,7 @@ RUN install_packages ca-certificates curl procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "yq-4.34.2-1-linux-${OS_ARCH}-debian-11" \
-      "harbor-registry-2.8.2-1-linux-${OS_ARCH}-debian-11" \
+      "harbor-registry-2.8.3-0-linux-${OS_ARCH}-debian-11" \
       "harbor-registryctl-2.8.2-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 86811d687dd6b..695d136ca3628 100644
--- a/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/harbor-registryctl/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.8.2-1"
+        "version": "2.8.3-0"
     },
     "harbor-registryctl": {
         "arch": "amd64",
diff --git a/bitnami/jasperreports/8/debian-11/Dockerfile b/bitnami/jasperreports/8/debian-11/Dockerfile
index fa6fb61fecd37..245dcd1a16d0e 100644
--- a/bitnami/jasperreports/8/debian-11/Dockerfile
+++ b/bitnami/jasperreports/8/debian-11/Dockerfile
@@ -8,10 +8,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-07-27T14:26:46Z" \
+      org.opencontainers.image.created="2023-07-31T17:33:30Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.2.0-debian-11-r34" \
+      org.opencontainers.image.ref.name="8.2.0-debian-11-r35" \
       org.opencontainers.image.title="jasperreports" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.2.0"
@@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages acl ca-certificates curl fontconfig git libaudit1 libbsd0 libcap-ng0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpam0g libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 procps xmlstarlet zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "java-1.8.382-6-1-linux-${OS_ARCH}-debian-11" \
+      "java-1.8.382-6-3-linux-${OS_ARCH}-debian-11" \
       "tomcat-9.0.78-1-linux-${OS_ARCH}-debian-11" \
       "postgresql-client-11.20.0-2-linux-${OS_ARCH}-debian-11" \
       "mysql-client-10.11.4-1-linux-${OS_ARCH}-debian-11" \
diff --git a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 01e5322c9bf97..23aa1597fc6b7 100644
--- a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.8.382-6-1"
+        "version": "1.8.382-6-3"
     },
     "mysql-client": {
         "arch": "amd64",
diff --git a/bitnami/jax/0/debian-11/Dockerfile b/bitnami/jax/0/debian-11/Dockerfile
index 631bf816d6d7d..756d1da598ad2 100644
--- a/bitnami/jax/0/debian-11/Dockerfile
+++ b/bitnami/jax/0/debian-11/Dockerfile
@@ -7,13 +7,13 @@ 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-07-31T02:20:35Z" \
+      org.opencontainers.image.created="2023-07-31T17:21:04Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.4.13-debian-11-r18" \
+      org.opencontainers.image.ref.name="0.4.14-debian-11-r0" \
       org.opencontainers.image.title="jax" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="0.4.13"
+      org.opencontainers.image.version="0.4.14"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -26,8 +26,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "python-3.8.17-4-linux-${OS_ARCH}-debian-11" \
-      "jax-0.4.13-1-linux-${OS_ARCH}-debian-11" \
+      "python-3.11.4-4-linux-${OS_ARCH}-debian-11" \
+      "jax-0.4.14-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -45,7 +45,7 @@ RUN useradd -r -u 1001 -g root jax
 RUN mkdir /.local && chmod g+rwX /.local
 
 RUN mkdir /app && chmod g+rwX /app
-ENV APP_VERSION="0.4.13" \
+ENV APP_VERSION="0.4.14" \
     BITNAMI_APP_NAME="jax" \
     PATH="/opt/bitnami/python/bin:$PATH"
 
diff --git a/bitnami/jax/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jax/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 991aba817eb11..d1d9e9040f876 100644
--- a/bitnami/jax/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/jax/0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,12 +3,12 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "0.4.13-1"
+        "version": "0.4.14-0"
     },
     "python": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.8.17-4"
+        "version": "3.11.4-4"
     }
 }
\ No newline at end of file
diff --git a/bitnami/jax/0/debian-11/tags-info.yaml b/bitnami/jax/0/debian-11/tags-info.yaml
index 4619601c90c0b..f423911f61dc8 100644
--- a/bitnami/jax/0/debian-11/tags-info.yaml
+++ b/bitnami/jax/0/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "0"
 - 0-debian-11
-- 0.4.13
+- 0.4.14
 - latest
diff --git a/bitnami/jenkins-agent/0/debian-11/Dockerfile b/bitnami/jenkins-agent/0/debian-11/Dockerfile
index 3304d783412a5..ec7505f4ebdf8 100644
--- a/bitnami/jenkins-agent/0/debian-11/Dockerfile
+++ b/bitnami/jenkins-agent/0/debian-11/Dockerfile
@@ -8,10 +8,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-07-29T01:34:04Z" \
+      org.opencontainers.image.created="2023-07-31T02:48:39Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.3142.0-debian-11-r0" \
+      org.opencontainers.image.ref.name="0.3142.0-debian-11-r2" \
       org.opencontainers.image.title="jenkins-agent" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.3142.0"
diff --git a/bitnami/joomla/3/debian-11/Dockerfile b/bitnami/joomla/3/debian-11/Dockerfile
index fa3c491895a7a..9419810c13c5c 100644
--- a/bitnami/joomla/3/debian-11/Dockerfile
+++ b/bitnami/joomla/3/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-07-27T13:06:09Z" \
+      org.opencontainers.image.created="2023-07-31T17:32:16Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.10.12-debian-11-r15" \
+      org.opencontainers.image.ref.name="3.10.12-debian-11-r16" \
       org.opencontainers.image.title="joomla" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.10.12"
diff --git a/bitnami/joomla/4/debian-11/Dockerfile b/bitnami/joomla/4/debian-11/Dockerfile
index f32a338d018af..2e623b7a3a0a7 100644
--- a/bitnami/joomla/4/debian-11/Dockerfile
+++ b/bitnami/joomla/4/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-07-27T12:29:30Z" \
+      org.opencontainers.image.created="2023-07-31T17:34:15Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.3.3-debian-11-r15" \
+      org.opencontainers.image.ref.name="4.3.3-debian-11-r16" \
       org.opencontainers.image.title="joomla" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.3.3"
diff --git a/bitnami/jruby/9.4/debian-11/Dockerfile b/bitnami/jruby/9.4/debian-11/Dockerfile
index 59622ce54f56f..52e6049c76d60 100644
--- a/bitnami/jruby/9.4/debian-11/Dockerfile
+++ b/bitnami/jruby/9.4/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-07-27T12:45:51Z" \
+      org.opencontainers.image.created="2023-07-31T17:32:43Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.4.3-0-debian-11-r48" \
+      org.opencontainers.image.ref.name="9.4.3-0-debian-11-r49" \
       org.opencontainers.image.title="jruby" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.4.3-0"
@@ -26,8 +26,8 @@ RUN install_packages build-essential ca-certificates curl git libbrotli1 libbz2-
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "python-3.9.17-4-linux-${OS_ARCH}-debian-11" \
-      "node-16.20.1-1-linux-${OS_ARCH}-debian-11" \
-      "java-17.0.8-7-1-linux-${OS_ARCH}-debian-11" \
+      "node-16.20.1-2-linux-${OS_ARCH}-debian-11" \
+      "java-17.0.8-7-2-linux-${OS_ARCH}-debian-11" \
       "jruby-9.4.3-0-5-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/jruby/9.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jruby/9.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index b52780a18a653..93023f88f64c8 100644
--- a/bitnami/jruby/9.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/jruby/9.4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "17.0.8-7-1"
+        "version": "17.0.8-7-2"
     },
     "jruby": {
         "arch": "amd64",
@@ -15,7 +15,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "16.20.1-1"
+        "version": "16.20.1-2"
     },
     "python": {
         "arch": "amd64",
diff --git a/bitnami/kafka/3.2/debian-11/Dockerfile b/bitnami/kafka/3.2/debian-11/Dockerfile
index 6efc1a7a52f6d..bc148d73dfbca 100644
--- a/bitnami/kafka/3.2/debian-11/Dockerfile
+++ b/bitnami/kafka/3.2/debian-11/Dockerfile
@@ -8,10 +8,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-07-30T15:41:10Z" \
+      org.opencontainers.image.created="2023-07-31T14:25:58Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.2.3-debian-11-r163" \
+      org.opencontainers.image.ref.name="3.2.3-debian-11-r164" \
       org.opencontainers.image.title="kafka" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.2.3"
diff --git a/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka-env.sh b/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka-env.sh
index bd335cd6d3390..1d31c9ceb3646 100644
--- a/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka-env.sh
+++ b/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka-env.sh
@@ -24,26 +24,31 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
 # By setting an environment variable matching *_FILE to a file path, the prefixed environment
 # variable will be overridden with the value specified in that file
 kafka_env_vars=(
-    ALLOW_PLAINTEXT_LISTENER
     KAFKA_INTER_BROKER_USER
     KAFKA_INTER_BROKER_PASSWORD
+    KAFKA_CONTROLLER_USER
+    KAFKA_CONTROLLER_PASSWORD
     KAFKA_CERTIFICATE_PASSWORD
     KAFKA_TLS_TRUSTSTORE_FILE
     KAFKA_TLS_TYPE
     KAFKA_TLS_CLIENT_AUTH
+    KAFKA_TLS_INTER_BROKER_AUTH
+    KAFKA_TLS_CONTROLLER_AUTH
     KAFKA_OPTS
     KAFKA_CFG_LISTENERS
     KAFKA_CFG_ADVERTISED_LISTENERS
     KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP
     KAFKA_CFG_ZOOKEEPER_CONNECT
+    KAFKA_CFG_CONTROLLER_QUORUM_VOTERS
     KAFKA_CFG_SASL_ENABLED_MECHANISMS
     KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL
     KAFKA_CFG_SASL_MECHANISM_CONTROLLER_PROTOCOL
     KAFKA_CFG_INTER_BROKER_LISTENER_NAME
     KAFKA_CFG_MAX_REQUEST_SIZE
     KAFKA_CFG_MAX_PARTITION_FETCH_BYTES
-    KAFKA_ENABLE_KRAFT
     KAFKA_KRAFT_CLUSTER_ID
+    KAFKA_SKIP_KRAFT_STORAGE_INIT
+    KAFKA_CLIENT_LISTENER_NAME
     KAFKA_ZOOKEEPER_PROTOCOL
     KAFKA_ZOOKEEPER_PASSWORD
     KAFKA_ZOOKEEPER_USER
@@ -74,8 +79,7 @@ export KAFKA_BASE_DIR="${BITNAMI_ROOT_DIR}/kafka"
 export KAFKA_VOLUME_DIR="/bitnami/kafka"
 export KAFKA_DATA_DIR="${KAFKA_VOLUME_DIR}/data"
 export KAFKA_CONF_DIR="${KAFKA_BASE_DIR}/config"
-export KAFKA_CONF_FILE="${KAFKA_CONF_DIR}/kraft/server.properties"
-export KAFKA_ZK_CONF_FILE="${KAFKA_CONF_DIR}/server.properties"
+export KAFKA_CONF_FILE="${KAFKA_CONF_DIR}/server.properties"
 export KAFKA_MOUNTED_CONF_DIR="${KAFKA_VOLUME_DIR}/config"
 export KAFKA_CERTS_DIR="${KAFKA_CONF_DIR}/certs"
 export KAFKA_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d"
@@ -88,28 +92,33 @@ export KAFKA_DAEMON_USER="kafka"
 export KAFKA_DAEMON_GROUP="kafka"
 
 # Kafka runtime settings
-export ALLOW_PLAINTEXT_LISTENER="${ALLOW_PLAINTEXT_LISTENER:-no}"
 export KAFKA_INTER_BROKER_USER="${KAFKA_INTER_BROKER_USER:-user}"
 export KAFKA_INTER_BROKER_PASSWORD="${KAFKA_INTER_BROKER_PASSWORD:-bitnami}"
+export KAFKA_CONTROLLER_USER="${KAFKA_CONTROLLER_USER:-controller_user}"
+export KAFKA_CONTROLLER_PASSWORD="${KAFKA_CONTROLLER_PASSWORD:-bitnami}"
 export KAFKA_CERTIFICATE_PASSWORD="${KAFKA_CERTIFICATE_PASSWORD:-}"
 export KAFKA_TLS_TRUSTSTORE_FILE="${KAFKA_TLS_TRUSTSTORE_FILE:-}"
 export KAFKA_TLS_TYPE="${KAFKA_TLS_TYPE:-JKS}"
 export KAFKA_TLS_CLIENT_AUTH="${KAFKA_TLS_CLIENT_AUTH:-required}"
+export KAFKA_TLS_INTER_BROKER_AUTH="${KAFKA_TLS_INTER_BROKER_AUTH:-$KAFKA_TLS_CLIENT_AUTH}"
+export KAFKA_TLS_CONTROLLER_AUTH="${KAFKA_TLS_CONTROLLER_AUTH:-$KAFKA_TLS_CLIENT_AUTH}"
 export KAFKA_OPTS="${KAFKA_OPTS:-}"
 
 # Kafka configuration overrides
-export KAFKA_CFG_LISTENERS="${KAFKA_CFG_LISTENERS:-PLAINTEXT://:9092,CONTROLLER://:9093}"
-export KAFKA_CFG_ADVERTISED_LISTENERS="${KAFKA_CFG_ADVERTISED_LISTENERS:-PLAINTEXT://:9092}"
+export KAFKA_CFG_LISTENERS="${KAFKA_CFG_LISTENERS:-}"
+export KAFKA_CFG_ADVERTISED_LISTENERS="${KAFKA_CFG_ADVERTISED_LISTENERS:-}"
 export KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP="${KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP:-}"
 export KAFKA_CFG_ZOOKEEPER_CONNECT="${KAFKA_CFG_ZOOKEEPER_CONNECT:-}"
+export KAFKA_CFG_CONTROLLER_QUORUM_VOTERS="${KAFKA_CFG_CONTROLLER_QUORUM_VOTERS:-}"
 export KAFKA_CFG_SASL_ENABLED_MECHANISMS="${KAFKA_CFG_SASL_ENABLED_MECHANISMS:-PLAIN,SCRAM-SHA-256,SCRAM-SHA-512}"
 export KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL="${KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL:-}"
 export KAFKA_CFG_SASL_MECHANISM_CONTROLLER_PROTOCOL="${KAFKA_CFG_SASL_MECHANISM_CONTROLLER_PROTOCOL:-}"
 export KAFKA_CFG_INTER_BROKER_LISTENER_NAME="${KAFKA_CFG_INTER_BROKER_LISTENER_NAME:-}"
 export KAFKA_CFG_MAX_REQUEST_SIZE="${KAFKA_CFG_MAX_REQUEST_SIZE:-}"
 export KAFKA_CFG_MAX_PARTITION_FETCH_BYTES="${KAFKA_CFG_MAX_PARTITION_FETCH_BYTES:-}"
-export KAFKA_ENABLE_KRAFT="${KAFKA_ENABLE_KRAFT:-yes}"
 export KAFKA_KRAFT_CLUSTER_ID="${KAFKA_KRAFT_CLUSTER_ID:-}"
+export KAFKA_SKIP_KRAFT_STORAGE_INIT="${KAFKA_SKIP_KRAFT_STORAGE_INIT:-false}"
+export KAFKA_CLIENT_LISTENER_NAME="${KAFKA_CLIENT_LISTENER_NAME:-}"
 
 # ZooKeeper connection settings
 export KAFKA_ZOOKEEPER_PROTOCOL="${KAFKA_ZOOKEEPER_PROTOCOL:-PLAINTEXT}"
diff --git a/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/postunpack.sh b/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/postunpack.sh
index 746821849b4cf..b6526959daf79 100755
--- a/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/postunpack.sh
+++ b/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/postunpack.sh
@@ -30,6 +30,9 @@ for dir in "$KAFKA_LOG_DIR" "$KAFKA_CONF_DIR" "$KAFKA_MOUNTED_CONF_DIR" "$KAFKA_
 done
 chmod -R g+rwX "$KAFKA_BASE_DIR" "$KAFKA_VOLUME_DIR" "$KAFKA_DATA_DIR" "$KAFKA_INITSCRIPTS_DIR"
 
+# Move the original server.properties, so users can skip initialization logic by mounting their own server.properties directly instead of using the MOUNTED_CONF_DIR
+mv "${KAFKA_CONF_DIR}/server.properties" "${KAFKA_CONF_DIR}/server.properties.original"
+
 # Disable logging to stdout and garbage collection
 # Source: https://logging.apache.org/log4j/log4j-2.4/manual/appenders.html
 replace_in_file "${KAFKA_BASE_DIR}/bin/kafka-server-start.sh" " [-]loggc" " "
diff --git a/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/run.sh b/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/run.sh
index b7fff77ac9016..a82f26867e701 100755
--- a/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/run.sh
+++ b/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/run.sh
@@ -16,22 +16,17 @@ set -o pipefail
 # Load Kafka environment variables
 . /opt/bitnami/scripts/kafka-env.sh
 
-if [[ "${KAFKA_CFG_LISTENERS:-}" =~ SASL ]] || [[ "${KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP:-}" =~ SASL ]] || [[ "${KAFKA_ZOOKEEPER_PROTOCOL:-}" =~ SASL ]]; then
+if [[ -f "${KAFKA_CONF_DIR}/kafka_jaas.conf" ]]; then
     export KAFKA_OPTS="-Djava.security.auth.login.config=${KAFKA_CONF_DIR}/kafka_jaas.conf"
 fi
 
-if [[ "${KAFKA_ZOOKEEPER_PROTOCOL:-}" =~ SSL ]]; then
-    ZOOKEEPER_SSL_CONFIG=$(zookeeper_get_tls_config)
-    export KAFKA_OPTS="$KAFKA_OPTS $ZOOKEEPER_SSL_CONFIG"
-fi
-
-flags=("$(kafka_get_conf_file)")
-[[ -z "${KAFKA_EXTRA_FLAGS:-}" ]] || flags=("${flags[@]}" "${KAFKA_EXTRA_FLAGS[@]}")
-START_COMMAND=("$KAFKA_HOME/bin/kafka-server-start.sh" "${flags[@]}" "$@")
+cmd="$KAFKA_HOME/bin/kafka-server-start.sh"
+args=("$KAFKA_CONF_FILE")
+! is_empty_value "${KAFKA_EXTRA_FLAGS:-}" && args=("${args[@]}" "${KAFKA_EXTRA_FLAGS[@]}")
 
 info "** Starting Kafka **"
 if am_i_root; then
-    exec_as_user "$KAFKA_DAEMON_USER" "${START_COMMAND[@]}"
+    exec_as_user "$KAFKA_DAEMON_USER" "$cmd" "${args[@]}" "$@"
 else
-    exec "${START_COMMAND[@]}"
+    exec "$cmd" "${args[@]}" "$@"
 fi
diff --git a/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/setup.sh b/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/setup.sh
index 2721ad7f6e934..a1dcc1d2d1620 100755
--- a/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/setup.sh
+++ b/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/kafka/setup.sh
@@ -19,39 +19,42 @@ set -o pipefail
 
 # Map Kafka environment variables
 kafka_create_alias_environment_variables
-if [[ -z "${KAFKA_CFG_BROKER_ID:-}" ]]; then
-    if [[ -n "${BROKER_ID_COMMAND:-}" ]]; then
-        KAFKA_CFG_BROKER_ID="$(eval "${BROKER_ID_COMMAND:-}")"
-        export KAFKA_CFG_BROKER_ID
-    elif ! is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
-        # By default auto allocate broker ID unless KRaft is enabled
-        export KAFKA_CFG_BROKER_ID=-1
-    fi
-fi
 
-# Set the default tuststore locations
+# Dinamically set node.id/broker.id/controller.quorum.voters if the _COMMAND environment variable is set
+kafka_dynamic_environment_variables
+
+# Set the default tuststore locations before validation
 kafka_configure_default_truststore_locations
-# Ensure Kafka environment variables are valid
-kafka_validate
 # Ensure Kafka user and group exist when running as 'root'
-if am_i_root; then
-    ensure_user_exists "$KAFKA_DAEMON_USER" --group "$KAFKA_DAEMON_GROUP"
-    KAFKA_OWNERSHIP_USER="$KAFKA_DAEMON_USER"
-else
-    KAFKA_OWNERSHIP_USER=""
-fi
+am_i_root && ensure_user_exists "$KAFKA_DAEMON_USER" --group "$KAFKA_DAEMON_GROUP"
 # Ensure directories used by Kafka exist and have proper ownership and permissions
 for dir in "$KAFKA_LOG_DIR" "$KAFKA_CONF_DIR" "$KAFKA_MOUNTED_CONF_DIR" "$KAFKA_VOLUME_DIR" "$KAFKA_DATA_DIR"; do
-    ensure_dir_exists "$dir" "$KAFKA_OWNERSHIP_USER"
+    if am_i_root; then
+        ensure_dir_exists "$dir" "$KAFKA_DAEMON_USER" "$KAFKA_DAEMON_GROUP"
+    else
+        ensure_dir_exists "$dir"
+    fi
 done
 
-# shellcheck disable=SC2148
+# Kafka validation, skipped if server.properties was mounted at either $KAFKA_MOUNTED_CONF_DIR or $KAFKA_CONF_DIR
+[[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/server.properties" && ! -f "$KAFKA_CONF_FILE" ]] && kafka_validate
+# Kafka initialization, skipped if server.properties was mounted at $KAFKA_CONF_DIR
+[[ ! -f "$KAFKA_CONF_FILE" ]] && kafka_initialize
 
-# Ensure Kafka is initialized
-kafka_initialize
-# If KRaft is enabled initialize
-if is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
-    kraft_initialize
+# Initialise KRaft metadata storage if process.roles configured
+if grep -q "^process.roles=" "$KAFKA_CONF_FILE" && ! is_boolean_yes "$KAFKA_SKIP_KRAFT_STORAGE_INIT" ; then
+    kafka_kraft_storage_initialize
+fi
+# Configure Zookeeper SCRAM users
+if is_boolean_yes "${KAFKA_ZOOKEEPER_BOOTSTRAP_SCRAM_USERS:-}"; then
+    kafka_zookeeper_create_sasl_scram_users
+fi
+# KRaft controllers may get stuck starting when the controller quorum voters are changed.
+# Workaround: Remove quorum-state file when scaling up/down controllers (Waiting proposal KIP-853)
+# https://cwiki.apache.org/confluence/display/KAFKA/KIP-853%3A+KRaft+Voter+Changes
+if [[ -f "${KAFKA_DATA_DIR}/__cluster_metadata-0/quorum-state" ]] && grep -q "^controller.quorum.voters=" "$KAFKA_CONF_FILE" && kafka_kraft_quorum_voters_changed; then
+    warn "Detected inconsitences between controller.quorum.voters and quorum-state, removing it..."
+    rm -f "${KAFKA_DATA_DIR}/__cluster_metadata-0/quorum-state"
 fi
 # Ensure custom initialization scripts are executed
 kafka_custom_init_scripts
diff --git a/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh b/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh
index 530f80bea419a..c38d07d1d41ad 100644
--- a/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh
+++ b/bitnami/kafka/3.2/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh
@@ -54,11 +54,110 @@ kafka_common_conf_set() {
     fi
 }
 
+########################
+# Returns true if at least one listener is configured using SSL
+# Globals:
+#   KAFKA_CFG_LISTENERS
+#   KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP
+# Arguments:
+#   None
+# Returns:
+#   true/false
+#########################
+kafka_has_ssl_listener(){
+    if ! is_empty_value "${KAFKA_CFG_LISTENERS:-}"; then
+        if is_empty_value "${KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP:-}"; then
+            if [[ "$KAFKA_CFG_LISTENERS" =~ SSL: || "$KAFKA_CFG_LISTENERS" =~ SASL_SSL: ]]; then
+                return
+            fi
+        else
+            read -r -a protocol_maps <<<"$(tr ',' ' ' <<<"$KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP")"
+            for protocol_map in "${protocol_maps[@]}"; do
+                read -r -a map <<<"$(tr ':' ' ' <<<"$protocol_map")"
+                # Obtain the listener and protocol from protocol map string, e.g. CONTROLLER:PLAINTEXT
+                listener="${map[0]}"
+                protocol="${map[1]}"
+                if [[ "$protocol" = "SSL" || "$protocol" = "SASL_SSL" ]]; then
+                    if [[ "$KAFKA_CFG_LISTENERS" =~ $listener ]]; then
+                        return
+                    fi
+                fi
+            done
+        fi
+    fi
+    return 1
+}
+
+########################
+# Returns true if at least one listener is configured using SASL
+# Globals:
+#   KAFKA_CFG_LISTENERS
+#   KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP
+# Arguments:
+#   None
+# Returns:
+#   true/false
+#########################
+kafka_has_sasl_listener(){
+    if ! is_empty_value "${KAFKA_CFG_LISTENERS:-}"; then
+        if is_empty_value "${KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP:-}"; then
+            if [[ "$KAFKA_CFG_LISTENERS" =~ SASL_PLAINTEXT: ]] || [[ "$KAFKA_CFG_LISTENERS" =~ SASL_SSL: ]]; then
+                return
+            fi
+        else
+            read -r -a protocol_maps <<<"$(tr ',' ' ' <<<"$KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP")"
+            for protocol_map in "${protocol_maps[@]}"; do
+                read -r -a map <<<"$(tr ':' ' ' <<<"$protocol_map")"
+                # Obtain the listener and protocol from protocol map string, e.g. CONTROLLER:PLAINTEXT
+                listener="${map[0]}"
+                protocol="${map[1]}"
+                if [[ "$protocol" = "SASL_PLAINTEXT" || "$protocol" = "SASL_SSL" ]]; then
+                    if [[ "$KAFKA_CFG_LISTENERS" =~ $listener ]]; then
+                        return
+                    fi
+                fi
+            done
+        fi
+    fi
+    return 1
+}
+
+########################
+# Returns true if at least one listener is configured using plaintext
+# Globals:
+#   KAFKA_CFG_LISTENERS
+#   KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP
+# Arguments:
+#   None
+# Returns:
+#   true/false
+#########################
+kafka_has_plaintext_listener(){
+    if ! is_empty_value "${KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP:-}"; then
+        read -r -a protocol_maps <<<"$(tr ',' ' ' <<<"$KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP")"
+        for protocol_map in "${protocol_maps[@]}"; do
+            read -r -a map <<<"$(tr ':' ' ' <<<"$protocol_map")"
+            # Obtain the listener and protocol from protocol map string, e.g. CONTROLLER:PLAINTEXT
+            listener="${map[0]}"
+            protocol="${map[1]}"
+            if [[ "$protocol" = "PLAINTEXT" ]]; then
+                if is_empty_value "${KAFKA_CFG_LISTENERS:-}" || [[ "$KAFKA_CFG_LISTENERS" =~ $listener ]]; then
+                    return
+                fi
+            fi
+        done
+    else
+        if is_empty_value "${KAFKA_CFG_LISTENERS:-}" || [[ "$KAFKA_CFG_LISTENERS" =~ PLAINTEXT: ]]; then
+            return
+        fi
+    fi
+    return 1
+}
+
 ########################
 # Backwards compatibility measure to configure the TLS truststore locations
 # Globals:
 #   KAFKA_CONF_FILE
-#   KAFKA_ZK_CONF_FILE
 # Arguments:
 #   None
 # Returns:
@@ -73,7 +172,7 @@ kafka_configure_default_truststore_locations() {
     # use this logic that sets the KAFKA_TLS_*_FILE variables to the previously assumed locations in case it is not set
 
     # Kafka truststore
-    if { [[ "${KAFKA_CFG_LISTENERS:-}" =~ SSL ]] || [[ "${KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP:-}" =~ SSL ]]; } && is_empty_value "$KAFKA_TLS_TRUSTSTORE_FILE"; then
+    if kafka_has_ssl_listener && is_empty_value "${KAFKA_TLS_TRUSTSTORE_FILE:-}"; then
         local kafka_truststore_filename="kafka.truststore.jks"
         [[ "$KAFKA_TLS_TYPE" = "PEM" ]] && kafka_truststore_filename="kafka.truststore.pem"
         if [[ -f "${KAFKA_CERTS_DIR}/${kafka_truststore_filename}" ]]; then
@@ -85,7 +184,7 @@ kafka_configure_default_truststore_locations() {
         fi
     fi
     # Zookeeper truststore
-    if [[ "${KAFKA_ZOOKEEPER_PROTOCOL:-}" =~ SSL ]] && is_empty_value "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE"; then
+    if [[ "${KAFKA_ZOOKEEPER_PROTOCOL:-}" =~ SSL ]] && is_empty_value "${KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE:-}"; then
         local zk_truststore_filename="zookeeper.truststore.jks"
         [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] && zk_truststore_filename="zookeeper.truststore.pem"
         if [[ -f "${KAFKA_CERTS_DIR}/${zk_truststore_filename}" ]]; then
@@ -102,7 +201,6 @@ kafka_configure_default_truststore_locations() {
 # Set a configuration setting value to server.properties
 # Globals:
 #   KAFKA_CONF_FILE
-#   KAFKA_ZK_CONF_FILE
 # Arguments:
 #   $1 - key
 #   $2 - values (array)
@@ -110,7 +208,7 @@ kafka_configure_default_truststore_locations() {
 #   None
 #########################
 kafka_server_conf_set() {
-    kafka_common_conf_set "$(kafka_get_conf_file)" "$@"
+    kafka_common_conf_set "$KAFKA_CONF_FILE" "$@"
 }
 
 ########################
@@ -159,6 +257,9 @@ kafka_create_alias_environment_variables() {
     suffixes=(
         "ADVERTISED_LISTENERS"
         "BROKER_ID"
+        "NODE_ID"
+        "CONTROLLER_QUORUM_VOTERS"
+        "PROCESS_ROLES"
         "DEFAULT_REPLICATION_FACTOR"
         "DELETE_TOPIC_ENABLE"
         "INTER_BROKER_LISTENER_NAME"
@@ -194,6 +295,7 @@ kafka_create_alias_environment_variables() {
     kafka_declare_alias_env "KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE" "KAFKA_AUTO_CREATE_TOPICS_ENABLE"
     kafka_declare_alias_env "KAFKA_CLIENT_USERS" "KAFKA_BROKER_USER"
     kafka_declare_alias_env "KAFKA_CLIENT_PASSWORDS" "KAFKA_BROKER_PASSWORD"
+    kafka_declare_alias_env "KAFKA_CLIENT_LISTENER_NAME" "KAFKA_CLIENT_LISTENER"
     for s in "${suffixes[@]}"; do
         kafka_declare_alias_env "KAFKA_CFG_${s}" "KAFKA_${s}"
     done
@@ -211,122 +313,176 @@ kafka_create_alias_environment_variables() {
 kafka_validate() {
     debug "Validating settings in KAFKA_* env vars..."
     local error_code=0
-    local internal_port
-    local client_port
 
     # Auxiliary functions
     print_validation_error() {
         error "$1"
         error_code=1
     }
-    check_allowed_listener_port() {
-        local -r total="$#"
-        for i in $(seq 1 "$((total - 1))"); do
-            for j in $(seq "$((i + 1))" "$total"); do
-                if (("${!i}" == "${!j}")); then
-                    print_validation_error "There are listeners bound to the same port"
-                fi
-            done
-        done
-    }
-    check_conflicting_listener_ports() {
-        local validate_port_args=()
-        ! am_i_root && validate_port_args+=("-unprivileged")
-        if ! err=$(validate_port "${validate_port_args[@]}" "$1"); then
-            print_validation_error "An invalid port was specified in the environment variable KAFKA_CFG_LISTENERS: $err"
-        fi
-    }
     check_multi_value() {
         if [[ " ${2} " != *" ${!1} "* ]]; then
             print_validation_error "The allowed values for ${1} are: ${2}"
         fi
     }
-
-    if is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
-        if [[ -n "${KAFKA_CFG_NODE_ID:-}" ]] || [[ -n "${KAFKA_CFG_CONTROLLER_QUORUM_VOTERS:-}" ]]; then
-            if [[ -z "${KAFKA_CFG_NODE_ID:-}" ]]; then
-                print_validation_error "KRaft requires KAFKA_CFG_NODE_ID to be set for the quorum controller"
-            fi
-            if [[ -z "$KAFKA_CFG_CONTROLLER_QUORUM_VOTERS" ]]; then
-                print_validation_error "KRaft requires KAFKA_CFG_CONTROLLER_QUORUM_VOTERS to be set"
+    # If process.roles configured, check its values are valid and perform additional checks for each
+    check_kraft_process_roles() {
+        read -r -a roles_list <<<"$(tr ',;' ' ' <<<"$KAFKA_CFG_PROCESS_ROLES")"
+        for role in "${roles_list[@]}"; do
+            case "$role" in
+            broker) ;;
+            controller)
+                if is_empty_value "${KAFKA_CFG_CONTROLLER_LISTENER_NAMES:-}"; then
+                    print_validation_error "Role 'controller' enabled but environment variable KAFKA_CFG_CONTROLLER_LISTENER_NAMES was not provided."
+                fi
+                if is_empty_value "${KAFKA_CFG_LISTENERS:-}" || [[ ! "$KAFKA_CFG_LISTENERS" =~ ${KAFKA_CFG_CONTROLLER_LISTENER_NAMES} ]]; then
+                    print_validation_error "Role 'controller' enabled but listener ${KAFKA_CFG_CONTROLLER_LISTENER_NAMES} not found in KAFKA_CFG_LISTENERS."
+                fi
+                ;;
+            *)
+                print_validation_error "Invalid KRaft process role '$role'. Supported roles are 'broker,controller'"
+                ;;
+            esac
+        done
+    }
+    # Check all listeners are using a unique and valid port
+    check_listener_ports(){
+        check_allowed_port() {
+            local port="${1:?missing port variable}"
+            local -a validate_port_args=()
+            ! am_i_root && validate_port_args+=("-unprivileged")
+            validate_port_args+=("$port")
+            if ! err=$(validate_port "${validate_port_args[@]}"); then
+                print_validation_error "An invalid port ${port} was specified in the environment variable KAFKA_CFG_LISTENERS: ${err}."
             fi
+        }
 
-            old_IFS=$IFS
-            IFS=','
-            read -r -a voters <<< "$KAFKA_CFG_CONTROLLER_QUORUM_VOTERS"
-            IFS=${old_IFS}
-            node_id_matched=false
-            for voter in "${voters[@]}"; do
-                if [[ "$voter" == *"$KAFKA_CFG_NODE_ID"* ]]; then
-                    node_id_matched=true
-                    break
+        read -r -a listeners <<<"$(tr ',' ' ' <<<"${KAFKA_CFG_LISTENERS:-}")"
+        local -a ports=()
+        for listener in "${listeners[@]}"; do
+            read -r -a arr <<<"$(tr ':' ' ' <<<"$listener")"
+            # Obtain the port from listener string, e.g. PLAINTEXT://:9092
+            port="${arr[2]}"
+            check_allowed_port "$port"
+            ports+=("$port")
+        done
+        # Check each listener is using an unique port
+        local -a unique_ports=()
+        read -r -a unique_ports <<< "$(echo "${ports[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
+        if [[ "${#ports[@]}" != "${#unique_ports[@]}" ]]; then
+            print_validation_error "There are listeners bound to the same port"
+        fi
+    }
+    check_listener_protocols(){
+        local -r allowed_protocols=("PLAINTEXT" "SASL_PLAINTEXT" "SASL_SSL" "SSL")
+        read -r -a protocol_maps <<<"$(tr ',' ' ' <<<"$KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP")"
+        for protocol_map in "${protocol_maps[@]}"; do
+            read -r -a map <<<"$(tr ':' ' ' <<<"$protocol_map")"
+            # Obtain the listener and protocol from protocol map string, e.g. CONTROLLER:PLAINTEXT
+            listener="${map[0]}"
+            protocol="${map[1]}"
+            # Check protocol in allowed list
+            if [[ ! "${allowed_protocols[*]}" =~ $protocol ]]; then
+                print_validation_error "Authentication protocol ${protocol} is not supported!"
+            fi
+            # If inter-broker listener configured with SASL, ensure KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL is set
+            if [[ "$listener" = "${KAFKA_CFG_INTER_BROKER_LISTENER_NAME:-INTERNAL}" ]]; then
+                if [[ "$protocol" = "SASL_PLAINTEXT" ]] || [[ "$protocol" = "SASL_SSL" ]]; then
+                    if is_empty_value "${KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL:-}"; then
+                        print_validation_error "When using SASL for inter broker comunication the mechanism should be provided using KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL"
+                    fi
+                    if is_empty_value "${KAFKA_INTER_BROKER_USER:-}" || is_empty_value "${KAFKA_INTER_BROKER_PASSWORD:-}"; then
+                        print_validation_error "In order to configure SASL authentication for Kafka inter-broker communications, you must provide the SASL credentials. Set the environment variables KAFKA_INTER_BROKER_USER and KAFKA_INTER_BROKER_PASSWORD to configure the credentials for SASL authentication with between brokers."
+                    fi
+                fi
+            # If controller listener configured with SASL, ensure KAFKA_CFG_SASL_MECHANISM_CONTROLLER_PROTOCOL is set
+            elif [[ "${KAFKA_CFG_CONTROLLER_LISTENER_NAMES:-CONTROLLER}" =~ $listener ]]; then
+                if [[ "$protocol" = "SASL_PLAINTEXT" ]] || [[ "$protocol" = "SASL_SSL" ]]; then
+                    if is_empty_value "${KAFKA_CFG_SASL_MECHANISM_CONTROLLER_PROTOCOL:-}"; then
+                        print_validation_error "When using SASL for controller comunication the mechanism should be provided at KAFKA_CFG_SASL_MECHANISM_CONTROLLER_PROTOCOL"
+                    fi
+                    if is_empty_value "${KAFKA_CONTROLLER_USER:-}" || is_empty_value "${KAFKA_CONTROLLER_PASSWORD:-}"; then
+                        print_validation_error "In order to configure SASL authentication for Kafka control plane communications, you must provide the SASL credentials. Set the environment variables KAFKA_CONTROLLER_USER and KAFKA_CONTROLLER_PASSWORD to configure the credentials for SASL authentication with between controllers."
+                    fi
+                fi
+            else
+                if [[ "$protocol" = "SASL_PLAINTEXT" ]] || [[ "$protocol" = "SASL_SSL" ]]; then
+                    if is_empty_value "${KAFKA_CLIENT_USERS:-}" || is_empty_value "${KAFKA_CLIENT_PASSWORDS:-}"; then
+                        print_validation_error "In order to configure SASL authentication for Kafka, you must provide the SASL credentials. Set the environment variables KAFKA_CLIENT_USERS and KAFKA_CLIENT_PASSWORDS to configure the credentials for SASL authentication with clients."
+                    fi
                 fi
-            done
 
-            if [[ "$node_id_matched" == false ]]; then
-                warn "KAFKA_CFG_NODE_ID must match what is set in KAFKA_CFG_CONTROLLER_QUORUM_VOTERS"
             fi
-        fi
+        done
+    }
 
-        if [[ -n "${KAFKA_CFG_PROCESS_ROLES:-}" ]]; then
-            old_IFS=$IFS
-            IFS=','
-            read -r -a roles <<< "$KAFKA_CFG_PROCESS_ROLES"
-            IFS=${old_IFS}
-            controller_exists=false
-            for val in "${roles[@]}";
-            do
-            if [[ "$val" == "controller" ]]; then
-                controller_exists=true
-                break
-            fi
-            done
-            if [[ "$controller_exists" == false ]]; then
-                warn "KAFKA_CFG_PROCESS_ROLES must include 'controller' for KRaft"
-            fi
+    if is_empty_value "${KAFKA_CFG_PROCESS_ROLES:-}" && is_empty_value "${KAFKA_CFG_ZOOKEEPER_CONNECT:-}"; then
+        print_validation_error "Kafka haven't been configured to work in either Raft or Zookeper mode. Please make sure at least one of the modes is configured."
+    fi
+    # Check KRaft mode
+    if ! is_empty_value "${KAFKA_CFG_PROCESS_ROLES:-}"; then
+        # Raft
+        if [[ "$(kafka_get_version)" =~ ^3\.2\. ]]; then
+            warn "KRaft mode is not production-ready in Kafka 3.2, for production environments, we recommend upgrading "
         fi
-        if [[ -n "${KAFKA_CFG_LISTENERS:-}" ]]; then
-            old_IFS=$IFS
-            IFS=','
-            read -r -a listener <<< "$KAFKA_CFG_LISTENERS"
-            IFS=${old_IFS}
-            controller_exists=false
-            for val in "${listener[@]}";
-            do
-            if [[ $val == *"CONTROLLER"* ]]; then
-                controller_exists=true
-                break
+        # Only allow Zookeeper configuration if migration mode is enabled
+        if ! is_empty_value "${KAFKA_CFG_ZOOKEEPER_CONNECT:-}" &&
+            { is_empty_value "${KAFKA_CFG_ZOOKEEPER_METADATA_MIGRATION_ENABLE:-}" || ! is_boolean_yes "$KAFKA_CFG_ZOOKEEPER_METADATA_MIGRATION_ENABLE"; }; then
+            print_validation_error "Both KRaft mode and Zookeeper modes are configured, but KAFKA_CFG_ZOOKEEPER_METADATA_MIGRATION_ENABLE is not enabled"
+        fi
+        if is_empty_value "${KAFKA_CFG_NODE_ID:-}"; then
+            print_validation_error "KRaft mode requires an unique node.id, please set the environment variable KAFKA_CFG_NODE_ID"
+        fi
+        if is_empty_value "${KAFKA_CFG_CONTROLLER_QUORUM_VOTERS:-}"; then
+            print_validation_error "KRaft mode requires KAFKA_CFG_CONTROLLER_QUORUM_VOTERS to be set"
+        fi
+        check_kraft_process_roles
+    fi
+    # Check Zookeeper mode
+    if ! is_empty_value "${KAFKA_CFG_ZOOKEEPER_CONNECT:-}"; then
+        # If SSL/SASL_SSL protocol configured, check certificates are provided
+        if [[ "$KAFKA_ZOOKEEPER_PROTOCOL" =~ SSL ]]; then
+            if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]]; then
+                # Fail if truststore is not provided
+                if [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
+                    print_validation_error "In order to configure the TLS encryption for Zookeeper with JKS certs you must mount your zookeeper.truststore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+                fi
+                # Warn if keystore is not provided, only required if Zookeper mTLS is enabled (ZOO_TLS_CLIENT_AUTH)
+                if [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.jks" ]] && [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.jks" ]]; then
+                    warn "In order to configure the mTLS for Zookeeper with JKS certs you must mount your zookeeper.keystore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+                fi
+            elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]]; then
+                # Fail if CA / validation cert is not provided
+                if [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
+                    print_validation_error "In order to configure the TLS encryption for Zookeeper with PEM certs you must mount your zookeeper.truststore.pem cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+                fi
+                # Warn if node key or cert are not provided, only required if Zookeper mTLS is enabled (ZOO_TLS_CLIENT_AUTH)
+                if { [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.key" ]]; } &&
+                    { [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.key" ]]; }; then
+                    warn "In order to configure the mTLS for Zookeeper with PEM certs you must mount your zookeeper.keystore.pem cert and zookeeper.keystore.key key to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+                fi
             fi
-            done
-            if [[ "$controller_exists" == false ]]; then
-                warn "KAFKA_CFG_LISTENERS must include a listener for CONTROLLER"
+        fi
+        # If SASL/SASL_SSL protocol configured, check certificates are provided
+        if [[ "$KAFKA_ZOOKEEPER_PROTOCOL" =~ SASL ]]; then
+            if is_empty_value "${KAFKA_ZOOKEEPER_USER:-}" || is_empty_value "${KAFKA_ZOOKEEPER_PASSWORD:-}"; then
+                print_validation_error "In order to configure SASL authentication for Kafka, you must provide the SASL credentials. Set the environment variables KAFKA_ZOOKEEPER_USER and KAFKA_ZOOKEEPER_PASSWORD, to configure the credentials for SASL authentication with Zookeeper."
             fi
         fi
+        # If using plaintext protocol, check it is explicitly allowed
+        if [[ "$KAFKA_ZOOKEEPER_PROTOCOL" = "PLAINTEXT" ]]; then
+            warn "The KAFKA_ZOOKEEPER_PROTOCOL environment variable does not configure SASL and/or SSL, this setting is not recommended for production environments."
+        fi
     fi
-
-    if [[ ${KAFKA_CFG_LISTENERS:-} =~ INTERNAL://:([0-9]*) ]]; then
-        internal_port="${BASH_REMATCH[1]}"
-        check_allowed_listener_port "$internal_port"
-    fi
-    if [[ ${KAFKA_CFG_LISTENERS:-} =~ CLIENT://:([0-9]*) ]]; then
-        client_port="${BASH_REMATCH[1]}"
-        check_allowed_listener_port "$client_port"
-    fi
-    [[ -n ${internal_port:-} && -n ${client_port:-} ]] && check_conflicting_listener_ports "$internal_port" "$client_port"
-    if [[ -n "${KAFKA_PORT_NUMBER:-}" ]] || [[ -n "${KAFKA_CFG_PORT:-}" ]]; then
-        warn "The environment variables KAFKA_PORT_NUMBER and KAFKA_CFG_PORT are deprecated, you can specify the port number to use for each listener using the KAFKA_CFG_LISTENERS environment variable instead."
-    fi
-
-    read -r -a users <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_USERS}")"
-    read -r -a passwords <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_PASSWORDS}")"
-    if [[ "${#users[@]}" -ne "${#passwords[@]}" ]]; then
-        print_validation_error "Specify the same number of passwords on KAFKA_CLIENT_PASSWORDS as the number of users on KAFKA_CLIENT_USERS!"
-    fi
-
-    if is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
-        warn "You set the environment variable ALLOW_PLAINTEXT_LISTENER=$ALLOW_PLAINTEXT_LISTENER. For safety reasons, do not use this flag in a production environment."
+    # Check listener ports are unique and allowed
+    check_listener_ports
+    # Check listeners are mapped to a valid security protocol
+    check_listener_protocols
+    # Warn users if plaintext listeners are configured
+    if kafka_has_plaintext_listener; then
+        warn "Kafka has been configured with a PLAINTEXT listener, this setting is not recommended for production environments."
     fi
-    if [[ "${KAFKA_CFG_LISTENERS:-}" =~ SSL ]] || [[ "${KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP:-}" =~ SSL ]]; then
+    # If SSL/SASL_SSL listeners configured, check certificates are provided
+    if kafka_has_ssl_listener; then
         if [[ "$KAFKA_TLS_TYPE" = "JKS" ]] &&
             { [[ ! -f "${KAFKA_CERTS_DIR}/kafka.keystore.jks" ]] || [[ ! -f "$KAFKA_TLS_TRUSTSTORE_FILE" ]]; } &&
             { [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/kafka.keystore.jks" ]] || [[ ! -f "$KAFKA_TLS_TRUSTSTORE_FILE" ]]; }; then
@@ -336,174 +492,173 @@ kafka_validate() {
             { [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/kafka.keystore.pem" ]] || [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/kafka.keystore.key" ]] || [[ ! -f "$KAFKA_TLS_TRUSTSTORE_FILE" ]]; }; then
             print_validation_error "In order to configure the TLS encryption for Kafka with PEM certs you must mount your kafka.keystore.pem, kafka.keystore.key and kafka.truststore.pem certs to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
         fi
-    elif [[ "${KAFKA_CFG_LISTENERS:-}" =~ SASL ]] || [[ "${KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP:-}" =~ SASL ]]; then
-        if [[ -z "$KAFKA_CLIENT_PASSWORDS" && -z "$KAFKA_INTER_BROKER_PASSWORD" ]]; then
-            print_validation_error "In order to configure SASL authentication for Kafka, you must provide the SASL credentials. Set the environment variables KAFKA_CLIENT_USERS and KAFKA_CLIENT_PASSWORDS, to configure the credentials for SASL authentication with clients, or set the environment variables KAFKA_INTER_BROKER_USER and KAFKA_INTER_BROKER_PASSWORD, to configure the credentials for SASL authentication between brokers."
-        fi
-    elif ! is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
-        print_validation_error "The KAFKA_CFG_LISTENERS environment variable does not configure a secure listener. Set the environment variable ALLOW_PLAINTEXT_LISTENER=yes to allow the container to be started with a plaintext listener. This is only recommended for development."
-    fi
-    if ! is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
-        if [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SSL ]]; then
-            if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
-                [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
-                print_validation_error "In order to configure the TLS encryption for Zookeeper with JKS certs you must mount your zookeeper.truststore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-            elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
-                [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
-                print_validation_error "In order to configure the TLS encryption for Zookeeper with PEM certs you must mount your zookeeper.truststore.pem cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-            fi
-            if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
-                [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.jks" ]] && [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.jks" ]]; then
-                warn "In order to configure the mTLS for Zookeeper with JKS certs you must mount your zookeeper.keystore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-            elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
-                { [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.key" ]]; } &&
-                { [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.key" ]]; }; then
-                warn "In order to configure the mTLS for Zookeeper with PEM certs you must mount your zookeeper.keystore.pem cert and zookeeper.keystore.key key to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-            fi
-        elif [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SASL ]]; then
-            if [[ -z "$KAFKA_ZOOKEEPER_USER" ]] || [[ -z "$KAFKA_ZOOKEEPER_PASSWORD" ]]; then
-                print_validation_error "In order to configure SASL authentication for Kafka, you must provide the SASL credentials. Set the environment variables KAFKA_ZOOKEEPER_USER and KAFKA_ZOOKEEPER_PASSWORD, to configure the credentials for SASL authentication with Zookeeper."
-            fi
-        elif ! is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
-            print_validation_error "The KAFKA_ZOOKEEPER_PROTOCOL environment variable does not configure a secure protocol. Set the environment variable ALLOW_PLAINTEXT_LISTENER=yes to allow the container to be started with a plaintext listener. This is only recommended for development."
+    fi
+    # If SASL/SASL_SSL listeners configured, check passwords are provided
+    if kafka_has_sasl_listener; then
+        if is_empty_value "${KAFKA_CFG_SASL_ENABLED_MECHANISMS:-}"; then
+            print_validation_error "Specified SASL protocol but no SASL mechanisms provided in KAFKA_CFG_SASL_ENABLED_MECHANISMS"
         fi
     fi
+    # Check users and passwords lists are the same size
+    read -r -a users <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_USERS:-}")"
+    read -r -a passwords <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_PASSWORDS:-}")"
+    if [[ "${#users[@]}" -ne "${#passwords[@]}" ]]; then
+        print_validation_error "Specify the same number of passwords on KAFKA_CLIENT_PASSWORDS as the number of users on KAFKA_CLIENT_USERS!"
+    fi
     check_multi_value "KAFKA_TLS_TYPE" "JKS PEM"
     check_multi_value "KAFKA_ZOOKEEPER_TLS_TYPE" "JKS PEM"
+    check_multi_value "KAFKA_ZOOKEEPER_PROTOCOL" "PLAINTEXT SASL SSL SASL_SSL"
     check_multi_value "KAFKA_TLS_CLIENT_AUTH" "none requested required"
     [[ "$error_code" -eq 0 ]] || return "$error_code"
 }
+
 ########################
-# Generate JAAS authentication file
+# Get kafka version
 # Globals:
 #   KAFKA_*
 # Arguments:
-#   $1 - Authentication protocol to use for the internal listener
-#   $2 - Authentication protocol to use for the client listener
+#   None
+# Returns:
+#   version
+#########################
+kafka_get_version() {
+    local -a cmd=("kafka-topics.sh" "--version")
+    am_i_root && cmd=("run_as_user" "$KAFKA_DAEMON_USER" "${cmd[@]}")
+
+    read -r -a ver_split <<< "$("${cmd[@]}")"
+    echo "${ver_split[0]}"
+}
+
+#########################
+# Configure JAAS for a given listener and SASL mechanisms
+# Globals:
+#   KAFKA_*
+# Arguments:
+#   $1 - Name of the listener JAAS will be configured for
+#   $2 - Comma-separated list of SASL mechanisms to configure
+#   $3 - Comma-separated list of usernames
+#   $4 - Comma-separated list of passwords
 # Returns:
 #   None
 #########################
-kafka_generate_jaas_authentication_file() {
-    local -r internal_protocol="${1:-}"
-    local -r client_protocol="${2:-}"
-
-    if [[ ! -f "${KAFKA_CONF_DIR}/kafka_jaas.conf" ]]; then
-        info "Generating JAAS authentication file"
-
-        read -r -a users <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_USERS:-}")"
-        read -r -a passwords <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_PASSWORDS:-}")"
-
-        if [[ "${client_protocol:-}" =~ SASL ]]; then
-            if [[ "${KAFKA_CFG_SASL_ENABLED_MECHANISMS:-}" =~ PLAIN ]]; then
-                cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-KafkaClient {
-   org.apache.kafka.common.security.plain.PlainLoginModule required
-EOF
-            else
-                cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-KafkaClient {
-   org.apache.kafka.common.security.plain.ScramLoginModule required
-EOF
-            fi
-            cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-   username="${users[0]:-}"
-   password="${passwords[0]:-}";
-   };
-EOF
+kafka_configure_server_jaas() {
+    local listener="${1:?missing listener name}"
+    local role="${2:-}"
+
+    if [[ "$role" = "controller" ]]; then
+        local jaas_content=()
+        if [[ "$KAFKA_CFG_SASL_MECHANISM_CONTROLLER_PROTOCOL" = "PLAIN" ]]; then
+            jaas_content=(
+                "org.apache.kafka.common.security.plain.PlainLoginModule required"
+                "username=\"${KAFKA_CONTROLLER_USER}\""
+                "password=\"${KAFKA_CONTROLLER_PASSWORD}\""
+                "user_${KAFKA_CONTROLLER_USER}=\"${KAFKA_CONTROLLER_PASSWORD}\";"
+            )
+        elif [[ "$KAFKA_CFG_SASL_MECHANISM_CONTROLLER_PROTOCOL" =~ SCRAM ]]; then
+            jaas_content=(
+                "org.apache.kafka.common.security.scram.ScramLoginModule required"
+                "username=\"${KAFKA_CONTROLLER_USER}\""
+                "password=\"${KAFKA_CONTROLLER_PASSWORD}\";"
+            )
         fi
-        if [[ "${client_protocol:-}" =~ SASL ]] && [[ "${internal_protocol:-}" =~ SASL ]]; then
-            if [[ "${KAFKA_CFG_SASL_ENABLED_MECHANISMS:-}" =~ PLAIN ]] && [[ "${KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL:-}" =~ PLAIN ]]; then
-                cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-KafkaServer {
-   org.apache.kafka.common.security.plain.PlainLoginModule required
-   username="${KAFKA_INTER_BROKER_USER:-}"
-   password="${KAFKA_INTER_BROKER_PASSWORD:-}"
-   user_${KAFKA_INTER_BROKER_USER:-}="${KAFKA_INTER_BROKER_PASSWORD:-}"
-EOF
-                for ((i = 0; i < ${#users[@]}; i++)); do
-                    if [[ "$i" = "$(( ${#users[@]} - 1 ))" ]]; then
-                        cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-   user_${users[i]:-}="${passwords[i]:-}";
-EOF
-                    else
-                        cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-   user_${users[i]:-}="${passwords[i]:-}"
-EOF
-                    fi
-                done
-                cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-   org.apache.kafka.common.security.scram.ScramLoginModule required;
-   };
-EOF
-            else
-                cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-KafkaServer {
-   org.apache.kafka.common.security.scram.ScramLoginModule required
-   username="${KAFKA_INTER_BROKER_USER:-}"
-   password="${KAFKA_INTER_BROKER_PASSWORD:-}";
-   };
-EOF
-            fi
-        elif [[ "${client_protocol:-}" =~ SASL ]]; then
-            cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-KafkaServer {
-   org.apache.kafka.common.security.plain.PlainLoginModule required
-EOF
-            if [[ "${KAFKA_CFG_SASL_ENABLED_MECHANISMS:-}" =~ PLAIN ]]; then
+        listener_lower="$(echo "$listener" | tr '[:upper:]' '[:lower:]')"
+        sasl_mechanism_lower="$(echo "$KAFKA_CFG_SASL_MECHANISM_CONTROLLER_PROTOCOL" | tr '[:upper:]' '[:lower:]')"
+        kafka_server_conf_set "listener.name.${listener_lower}.${sasl_mechanism_lower}.sasl.jaas.config" "${jaas_content[*]}"
+    else
+        read -r -a sasl_mechanisms_arr <<<"$(tr ',' ' ' <<<"$KAFKA_CFG_SASL_ENABLED_MECHANISMS")"
+        read -r -a users <<<"$(tr ',;' ' ' <<<"$KAFKA_CLIENT_USERS")"
+        read -r -a passwords <<<"$(tr ',;' ' ' <<<"$KAFKA_CLIENT_PASSWORDS")"
+        # Configure JAAS for each SASL mechanism
+        # ref: https://docs.confluent.io/platform/current/kafka/authentication_sasl/index.html
+        for sasl_mechanism in "${sasl_mechanisms_arr[@]}"; do
+            local jaas_content=()
+            # For PLAIN mechanism, only the first username will be used
+            if [[ "$sasl_mechanism" = "PLAIN" ]]; then
+                jaas_content=("org.apache.kafka.common.security.plain.PlainLoginModule required")
+                if [[ "$role" = "inter-broker" ]]; then
+                    jaas_content+=(
+                        "username=\"${KAFKA_INTER_BROKER_USER}\""
+                        "password=\"${KAFKA_INTER_BROKER_PASSWORD}\""
+                    )
+                    users+=("$KAFKA_INTER_BROKER_USER")
+                    passwords+=("$KAFKA_INTER_BROKER_PASSWORD")
+                fi
                 for ((i = 0; i < ${#users[@]}; i++)); do
-                    if [[ "$i" = "$(( ${#users[@]} - 1 ))" ]]; then
-                        cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-   user_${users[i]:-}="${passwords[i]:-}";
-EOF
-                    else
-                        cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-   user_${users[i]:-}="${passwords[i]:-}"
-EOF
-                    fi
+                    jaas_content+=("user_${users[i]}=\"${passwords[i]}\"")
                 done
+                # Add semi-colon to the last element of the array
+                jaas_content[${#jaas_content[@]} - 1]="${jaas_content[${#jaas_content[@]} - 1]};"
+            elif [[ "$sasl_mechanism" =~ SCRAM ]]; then
+                if [[ "$role" = "inter-broker" ]]; then
+                    jaas_content=(
+                        "org.apache.kafka.common.security.scram.ScramLoginModule required"
+                        "username=\"${KAFKA_INTER_BROKER_USER}\""
+                        "password=\"${KAFKA_INTER_BROKER_PASSWORD}\";"
+                    )
+                else
+                    jaas_content=("org.apache.kafka.common.security.scram.ScramLoginModule required;")
+                fi
             fi
-            cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-   org.apache.kafka.common.security.scram.ScramLoginModule required;
-   };
-EOF
-        elif [[ "${internal_protocol:-}" =~ SASL ]]; then
-            if [[ "${KAFKA_CFG_SASL_ENABLED_MECHANISMS:-}" =~ PLAIN ]] && [[ "${KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL:-}" =~ PLAIN ]]; then
-                cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-KafkaServer {
-   org.apache.kafka.common.security.plain.PlainLoginModule required
-   username="${KAFKA_INTER_BROKER_USER:-}"
-   password="${KAFKA_INTER_BROKER_PASSWORD:-}"
-   user_${KAFKA_INTER_BROKER_USER:-}="${KAFKA_INTER_BROKER_PASSWORD:-}";
-   org.apache.kafka.common.security.scram.ScramLoginModule required;
-   };
-EOF
-            else
-                cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-KafkaServer {
-   org.apache.kafka.common.security.scram.ScramLoginModule required
-   username="${KAFKA_INTER_BROKER_USER:-}"
-   password="${KAFKA_INTER_BROKER_PASSWORD:-}";
-   };
-EOF
-            fi
-        fi
-        if [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SASL ]] && [[ -n "$KAFKA_ZOOKEEPER_USER" ]] && [[ -n "$KAFKA_ZOOKEEPER_PASSWORD" ]]; then
-            cat >>"${KAFKA_CONF_DIR}/kafka_jaas.conf" <<EOF
-Client {
-   org.apache.kafka.common.security.plain.PlainLoginModule required
-   username="${KAFKA_ZOOKEEPER_USER:-}"
-   password="${KAFKA_ZOOKEEPER_PASSWORD:-}";
-   };
-EOF
-        fi
+            listener_lower="$(echo "$listener" | tr '[:upper:]' '[:lower:]')"
+            sasl_mechanism_lower="$(echo "$sasl_mechanism" | tr '[:upper:]' '[:lower:]')"
+            kafka_server_conf_set "listener.name.${listener_lower}.${sasl_mechanism_lower}.sasl.jaas.config" "${jaas_content[*]}"
+        done
+    fi
+}
+
+########################
+#  Configure Zookeeper JAAS authentication
+# Globals:
+#   KAFKA_*
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+kafka_zookeeper_configure_jaas(){
+    local jaas_content=(
+        "org.apache.kafka.common.security.plain.PlainLoginModule required"
+        "username=\"${KAFKA_ZOOKEEPER_USER}\""
+        "password=\"${KAFKA_ZOOKEEPER_PASSWORD}\";"
+    )
+
+    kafka_server_conf_set "sasl.jaas.config" "${jaas_content[*]}"
+}
+
+########################
+# Generate JAAS authentication file for local producer/consumer to use
+# Globals:
+#   KAFKA_*
+# Arguments:
+#   $1 - Authentication protocol to use for the internal listener
+#   $2 - Authentication protocol to use for the client listener
+# Returns:
+#   None
+#########################
+kafka_configure_consumer_producer_jaas(){
+    local jaas_content=()
+    read -r -a users <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_USERS}")"
+    read -r -a passwords <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_PASSWORDS}")"
+
+    if [[ "${KAFKA_CFG_SASL_ENABLED_MECHANISMS}" =~ SCRAM ]]; then
+        jaas_content=("org.apache.kafka.common.security.scram.ScramLoginModule required")
+    elif [[ "${KAFKA_CFG_SASL_ENABLED_MECHANISMS}" =~ PLAIN ]]; then
+        jaas_content=("org.apache.kafka.common.security.plain.PlainLoginModule required")
     else
-        info "Custom JAAS authentication file detected. Skipping generation."
-        warn "The following environment variables will be ignored: KAFKA_CLIENT_USERS, KAFKA_CLIENT_PASSWORDS, KAFKA_INTER_BROKER_USER, KAFKA_INTER_BROKER_PASSWORD, KAFKA_ZOOKEEPER_USER and KAFKA_ZOOKEEPER_PASSWORD"
+        error "Couldn't configure a supported SASL mechanism for Kafka consumer/producer properties"
+        exit 1
     fi
+
+    jaas_content+=(
+        "username=\"${users[0]}\""
+        "password=\"${passwords[0]}\";"
+    )
+
+    kafka_producer_consumer_conf_set "sasl.jaas.config" "${jaas_content[*]}"
 }
 
 ########################
-# Create users in zookeper when using SASL_SCRAM
+# Create users in zookeper when using SASL/SCRAM mechanism
 # Globals:
 #   KAFKA_*
 # Arguments:
@@ -511,23 +666,33 @@ EOF
 # Returns:
 #   None
 #########################
-kafka_create_sasl_scram_zookeeper_users() {
-    export KAFKA_OPTS="-Djava.security.auth.login.config=${KAFKA_CONF_DIR}/kafka_jaas.conf"
+kafka_zookeeper_create_sasl_scram_users() {
     info "Creating users in Zookeeper"
     read -r -a users <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_USERS}")"
     read -r -a passwords <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_PASSWORDS}")"
-    if [[ "${KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL:-}" =~ SCRAM-SHA ]]; then
+    local zookeeper_connect
+    zookeeper_connect=$(grep "^zookeeper.connect=" "$KAFKA_CONF_FILE" | sed -E 's/^zookeeper\.connect=(\S+)$/\1/')
+    read -r -a zookeeper_hosts <<<"$(tr ',;' ' ' <<<"${zookeeper_connect}")"
+
+    if [[ "${#zookeeper_hosts[@]}" -eq 0 ]]; then
+        error "Couldn't obtain zookeeper.connect from $KAFKA_CONF_FILE"
+        exit 1
+    fi
+    # Wait for Zookeeper to be reachable
+    read -r -a aux <<<"$(tr ':' ' ' <<<"${zookeeper_hosts[0]}")"
+    local host="${aux[0]:?missing host}"
+    local port="${aux[1]:-2181}"
+    wait-for-port --host "$host" "$port"
+
+    # Add interbroker credentials
+    if grep -Eq "^sasl.mechanism.inter.broker.protocol=SCRAM" "$KAFKA_CONF_FILE"; then
         users+=("${KAFKA_INTER_BROKER_USER}")
         passwords+=("${KAFKA_INTER_BROKER_PASSWORD}")
     fi
     for ((i = 0; i < ${#users[@]}; i++)); do
         debug "Creating user ${users[i]} in zookeeper"
         # Ref: https://docs.confluent.io/current/kafka/authentication_sasl/authentication_sasl_scram.html#sasl-scram-overview
-        if [[ "${KAFKA_ZOOKEEPER_PROTOCOL:-}" =~ SSL ]]; then
-            ZOOKEEPER_SSL_CONFIG=$(zookeeper_get_tls_config)
-            export KAFKA_OPTS="$KAFKA_OPTS $ZOOKEEPER_SSL_CONFIG"
-        fi
-        debug_execute kafka-configs.sh --zookeeper "$KAFKA_CFG_ZOOKEEPER_CONNECT" --alter --add-config "SCRAM-SHA-256=[iterations=8192,password=${passwords[i]}],SCRAM-SHA-512=[password=${passwords[i]}]" --entity-type users --entity-name "${users[i]}"
+        debug_execute kafka-configs.sh --zookeeper "$zookeeper_connect" --alter --add-config "SCRAM-SHA-256=[iterations=8192,password=${passwords[i]}],SCRAM-SHA-512=[password=${passwords[i]}]" --entity-type users --entity-name "${users[i]}"
     done
 }
 
@@ -540,9 +705,7 @@ kafka_create_sasl_scram_zookeeper_users() {
 # Returns:
 #   None
 #########################
-SSL_CONFIGURED=false
 kafka_configure_ssl() {
-    [[ "$SSL_CONFIGURED" = true ]] && return 0
     # Configures both Kafka server and producers/consumers
     configure_both() {
         kafka_server_conf_set "${1:?missing key}" "${2:?missing value}"
@@ -551,7 +714,7 @@ kafka_configure_ssl() {
     configure_both ssl.keystore.type "${KAFKA_TLS_TYPE}"
     configure_both ssl.truststore.type "${KAFKA_TLS_TYPE}"
     local -r kafka_truststore_location="${KAFKA_CERTS_DIR}/$(basename "${KAFKA_TLS_TRUSTSTORE_FILE}")"
-    ! is_empty_value "$KAFKA_CERTIFICATE_PASSWORD" && configure_both ssl.key.password "$KAFKA_CERTIFICATE_PASSWORD"
+    ! is_empty_value "${KAFKA_CERTIFICATE_PASSWORD:-}" && configure_both ssl.key.password "$KAFKA_CERTIFICATE_PASSWORD"
     if [[ "$KAFKA_TLS_TYPE" = "PEM" ]]; then
         file_to_multiline_property() {
             awk 'NR > 1{print line"\\n\\"}{line=$0;}END{print $0" "}' <"${1:?missing file}"
@@ -559,7 +722,7 @@ kafka_configure_ssl() {
         remove_previous_cert_value() {
             local key="${1:?missing key}"
             files=(
-                "$(kafka_get_conf_file)"
+                "${KAFKA_CONF_FILE}"
                 "${KAFKA_CONF_DIR}/producer.properties"
                 "${KAFKA_CONF_DIR}/consumer.properties"
             )
@@ -581,117 +744,8 @@ kafka_configure_ssl() {
     elif [[ "$KAFKA_TLS_TYPE" = "JKS" ]]; then
         configure_both ssl.keystore.location "$KAFKA_CERTS_DIR"/kafka.keystore.jks
         configure_both ssl.truststore.location "$kafka_truststore_location"
-        ! is_empty_value "$KAFKA_CERTIFICATE_PASSWORD" && configure_both ssl.keystore.password "$KAFKA_CERTIFICATE_PASSWORD"
-        ! is_empty_value "$KAFKA_CERTIFICATE_PASSWORD" && configure_both ssl.truststore.password "$KAFKA_CERTIFICATE_PASSWORD"
-    fi
-    SSL_CONFIGURED=true # prevents configuring SSL more than once
-}
-
-########################
-# Configure Kafka for inter-broker communications
-# Globals:
-#   None
-# Arguments:
-#   $1 - Authentication protocol to use for the internal listener
-# Returns:
-#   None
-#########################
-kafka_configure_internal_communications() {
-    local -r protocol="${1:?missing environment variable protocol}"
-    local -r allowed_protocols=("PLAINTEXT" "SASL_PLAINTEXT" "SASL_SSL" "SSL")
-    info "Configuring Kafka for inter-broker communications with ${protocol} authentication."
-
-    if [[ "${allowed_protocols[*]}" =~ $protocol ]]; then
-        kafka_server_conf_set security.inter.broker.protocol "$protocol"
-        if [[ "$protocol" = "PLAINTEXT" ]]; then
-            warn "Inter-broker communications are configured as PLAINTEXT. This is not safe for production environments."
-        fi
-        if [[ "$protocol" = "SASL_PLAINTEXT" ]] || [[ "$protocol" = "SASL_SSL" ]]; then
-            # IMPORTANT: Do not confuse SASL/PLAIN with PLAINTEXT
-            # For more information, see: https://docs.confluent.io/current/kafka/authentication_sasl/authentication_sasl_plain.html#sasl-plain-overview)
-            if [[ -n "$KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL" ]]; then
-                kafka_server_conf_set sasl.mechanism.inter.broker.protocol "$KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL"
-            else
-                error "When using SASL for inter broker comunication the mechanism should be provided at KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL"
-                exit 1
-            fi
-        fi
-        if [[ "$protocol" = "SASL_SSL" ]] || [[ "$protocol" = "SSL" ]]; then
-            kafka_configure_ssl
-            # We need to enable 2 way authentication on SASL_SSL so brokers authenticate each other.
-            # It won't affect client communications unless the SSL protocol is for them.
-            kafka_server_conf_set ssl.client.auth "$KAFKA_TLS_CLIENT_AUTH"
-        fi
-    else
-        error "Authentication protocol ${protocol} is not supported!"
-        exit 1
-    fi
-}
-
-########################
-# Configure Kafka for client communications
-# Globals:
-#   None
-# Arguments:
-#   $1 - Authentication protocol to use for the client listener
-# Returns:
-#   None
-#########################
-kafka_configure_client_communications() {
-    local -r protocol="${1:?missing environment variable protocol}"
-    local -r allowed_protocols=("PLAINTEXT" "SASL_PLAINTEXT" "SASL_SSL" "SSL")
-    info "Configuring Kafka for client communications with ${protocol} authentication."
-
-    if [[ "${allowed_protocols[*]}" =~ ${protocol} ]]; then
-        kafka_server_conf_set security.inter.broker.protocol "$protocol"
-        if [[ "$protocol" = "PLAINTEXT" ]]; then
-            warn "Client communications are configured using PLAINTEXT listeners. For safety reasons, do not use this in a production environment."
-        fi
-        if [[ "$protocol" = "SASL_PLAINTEXT" ]] || [[ "$protocol" = "SASL_SSL" ]]; then
-            # The below lines would need to be updated to support other SASL implementations (i.e. GSSAPI)
-            # IMPORTANT: Do not confuse SASL/PLAIN with PLAINTEXT
-            # For more information, see: https://docs.confluent.io/current/kafka/authentication_sasl/authentication_sasl_plain.html#sasl-plain-overview)
-            kafka_server_conf_set sasl.mechanism.inter.broker.protocol "$KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL"
-        fi
-        if [[ "$protocol" = "SASL_SSL" ]] || [[ "$protocol" = "SSL" ]]; then
-            kafka_configure_ssl
-        fi
-        if [[ "$protocol" = "SSL" ]]; then
-            kafka_server_conf_set ssl.client.auth "$KAFKA_TLS_CLIENT_AUTH"
-        fi
-    else
-        error "Authentication protocol ${protocol} is not supported!"
-        exit 1
-    fi
-}
-
-########################
-# Configure Kafka for external-client communications
-# Globals:
-#   None
-# Arguments:
-#   $1 - Authentication protocol to use for the external-client listener
-# Returns:
-#   None
-#########################
-kafka_configure_external_client_communications() {
-    local -r protocol="${1:?missing environment variable protocol}"
-    local -r allowed_protocols=("PLAINTEXT" "SASL_PLAINTEXT" "SASL_SSL" "SSL")
-    info "Configuring Kafka for external client communications with ${protocol} authentication."
-
-    if [[ "${allowed_protocols[*]}" =~ ${protocol} ]]; then
-        if [[ "$protocol" = "PLAINTEXT" ]]; then
-            warn "External client communications are configured using PLAINTEXT listeners. For safety reasons, do not use this in a production environment."
-        fi
-        if [[ "$protocol" = "SASL_SSL" ]] || [[ "$protocol" = "SSL" ]]; then
-            kafka_configure_ssl
-        fi
-        if [[ "$protocol" = "SSL" ]]; then
-            kafka_server_conf_set ssl.client.auth "$KAFKA_TLS_CLIENT_AUTH"
-        fi
-    else
-        error "Authentication protocol ${protocol} is not supported!"
-        exit 1
+        ! is_empty_value "${KAFKA_CERTIFICATE_PASSWORD:-}" && configure_both ssl.keystore.password "$KAFKA_CERTIFICATE_PASSWORD"
+        ! is_empty_value "${KAFKA_CERTIFICATE_PASSWORD:-}" && configure_both ssl.truststore.password "$KAFKA_CERTIFICATE_PASSWORD"
     fi
 }
 
@@ -704,7 +758,7 @@ kafka_configure_external_client_communications() {
 # Returns:
 #   String
 #########################
-zookeeper_get_tls_config() {
+kafka_zookeeper_configure_tls() {
     # Note that ZooKeeper does not support a key password different from the keystore password,
     # so be sure to set the key password in the keystore to be identical to the keystore password;
     # otherwise the connection attempt to Zookeeper will fail.
@@ -720,13 +774,13 @@ zookeeper_get_tls_config() {
         keystore_location="${KAFKA_CERTS_DIR}/zookeeper.keystore.pem"
     fi
 
-    echo "-Dzookeeper.clientCnxnSocket=org.apache.zookeeper.ClientCnxnSocketNetty \
-          -Dzookeeper.client.secure=true \
-          -Dzookeeper.ssl.keyStore.location=${keystore_location} \
-          -Dzookeeper.ssl.keyStore.password=${KAFKA_ZOOKEEPER_TLS_KEYSTORE_PASSWORD} \
-          -Dzookeeper.ssl.trustStore.location=${kafka_zk_truststore_location} \
-          -Dzookeeper.ssl.trustStore.password=${KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_PASSWORD} \
-          -Dzookeeper.ssl.hostnameVerification=${KAFKA_ZOOKEEPER_TLS_VERIFY_HOSTNAME}"
+    kafka_server_conf_set "zookeeper.clientCnxnSocket" "org.apache.zookeeper.ClientCnxnSocketNetty"
+    kafka_server_conf_set "zookeeper.client.secure" "true"
+    ! is_empty_value "${keystore_location:-}" && kafka_server_conf_set "zookeeper.ssl.keyStore.location" "${keystore_location}"
+    ! is_empty_value "${KAFKA_ZOOKEEPER_TLS_KEYSTORE_PASSWORD:-}" && kafka_server_conf_set "zookeeper.ssl.keyStore.password" "${KAFKA_ZOOKEEPER_TLS_KEYSTORE_PASSWORD}"
+    ! is_empty_value "${kafka_zk_truststore_location:-}" && kafka_server_conf_set "zookeeper.ssl.trustStore.location" "${kafka_zk_truststore_location}"
+    ! is_empty_value "${KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_PASSWORD:-}" && kafka_server_conf_set "zookeeper.ssl.trustStore.password" "${KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_PASSWORD}"
+    ! is_empty_value "${KAFKA_ZOOKEEPER_TLS_VERIFY_HOSTNAME:-}" && kafka_server_conf_set "zookeeper.ssl.hostnameVerification" "${KAFKA_ZOOKEEPER_TLS_VERIFY_HOSTNAME}"
 }
 
 ########################
@@ -741,8 +795,8 @@ zookeeper_get_tls_config() {
 kafka_configure_from_environment_variables() {
     # List of special cases to apply to the variables
     local -r exception_regexps=(
-        "s/sasl.ssl/sasl_ssl/g"
-        "s/sasl.plaintext/sasl_plaintext/g"
+        "s/sasl\.ssl/sasl_ssl/g"
+        "s/sasl\.plaintext/sasl_plaintext/g"
     )
     # Map environment variables to config properties
     for var in "${!KAFKA_CFG_@}"; do
@@ -764,7 +818,7 @@ kafka_configure_from_environment_variables() {
 }
 
 ########################
-# Configure Kafka configuration files to set up message sizes
+# Initialize KRaft storage
 # Globals:
 #   KAFKA_*
 # Arguments:
@@ -772,17 +826,58 @@ kafka_configure_from_environment_variables() {
 # Returns:
 #   None
 #########################
-kafka_configure_producer_consumer_message_sizes() {
-    if [[ -n "$KAFKA_CFG_MAX_REQUEST_SIZE" ]]; then
-        kafka_common_conf_set "$KAFKA_CONF_DIR/producer.properties" max.request.size "$KAFKA_CFG_MAX_REQUEST_SIZE"
+kafka_kraft_storage_initialize() {
+    local args=("--config" "$KAFKA_CONF_FILE" "--ignore-formatted")
+    info "Initializing KRaft storage metadata"
+
+    # If cluster.id found in meta.properties, use it
+    if [[ -f "${KAFKA_DATA_DIR}/meta.properties" ]]; then
+        KAFKA_KRAFT_CLUSTER_ID=$(grep "^cluster.id=" "${KAFKA_DATA_DIR}/meta.properties" | sed -E 's/^cluster\.id=(\S+)$/\1/')
     fi
-    if [[ -n "$KAFKA_CFG_MAX_PARTITION_FETCH_BYTES" ]]; then
-        kafka_common_conf_set "$KAFKA_CONF_DIR/consumer.properties" max.partition.fetch.bytes "$KAFKA_CFG_MAX_PARTITION_FETCH_BYTES"
+
+    if is_empty_value "${KAFKA_KRAFT_CLUSTER_ID:-}"; then
+        warn "KAFKA_KRAFT_CLUSTER_ID not set - If using multiple nodes then you must use the same Cluster ID for each one"
+        KAFKA_KRAFT_CLUSTER_ID="$("${KAFKA_HOME}/bin/kafka-storage.sh" random-uuid)"
+        info "Generated Kafka cluster ID '${KAFKA_KRAFT_CLUSTER_ID}'"
     fi
+    args+=("--cluster-id" "$KAFKA_KRAFT_CLUSTER_ID")
+
+    # SCRAM users are configured during the cluster bootstrapping process and can later be manually updated using kafka-config.sh
+    if is_boolean_yes "${KAFKA_KRAFT_BOOTSTRAP_SCRAM_USERS:-}"; then
+        info "Adding KRaft SCRAM users at storage bootstrap"
+        read -r -a users <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_USERS}")"
+        read -r -a passwords <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_PASSWORDS}")"
+        # Configure SCRAM-SHA-256 if enabled
+        if grep -Eq "^sasl.enabled.mechanisms=.*SCRAM-SHA-256" "$KAFKA_CONF_FILE"; then
+            for ((i = 0; i < ${#users[@]}; i++)); do
+                args+=("--add-scram" "SCRAM-SHA-256=[name=${users[i]},password=${passwords[i]}]")
+            done
+        fi
+        # Configure SCRAM-SHA-512 if enabled
+        if grep -Eq "^sasl.enabled.mechanisms=.*SCRAM-SHA-512" "$KAFKA_CONF_FILE"; then
+            for ((i = 0; i < ${#users[@]}; i++)); do
+                args+=("--add-scram" "SCRAM-SHA-512=[name=${users[i]},password=${passwords[i]}]")
+            done
+        fi
+        # Add interbroker credentials
+        if grep -Eq "^sasl.mechanism.inter.broker.protocol=SCRAM-SHA-256" "$KAFKA_CONF_FILE"; then
+            args+=("--add-scram" "SCRAM-SHA-256=[name=${KAFKA_INTER_BROKER_USER},password=${KAFKA_INTER_BROKER_PASSWORD}]")
+        elif grep -Eq "^sasl.mechanism.inter.broker.protocol=SCRAM-SHA-512" "$KAFKA_CONF_FILE"; then
+            args+=("--add-scram" "SCRAM-SHA-512=[name=${KAFKA_INTER_BROKER_USER},password=${KAFKA_INTER_BROKER_PASSWORD}]")
+        fi
+        # Add controller credentials
+        if grep -Eq "^sasl.mechanism.controller.protocol=SCRAM-SHA-256" "$KAFKA_CONF_FILE"; then
+            args+=("--add-scram" "SCRAM-SHA-256=[name=${KAFKA_CONTROLLER_USER},password=${KAFKA_CONTROLLER_PASSWORD}]")
+        elif grep -Eq "^sasl.mechanism.controller.protocol=SCRAM-SHA-512" "$KAFKA_CONF_FILE"; then
+            args+=("--add-scram" "SCRAM-SHA-512=[name=${KAFKA_CONTROLLER_USER},password=${KAFKA_CONTROLLER_PASSWORD}]")
+        fi
+    fi
+    info "Formatting storage directories to add metadata..."
+    "${KAFKA_HOME}/bin/kafka-storage.sh" format "${args[@]}"
 }
 
 ########################
-# Initialize KRaft
+# Detects inconsitences between the configuration at KAFKA_CONF_FILE and cluster-state file
 # Globals:
 #   KAFKA_*
 # Arguments:
@@ -790,17 +885,21 @@ kafka_configure_producer_consumer_message_sizes() {
 # Returns:
 #   None
 #########################
-kraft_initialize() {
-    info "Initializing KRaft..."
+kafka_kraft_quorum_voters_changed(){
+    read -r -a quorum_voters_conf_ids <<<"$(grep "^controller.quorum.voters=" "$KAFKA_CONF_FILE" | sed "s/^controller.quorum.voters=//" | tr "," " " | sed -E "s/\@\S+//g")"
+    read -r -a quorum_voters_state_ids <<< "$(grep -Eo "\{\"voterId\":[0-9]+\}" "${KAFKA_DATA_DIR}/__cluster_metadata-0/quorum-state" | grep -Eo "[0-9]+" | tr "\n" " ")"
 
-    if [[ -z "$KAFKA_KRAFT_CLUSTER_ID" ]]; then
-        warn "KAFKA_KRAFT_CLUSTER_ID not set - If using multiple nodes then you must use the same Cluster ID for each one"
-        KAFKA_KRAFT_CLUSTER_ID="$("${KAFKA_HOME}/bin/kafka-storage.sh" random-uuid)"
-        info "Generated Kafka cluster ID '${KAFKA_KRAFT_CLUSTER_ID}'"
+    if [[ "${#quorum_voters_conf_ids[@]}" != "${#quorum_voters_state_ids[@]}" ]]; then
+        true
+    else
+        read -r -a sorted_state <<< "$(echo "${quorum_voters_conf_ids[@]}" | tr ' ' '\n' | sort | tr '\n' ' ')"
+        read -r -a sorted_conf <<< "$(echo "${quorum_voters_state_ids[@]}" | tr ' ' '\n' | sort | tr '\n' ' ')"
+        if [[ "${sorted_state[*]}" = "${sorted_conf[*]}" ]]; then
+            false
+        else
+            true
+        fi
     fi
-
-    info "Formatting storage directories to add metadata..."
-    debug_execute "$KAFKA_HOME/bin/kafka-storage.sh" format --config "$(kafka_get_conf_file)" --cluster-id "$KAFKA_KRAFT_CLUSTER_ID" --ignore-formatted
 }
 
 ########################
@@ -814,11 +913,6 @@ kraft_initialize() {
 #########################
 kafka_initialize() {
     info "Initializing Kafka..."
-    # DEPRECATED. Copy files in old conf directory to maintain compatibility with Helm chart.
-    if ! is_dir_empty "$KAFKA_BASE_DIR"/conf; then
-        warn "Detected files mounted to $KAFKA_BASE_DIR/conf. This is deprecated and files should be mounted to $KAFKA_MOUNTED_CONF_DIR."
-        cp -Lr "$KAFKA_BASE_DIR"/conf/* "$KAFKA_CONF_DIR"
-    fi
     # Check for mounted configuration files
     if ! is_dir_empty "$KAFKA_MOUNTED_CONF_DIR"; then
         cp -Lr "$KAFKA_MOUNTED_CONF_DIR"/* "$KAFKA_CONF_DIR"
@@ -832,49 +926,167 @@ kafka_initialize() {
         fi
     done
 
-    # DEPRECATED. Check for server.properties file in old conf directory to maintain compatibility with Helm chart.
-    if [[ ! -f "$KAFKA_BASE_DIR"/conf/server.properties ]] && [[ ! -f "$KAFKA_MOUNTED_CONF_DIR"/server.properties ]]; then
+    if [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/server.properties" ]]; then
         info "No injected configuration files found, creating default config files"
+        # Restore original server.properties but remove Zookeeper/KRaft specific settings for compatibility with both architectures
+        cp "${KAFKA_CONF_DIR}/server.properties.original" "$KAFKA_CONF_FILE"
+        kafka_server_unify_conf
+        # Configure Kafka settings
         kafka_server_conf_set log.dirs "$KAFKA_DATA_DIR"
         kafka_configure_from_environment_variables
-        # When setting up a Kafka cluster with N brokers, we have several listeners:
-        # - INTERNAL: used for inter-broker communications
-        # - CLIENT: used for communications with consumers/producers within the same network
-        # - (optional) EXTERNAL: used for communications with consumers/producers on different networks
-        local internal_protocol
-        local client_protocol
-        local external_client_protocol
-        if [[ ${KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP:-} =~ INTERNAL:([a-zA-Z_]*) ]]; then
-            internal_protocol="${BASH_REMATCH[1]}"
-            kafka_configure_internal_communications "$internal_protocol"
+        # Configure Kafka producer/consumer to set up message sizes
+        ! is_empty_value "${KAFKA_CFG_MAX_REQUEST_SIZE:-}" && kafka_common_conf_set "$KAFKA_CONF_DIR/producer.properties" max.request.size "$KAFKA_CFG_MAX_REQUEST_SIZE"
+        ! is_empty_value "${KAFKA_CFG_MAX_PARTITION_FETCH_BYTES:-}" && kafka_common_conf_set "$KAFKA_CONF_DIR/consumer.properties" max.partition.fetch.bytes "$KAFKA_CFG_MAX_PARTITION_FETCH_BYTES"
+        # Zookeeper mode additional settings
+        if ! is_empty_value "${KAFKA_CFG_ZOOKEEPER_CONNECT:-}"; then
+            if [[ "$KAFKA_ZOOKEEPER_PROTOCOL" =~ SSL ]]; then
+                kafka_zookeeper_configure_tls
+            fi
+            if [[ "$KAFKA_ZOOKEEPER_PROTOCOL" =~ SASL ]]; then
+                kafka_zookeeper_configure_jaas
+            fi
         fi
-        if [[ ${KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP:-} =~ CLIENT:([a-zA-Z_]*) ]]; then
-            client_protocol="${BASH_REMATCH[1]}"
-            kafka_configure_client_communications "$client_protocol"
+        # If at least one listener uses SSL or SASL_SSL, ensure SSL is configured
+        if kafka_has_ssl_listener; then
+            kafka_configure_ssl
         fi
-        if [[ ${KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP:-} =~ EXTERNAL:([a-zA-Z_]*) ]]; then
-            external_client_protocol="${BASH_REMATCH[1]}"
-            kafka_configure_external_client_communications "$external_client_protocol"
+        # If at least one listener uses SASL_PLAINTEXT or SASL_SSL, ensure SASL is configured
+        if kafka_has_sasl_listener; then
+            if [[ "$KAFKA_CFG_SASL_ENABLED_MECHANISMS" =~ SCRAM ]]; then
+                if ! is_empty_value "${KAFKA_CFG_PROCESS_ROLES:-}"; then
+                    if [[ "$(kafka_get_version)" =~ ^3\.2\.|^3\.3\.|^3\.4\. ]]; then
+                        # NOTE: This will depend on Kafka version when support for SCRAM is added
+                        warn "KRaft mode requires Kafka version 3.5 or higher for SCRAM to be supported. SCRAM SASL mechanisms will now be disabled."
+                        KAFKA_CFG_SASL_ENABLED_MECHANISMS=PLAIN
+                    else
+                        export KAFKA_KRAFT_BOOTSTRAP_SCRAM_USERS="true"
+                    fi
+                fi
+                if ! is_empty_value "${KAFKA_CFG_ZOOKEEPER_CONNECT:-}"; then
+                    export KAFKA_KRAFT_BOOTSTRAP_SCRAM_USERS="true"
+                fi
+            fi
+            kafka_server_conf_set sasl.enabled.mechanisms "$KAFKA_CFG_SASL_ENABLED_MECHANISMS"
         fi
+        # Settings for each Kafka Listener are configured individually
+        read -r -a protocol_maps <<<"$(tr ',' ' ' <<<"$KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP")"
+        for protocol_map in "${protocol_maps[@]}"; do
+            read -r -a map <<<"$(tr ':' ' ' <<<"$protocol_map")"
+            # Obtain the listener and protocol from protocol map string, e.g. CONTROLLER:PLAINTEXT
+            listener="${map[0]}"
+            protocol="${map[1]}"
+            listener_lower="$(echo "$listener" | tr '[:upper:]' '[:lower:]')"
 
-        if [[ "${internal_protocol:-}" =~ "SASL" || "${client_protocol:-}" =~ "SASL" || "${external_client_protocol:-}" =~ "SASL" ]] || [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SASL ]]; then
-            if [[ -n "$KAFKA_CFG_SASL_ENABLED_MECHANISMS" ]]; then
-                kafka_server_conf_set sasl.enabled.mechanisms "$KAFKA_CFG_SASL_ENABLED_MECHANISMS"
-                kafka_generate_jaas_authentication_file "${internal_protocol:-}" "${client_protocol:-}"
-                [[ "$KAFKA_CFG_SASL_ENABLED_MECHANISMS" =~ "SCRAM" ]] && kafka_create_sasl_scram_zookeeper_users
-            else
-                print_validation_error "Specified SASL protocol but no SASL mechanisms provided in KAFKA_CFG_SASL_ENABLED_MECHANISMS"
+            if [[ "$protocol" = "SSL" || "$protocol" = "SASL_SSL" ]]; then
+                kafka_server_conf_set "listener.name.${listener_lower}.ssl.client.auth" "$KAFKA_TLS_INTER_BROKER_AUTH"
             fi
-        fi
-        # Remove security.inter.broker.protocol if KAFKA_CFG_INTER_BROKER_LISTENER_NAME is configured
-        if [[ -n "${KAFKA_CFG_INTER_BROKER_LISTENER_NAME:-}" ]]; then
-          remove_in_file "$(kafka_get_conf_file)" "security.inter.broker.protocol" false
-        fi
-        kafka_configure_producer_consumer_message_sizes
+            if [[ "$protocol" = "SASL_PLAINTEXT" || "$protocol" = "SASL_SSL" ]]; then
+                local role=""
+                if [[ "$listener" = "${KAFKA_CFG_INTER_BROKER_LISTENER_NAME:-INTERNAL}" ]]; then
+                    kafka_server_conf_set sasl.mechanism.inter.broker.protocol "$KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL"
+                    role="inter-broker"
+                elif [[ "${KAFKA_CFG_CONTROLLER_LISTENER_NAMES:-CONTROLLER}" =~ $listener ]]; then
+                    kafka_server_conf_set sasl.mechanism.controller.protocol "$KAFKA_CFG_SASL_MECHANISM_CONTROLLER_PROTOCOL"
+                    kafka_server_conf_set "listener.name.${listener_lower}.sasl.enabled.mechanisms" "$KAFKA_CFG_SASL_MECHANISM_CONTROLLER_PROTOCOL"
+                    role="controller"
+                fi
+                # If KAFKA_CLIENT_LISTENER_NAME is found in the listeners list, configure the producer/consumer accordingly
+                if [[ "$listener" = "${KAFKA_CLIENT_LISTENER_NAME:-CLIENT}" ]]; then
+                    kafka_configure_consumer_producer_jaas
+                    kafka_producer_consumer_conf_set security.protocol "$protocol"
+                    kafka_producer_consumer_conf_set sasl.mechanism "${KAFKA_CLIENT_SASL_MECHANISM:-$(kafka_client_sasl_mechanism)}"
+                fi
+                kafka_configure_server_jaas "$listener_lower" "${role:-}"
+            fi
+        done
+    else
+        info "Detected mounted server.properties file at ${KAFKA_MOUNTED_CONF_DIR}/server.properties. Skipping configuration based on env variables"
     fi
     true
 }
 
+########################
+# Returns the most secure SASL mechanism available for Kafka clients
+# Globals:
+#   KAFKA_*
+# Arguments:
+#   None
+# Returns:
+#   None
+########################
+kafka_client_sasl_mechanism() {
+    local sasl_mechanism=""
+
+    if [[ "$KAFKA_CFG_SASL_ENABLED_MECHANISMS" =~ SCRAM-SHA-512 ]]; then
+        sasl_mechanism="SCRAM-SHA-512"
+    elif [[ "$KAFKA_CFG_SASL_ENABLED_MECHANISMS" =~ SCRAM-SHA-256 ]]; then
+        sasl_mechanism="SCRAM-SHA-256"
+    elif [[ "$KAFKA_CFG_SASL_ENABLED_MECHANISMS" =~ PLAIN ]]; then
+        sasl_mechanism="PLAIN"
+    fi
+    echo "$sasl_mechanism"
+}
+
+########################
+# Removes default settings referencing Zookeeper mode or KRaft mode
+# Globals:
+#   KAFKA_*
+# Arguments:
+#   None
+# Returns:
+#   None
+########################
+kafka_server_unify_conf() {
+    local -r remove_regexps=(
+        #Zookeeper
+        "s/^zookeeper\./#zookeeper./g"
+        "s/^group\.initial/#group.initial/g"
+        "s/^broker\./#broker./g"
+        "s/^node\./#node./g"
+        "s/^process\./#process./g"
+        "s/^listeners=/#listeners=/g"
+        "s/^listener\./#listener./g"
+        "s/^controller\./#controller./g"
+        "s/^inter\.broker/#inter.broker/g"
+        "s/^advertised\.listeners/#advertised.listeners/g"
+    )
+
+    # Map environment variables to config properties
+    for regex in "${remove_regexps[@]}"; do
+        sed -i "${regex}" "$KAFKA_CONF_FILE"
+    done
+}
+
+########################
+# Dinamically set node.id/broker.id/controller.quorum.voters if their alternative environment variable _COMMAND is set
+# Globals:
+#   KAFKA_*_COMMAND
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+kafka_dynamic_environment_variables() {
+    # KRaft mode
+    if ! is_empty_value "${KAFKA_NODE_ID_COMMAND:-}"; then
+        KAFKA_CFG_NODE_ID="$(eval "${KAFKA_NODE_ID_COMMAND}")"
+        export KAFKA_CFG_NODE_ID
+    fi
+    if ! is_empty_value "${KAFKA_CONTROLLER_QUORUM_VOTERS_COMMAND:-}"; then
+        KAFKA_CFG_CONTROLLER_QUORUM_VOTERS="$(eval "${KAFKA_CONTROLLER_QUORUM_VOTERS_COMMAND}")"
+        export KAFKA_CFG_CONTROLLER_QUORUM_VOTERS
+    fi
+    # Zookeeper mode
+    # DEPRECATED - BROKER_ID_COMMAND has been deprecated, please use KAFKA_BROKER_ID_COMMAND instead
+    if ! is_empty_value "${KAFKA_BROKER_ID_COMMAND:-}"; then
+        KAFKA_CFG_BROKER_ID="$(eval "${KAFKA_BROKER_ID_COMMAND}")"
+        export KAFKA_CFG_BROKER_ID
+    elif ! is_empty_value "${BROKER_ID_COMMAND:-}"; then
+        KAFKA_CFG_BROKER_ID="$(eval "${BROKER_ID_COMMAND}")"
+        export KAFKA_CFG_BROKER_ID
+    fi
+}
+
 ########################
 # Run custom initialization scripts
 # Globals:
@@ -955,20 +1167,3 @@ kafka_stop() {
     ! is_kafka_running && return
     stop_service_using_pid "$KAFKA_PID_FILE" TERM
 }
-
-########################
-# Get configuration file to use
-# Globals:
-#   KAFKA_ENABLE_KRAFT
-# Arguments:
-#   None
-# Returns:
-#   Path to the conf file to use
-#########################
-kafka_get_conf_file() {
-    if is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
-        echo "$KAFKA_CONF_FILE"
-    else
-        echo "$KAFKA_ZK_CONF_FILE"
-    fi
-}
diff --git a/bitnami/kaniko/1/scratch/Dockerfile b/bitnami/kaniko/1/scratch/Dockerfile
index d84a7c012a32d..d1a771830a5ae 100644
--- a/bitnami/kaniko/1/scratch/Dockerfile
+++ b/bitnami/kaniko/1/scratch/Dockerfile
@@ -15,7 +15,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "kaniko-1.13.0-0-linux-${OS_ARCH}-debian-11" \
+      "kaniko-1.13.0-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -40,10 +40,10 @@ ENV HOME="/root" \
 
 LABEL com.vmware.cp.artifact.flavor="sha256:59c774543cd827c5e74f2cc55d77e9e923fdcfe2487c135bbb41d7709b51eef6" \
       org.opencontainers.image.base.name="scratch" \
-      org.opencontainers.image.created="2023-07-31T10:54:29Z" \
+      org.opencontainers.image.created="2023-07-31T23:22:04Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.13.0-scratch-r0" \
+      org.opencontainers.image.ref.name="1.13.0-scratch-r2" \
       org.opencontainers.image.title="kaniko" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.13.0"
diff --git a/bitnami/kaniko/1/scratch/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kaniko/1/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
index 8dbc8c3ba3c67..3a1afc93875e5 100644
--- a/bitnami/kaniko/1/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/kaniko/1/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.13.0-0"
+        "version": "1.13.0-2"
     }
 }
\ No newline at end of file
diff --git a/bitnami/kibana/7/debian-11/Dockerfile b/bitnami/kibana/7/debian-11/Dockerfile
index 79c04ca12efa7..f663a0e878014 100644
--- a/bitnami/kibana/7/debian-11/Dockerfile
+++ b/bitnami/kibana/7/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-07-28T04:54:24Z" \
+      org.opencontainers.image.created="2023-07-31T06:50:17Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.17.12-debian-11-r2" \
+      org.opencontainers.image.ref.name="7.17.12-debian-11-r5" \
       org.opencontainers.image.title="kibana" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.17.12"
diff --git a/bitnami/kong-ingress-controller/2/debian-11/Dockerfile b/bitnami/kong-ingress-controller/2/debian-11/Dockerfile
index 6567996c012c1..84947b673c7d7 100644
--- a/bitnami/kong-ingress-controller/2/debian-11/Dockerfile
+++ b/bitnami/kong-ingress-controller/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-07-27T17:43:44Z" \
+      org.opencontainers.image.created="2023-07-30T19:18:51Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.10.4-debian-11-r2" \
+      org.opencontainers.image.ref.name="2.10.4-debian-11-r5" \
       org.opencontainers.image.title="kong-ingress-controller" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.10.4"
diff --git a/bitnami/ksql/7.1/debian-11/Dockerfile b/bitnami/ksql/7.1/debian-11/Dockerfile
index 44b3046e7bc06..61f0ccc1fb727 100644
--- a/bitnami/ksql/7.1/debian-11/Dockerfile
+++ b/bitnami/ksql/7.1/debian-11/Dockerfile
@@ -8,10 +8,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-07-27T16:33:56Z" \
+      org.opencontainers.image.created="2023-07-30T19:30:57Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.1.8-debian-11-r13" \
+      org.opencontainers.image.ref.name="7.1.8-debian-11-r16" \
       org.opencontainers.image.title="ksql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.1.8"
@@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl netcat procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "java-11.0.20-8-1-linux-${OS_ARCH}-debian-11" \
+      "java-11.0.20-8-2-linux-${OS_ARCH}-debian-11" \
       "ksql-7.1.8-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/ksql/7.1/debian-11/docker-compose.yml b/bitnami/ksql/7.1/debian-11/docker-compose.yml
index ffc01c58a7611..fd8d3a0a868ea 100644
--- a/bitnami/ksql/7.1/debian-11/docker-compose.yml
+++ b/bitnami/ksql/7.1/debian-11/docker-compose.yml
@@ -7,7 +7,16 @@ services:
   kafka:
     image: docker.io/bitnami/kafka:3.4
     environment:
-      - ALLOW_PLAINTEXT_LISTENER=yes
+      # KRaft settings
+      - KAFKA_CFG_NODE_ID=0
+      - KAFKA_CFG_PROCESS_ROLES=controller,broker
+      - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
+      # Listeners
+      - KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
+      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://:9092
+      - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
+      - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
     volumes:
       - 'kafka_data:/bitnami/kafka'
   ksql:
diff --git a/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 5618761b1e3c9..114222183641f 100644
--- a/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/ksql/7.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "11.0.20-8-1"
+        "version": "11.0.20-8-2"
     },
     "ksql": {
         "arch": "amd64",
diff --git a/bitnami/ksql/7.2/debian-11/Dockerfile b/bitnami/ksql/7.2/debian-11/Dockerfile
index be1083663ad30..17612a7241e39 100644
--- a/bitnami/ksql/7.2/debian-11/Dockerfile
+++ b/bitnami/ksql/7.2/debian-11/Dockerfile
@@ -8,10 +8,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-07-27T17:22:46Z" \
+      org.opencontainers.image.created="2023-07-30T21:42:42Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.2.6-debian-11-r13" \
+      org.opencontainers.image.ref.name="7.2.6-debian-11-r16" \
       org.opencontainers.image.title="ksql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.2.6"
@@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl netcat procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "java-11.0.20-8-1-linux-${OS_ARCH}-debian-11" \
+      "java-11.0.20-8-2-linux-${OS_ARCH}-debian-11" \
       "ksql-7.2.6-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/ksql/7.2/debian-11/docker-compose.yml b/bitnami/ksql/7.2/debian-11/docker-compose.yml
index b66f23c24cb9c..2c7c26a4ec549 100644
--- a/bitnami/ksql/7.2/debian-11/docker-compose.yml
+++ b/bitnami/ksql/7.2/debian-11/docker-compose.yml
@@ -7,7 +7,16 @@ services:
   kafka:
     image: docker.io/bitnami/kafka:3.4
     environment:
-      - ALLOW_PLAINTEXT_LISTENER=yes
+      # KRaft settings
+      - KAFKA_CFG_NODE_ID=0
+      - KAFKA_CFG_PROCESS_ROLES=controller,broker
+      - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
+      # Listeners
+      - KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
+      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://:9092
+      - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
+      - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
     volumes:
       - 'kafka_data:/bitnami/kafka'
   ksql:
diff --git a/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index cce56a7429166..c0998391bcd6d 100644
--- a/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/ksql/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "11.0.20-8-1"
+        "version": "11.0.20-8-2"
     },
     "ksql": {
         "arch": "amd64",
diff --git a/bitnami/ksql/7.3/debian-11/Dockerfile b/bitnami/ksql/7.3/debian-11/Dockerfile
index a2de8c096a2de..89e5c69cb0eb3 100644
--- a/bitnami/ksql/7.3/debian-11/Dockerfile
+++ b/bitnami/ksql/7.3/debian-11/Dockerfile
@@ -8,10 +8,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-07-27T19:02:54Z" \
+      org.opencontainers.image.created="2023-07-30T21:44:03Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.3.3-debian-11-r103" \
+      org.opencontainers.image.ref.name="7.3.3-debian-11-r106" \
       org.opencontainers.image.title="ksql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.3.3"
diff --git a/bitnami/ksql/7.3/debian-11/docker-compose.yml b/bitnami/ksql/7.3/debian-11/docker-compose.yml
index 0ea6dba485d5d..8f28a61a5e07c 100644
--- a/bitnami/ksql/7.3/debian-11/docker-compose.yml
+++ b/bitnami/ksql/7.3/debian-11/docker-compose.yml
@@ -7,7 +7,16 @@ services:
   kafka:
     image: docker.io/bitnami/kafka:3.4
     environment:
-      - ALLOW_PLAINTEXT_LISTENER=yes
+      # KRaft settings
+      - KAFKA_CFG_NODE_ID=0
+      - KAFKA_CFG_PROCESS_ROLES=controller,broker
+      - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
+      # Listeners
+      - KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
+      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://:9092
+      - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
+      - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
     volumes:
       - 'kafka_data:/bitnami/kafka'
   ksql:
diff --git a/bitnami/ksql/7.4/debian-11/Dockerfile b/bitnami/ksql/7.4/debian-11/Dockerfile
index 6968f93dd2476..92c0fdcbfa940 100644
--- a/bitnami/ksql/7.4/debian-11/Dockerfile
+++ b/bitnami/ksql/7.4/debian-11/Dockerfile
@@ -8,10 +8,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-07-27T22:14:45Z" \
+      org.opencontainers.image.created="2023-07-31T01:15:09Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.4.1-debian-11-r10" \
+      org.opencontainers.image.ref.name="7.4.1-debian-11-r13" \
       org.opencontainers.image.title="ksql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.4.1"
diff --git a/bitnami/ksql/7.4/debian-11/docker-compose.yml b/bitnami/ksql/7.4/debian-11/docker-compose.yml
index ae46b8183f72c..f26b210900611 100644
--- a/bitnami/ksql/7.4/debian-11/docker-compose.yml
+++ b/bitnami/ksql/7.4/debian-11/docker-compose.yml
@@ -7,7 +7,16 @@ services:
   kafka:
     image: docker.io/bitnami/kafka:3.4
     environment:
-      - ALLOW_PLAINTEXT_LISTENER=yes
+      # KRaft settings
+      - KAFKA_CFG_NODE_ID=0
+      - KAFKA_CFG_PROCESS_ROLES=controller,broker
+      - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
+      # Listeners
+      - KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
+      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://:9092
+      - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
+      - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
     volumes:
       - 'kafka_data:/bitnami/kafka'
   ksql:
diff --git a/bitnami/ksql/docker-compose.yml b/bitnami/ksql/docker-compose.yml
index ae46b8183f72c..f26b210900611 100644
--- a/bitnami/ksql/docker-compose.yml
+++ b/bitnami/ksql/docker-compose.yml
@@ -7,7 +7,16 @@ services:
   kafka:
     image: docker.io/bitnami/kafka:3.4
     environment:
-      - ALLOW_PLAINTEXT_LISTENER=yes
+      # KRaft settings
+      - KAFKA_CFG_NODE_ID=0
+      - KAFKA_CFG_PROCESS_ROLES=controller,broker
+      - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
+      # Listeners
+      - KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
+      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://:9092
+      - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
+      - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
     volumes:
       - 'kafka_data:/bitnami/kafka'
   ksql:
diff --git a/bitnami/kubeapps-apis/2/debian-11/Dockerfile b/bitnami/kubeapps-apis/2/debian-11/Dockerfile
index 8b84eabb8c1c5..648b550b02209 100644
--- a/bitnami/kubeapps-apis/2/debian-11/Dockerfile
+++ b/bitnami/kubeapps-apis/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-07-27T15:20:08Z" \
+      org.opencontainers.image.created="2023-07-30T18:37:47Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.8.0-debian-11-r22" \
+      org.opencontainers.image.ref.name="2.8.0-debian-11-r25" \
       org.opencontainers.image.title="kubeapps-apis" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.0"
diff --git a/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile b/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile
index cd28766b9f4e0..9cf57eb58b106 100644
--- a/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile
+++ b/bitnami/kubeapps-dashboard/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-07-27T17:23:09Z" \
+      org.opencontainers.image.created="2023-07-31T17:40:19Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.8.0-debian-11-r22" \
+      org.opencontainers.image.ref.name="2.8.0-debian-11-r23" \
       org.opencontainers.image.title="kubeapps-dashboard" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.0"
diff --git a/bitnami/kubeapps-oci-catalog/2/debian-11/Dockerfile b/bitnami/kubeapps-oci-catalog/2/debian-11/Dockerfile
index 6a27661284b49..7e854146a4f42 100644
--- a/bitnami/kubeapps-oci-catalog/2/debian-11/Dockerfile
+++ b/bitnami/kubeapps-oci-catalog/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-07-28T15:58:49Z" \
+      org.opencontainers.image.created="2023-07-30T18:37:38Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.8.0-debian-11-r6" \
+      org.opencontainers.image.ref.name="2.8.0-debian-11-r8" \
       org.opencontainers.image.title="kubeapps-oci-catalog" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.0"
diff --git a/bitnami/kubeapps-pinniped-proxy/2/debian-11/Dockerfile b/bitnami/kubeapps-pinniped-proxy/2/debian-11/Dockerfile
index d1c44d2ce16b7..0c043177e966c 100644
--- a/bitnami/kubeapps-pinniped-proxy/2/debian-11/Dockerfile
+++ b/bitnami/kubeapps-pinniped-proxy/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-07-28T16:02:27Z" \
+      org.opencontainers.image.created="2023-07-30T19:24:00Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.8.0-debian-11-r23" \
+      org.opencontainers.image.ref.name="2.8.0-debian-11-r25" \
       org.opencontainers.image.title="kubeapps-pinniped-proxy" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.0"
diff --git a/bitnami/kubectl/1.24/debian-11/Dockerfile b/bitnami/kubectl/1.24/debian-11/Dockerfile
index e463fd57e1b6a..e028a2a03401f 100644
--- a/bitnami/kubectl/1.24/debian-11/Dockerfile
+++ b/bitnami/kubectl/1.24/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-07-28T17:22:23Z" \
+      org.opencontainers.image.created="2023-07-30T19:27:06Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.24.16-debian-11-r8" \
+      org.opencontainers.image.ref.name="1.24.16-debian-11-r10" \
       org.opencontainers.image.title="kubectl" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.24.16"
diff --git a/bitnami/kubectl/1.25/debian-11/Dockerfile b/bitnami/kubectl/1.25/debian-11/Dockerfile
index b45ffb77099cb..ba618d59dd549 100644
--- a/bitnami/kubectl/1.25/debian-11/Dockerfile
+++ b/bitnami/kubectl/1.25/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-07-27T18:23:17Z" \
+      org.opencontainers.image.created="2023-07-30T19:41:52Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.25.12-debian-11-r8" \
+      org.opencontainers.image.ref.name="1.25.12-debian-11-r11" \
       org.opencontainers.image.title="kubectl" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.25.12"
diff --git a/bitnami/kubectl/1.26/debian-11/Dockerfile b/bitnami/kubectl/1.26/debian-11/Dockerfile
index 36e527fe72cf1..533f89bb15510 100644
--- a/bitnami/kubectl/1.26/debian-11/Dockerfile
+++ b/bitnami/kubectl/1.26/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-07-27T17:01:53Z" \
+      org.opencontainers.image.created="2023-07-30T19:31:45Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.26.7-debian-11-r7" \
+      org.opencontainers.image.ref.name="1.26.7-debian-11-r10" \
       org.opencontainers.image.title="kubectl" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.26.7"
diff --git a/bitnami/kubectl/1.27/debian-11/Dockerfile b/bitnami/kubectl/1.27/debian-11/Dockerfile
index f67505db536c4..0e32bfc588b3c 100644
--- a/bitnami/kubectl/1.27/debian-11/Dockerfile
+++ b/bitnami/kubectl/1.27/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-07-27T17:41:39Z" \
+      org.opencontainers.image.created="2023-07-30T19:34:26Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.27.4-debian-11-r8" \
+      org.opencontainers.image.ref.name="1.27.4-debian-11-r11" \
       org.opencontainers.image.title="kubectl" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.27.4"
diff --git a/bitnami/laravel/10/debian-11/Dockerfile b/bitnami/laravel/10/debian-11/Dockerfile
index a9f41576abaa7..de0e09ed88434 100644
--- a/bitnami/laravel/10/debian-11/Dockerfile
+++ b/bitnami/laravel/10/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-07-27T17:02:18Z" \
+      org.opencontainers.image.created="2023-07-31T17:34:40Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.2.5-debian-11-r14" \
+      org.opencontainers.image.ref.name="10.2.5-debian-11-r15" \
       org.opencontainers.image.title="laravel" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.2.5"
@@ -27,7 +27,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "python-3.9.17-4-linux-${OS_ARCH}-debian-11" \
       "php-8.2.8-3-linux-${OS_ARCH}-debian-11" \
-      "node-18.17.0-1-linux-${OS_ARCH}-debian-11" \
+      "node-18.17.0-2-linux-${OS_ARCH}-debian-11" \
       "wait-for-port-1.0.6-11-linux-${OS_ARCH}-debian-11" \
       "laravel-10.2.5-1-linux-${OS_ARCH}-debian-11" \
     ) && \
diff --git a/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index a378fc9e97fa5..bae562cbbf8c8 100644
--- a/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/laravel/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "18.17.0-1"
+        "version": "18.17.0-2"
     },
     "php": {
         "arch": "amd64",
diff --git a/bitnami/laravel/9/debian-11/Dockerfile b/bitnami/laravel/9/debian-11/Dockerfile
index 5006ac03c967f..44bcffa07b83d 100644
--- a/bitnami/laravel/9/debian-11/Dockerfile
+++ b/bitnami/laravel/9/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-07-27T17:02:17Z" \
+      org.opencontainers.image.created="2023-07-31T17:46:14Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.5.2-debian-11-r63" \
+      org.opencontainers.image.ref.name="9.5.2-debian-11-r64" \
       org.opencontainers.image.title="laravel" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.5.2"
@@ -27,7 +27,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "python-3.9.17-4-linux-${OS_ARCH}-debian-11" \
       "php-8.2.8-3-linux-${OS_ARCH}-debian-11" \
-      "node-18.17.0-1-linux-${OS_ARCH}-debian-11" \
+      "node-18.17.0-2-linux-${OS_ARCH}-debian-11" \
       "wait-for-port-1.0.6-11-linux-${OS_ARCH}-debian-11" \
       "laravel-9.5.2-9-linux-${OS_ARCH}-debian-11" \
     ) && \
diff --git a/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 58198b16e8204..b770f8f3b2629 100644
--- a/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/laravel/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "18.17.0-1"
+        "version": "18.17.0-2"
     },
     "php": {
         "arch": "amd64",
diff --git a/bitnami/logstash/7/debian-11/Dockerfile b/bitnami/logstash/7/debian-11/Dockerfile
index 26af5d5a8d872..8d6dd56b4b154 100644
--- a/bitnami/logstash/7/debian-11/Dockerfile
+++ b/bitnami/logstash/7/debian-11/Dockerfile
@@ -9,10 +9,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-07-28T01:28:42Z" \
+      org.opencontainers.image.created="2023-07-31T03:31:53Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.17.12-debian-11-r2" \
+      org.opencontainers.image.ref.name="7.17.12-debian-11-r5" \
       org.opencontainers.image.title="logstash" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.17.12"
diff --git a/bitnami/logstash/8/debian-11/Dockerfile b/bitnami/logstash/8/debian-11/Dockerfile
index f24c76dbbb872..663a75ed4cb64 100644
--- a/bitnami/logstash/8/debian-11/Dockerfile
+++ b/bitnami/logstash/8/debian-11/Dockerfile
@@ -9,10 +9,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-07-28T01:28:29Z" \
+      org.opencontainers.image.created="2023-07-31T03:28:07Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.9.0-debian-11-r2" \
+      org.opencontainers.image.ref.name="8.9.0-debian-11-r5" \
       org.opencontainers.image.title="logstash" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.9.0"
diff --git a/bitnami/magento/2/debian-11/Dockerfile b/bitnami/magento/2/debian-11/Dockerfile
index 13a084b9cbb24..717eb580b1f5d 100644
--- a/bitnami/magento/2/debian-11/Dockerfile
+++ b/bitnami/magento/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-07-27T20:48:50Z" \
+      org.opencontainers.image.created="2023-07-31T18:13:25Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.4.6-debian-11-r50" \
+      org.opencontainers.image.ref.name="2.4.6-debian-11-r51" \
       org.opencontainers.image.title="magento" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.4.6"
diff --git a/bitnami/mariadb-galera/10.10/debian-11/Dockerfile b/bitnami/mariadb-galera/10.10/debian-11/Dockerfile
index ac99a0e93ea8e..005fcd00c6836 100644
--- a/bitnami/mariadb-galera/10.10/debian-11/Dockerfile
+++ b/bitnami/mariadb-galera/10.10/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-07-27T17:30:04Z" \
+      org.opencontainers.image.created="2023-07-30T19:37:07Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.10.5-debian-11-r47" \
+      org.opencontainers.image.ref.name="10.10.5-debian-11-r50" \
       org.opencontainers.image.title="mariadb-galera" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.10.5"
diff --git a/bitnami/mariadb-galera/10.11/debian-11/Dockerfile b/bitnami/mariadb-galera/10.11/debian-11/Dockerfile
index 6d7764d0b10e4..7e99f8519e189 100644
--- a/bitnami/mariadb-galera/10.11/debian-11/Dockerfile
+++ b/bitnami/mariadb-galera/10.11/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-07-27T18:36:45Z" \
+      org.opencontainers.image.created="2023-07-31T18:05:15Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.11.4-debian-11-r48" \
+      org.opencontainers.image.ref.name="10.11.4-debian-11-r49" \
       org.opencontainers.image.title="mariadb-galera" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.11.4"
diff --git a/bitnami/mariadb-galera/10.4/debian-11/Dockerfile b/bitnami/mariadb-galera/10.4/debian-11/Dockerfile
index 05c65959b89e5..72277452effdb 100644
--- a/bitnami/mariadb-galera/10.4/debian-11/Dockerfile
+++ b/bitnami/mariadb-galera/10.4/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-07-27T18:56:16Z" \
+      org.opencontainers.image.created="2023-07-30T20:09:08Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.4.30-debian-11-r48" \
+      org.opencontainers.image.ref.name="10.4.30-debian-11-r51" \
       org.opencontainers.image.title="mariadb-galera" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.4.30"
diff --git a/bitnami/mariadb-galera/10.5/debian-11/Dockerfile b/bitnami/mariadb-galera/10.5/debian-11/Dockerfile
index bccbd176a1b0f..a00fdb39efab0 100644
--- a/bitnami/mariadb-galera/10.5/debian-11/Dockerfile
+++ b/bitnami/mariadb-galera/10.5/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-07-27T20:09:40Z" \
+      org.opencontainers.image.created="2023-07-31T18:34:20Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.5.21-debian-11-r48" \
+      org.opencontainers.image.ref.name="10.5.21-debian-11-r49" \
       org.opencontainers.image.title="mariadb-galera" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.5.21"
diff --git a/bitnami/mariadb-galera/10.6/debian-11/Dockerfile b/bitnami/mariadb-galera/10.6/debian-11/Dockerfile
index 043761323f1da..65fd915071686 100644
--- a/bitnami/mariadb-galera/10.6/debian-11/Dockerfile
+++ b/bitnami/mariadb-galera/10.6/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-07-27T20:55:00Z" \
+      org.opencontainers.image.created="2023-07-30T22:27:25Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.6.14-debian-11-r48" \
+      org.opencontainers.image.ref.name="10.6.14-debian-11-r51" \
       org.opencontainers.image.title="mariadb-galera" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.6.14"
diff --git a/bitnami/mariadb-galera/10.9/debian-11/Dockerfile b/bitnami/mariadb-galera/10.9/debian-11/Dockerfile
index 71ad67495489c..ec7855fe084b6 100644
--- a/bitnami/mariadb-galera/10.9/debian-11/Dockerfile
+++ b/bitnami/mariadb-galera/10.9/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-07-27T22:03:26Z" \
+      org.opencontainers.image.created="2023-07-31T18:33:56Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.9.7-debian-11-r48" \
+      org.opencontainers.image.ref.name="10.9.7-debian-11-r49" \
       org.opencontainers.image.title="mariadb-galera" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.9.7"
diff --git a/bitnami/mariadb-galera/11.0/debian-11/Dockerfile b/bitnami/mariadb-galera/11.0/debian-11/Dockerfile
index eecc52218f3d4..46cfa2e166296 100644
--- a/bitnami/mariadb-galera/11.0/debian-11/Dockerfile
+++ b/bitnami/mariadb-galera/11.0/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-07-27T12:42:48Z" \
+      org.opencontainers.image.created="2023-07-31T18:35:01Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="11.0.2-debian-11-r0" \
+      org.opencontainers.image.ref.name="11.0.2-debian-11-r1" \
       org.opencontainers.image.title="mariadb-galera" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="11.0.2"
diff --git a/bitnami/mariadb/10.10/debian-11/Dockerfile b/bitnami/mariadb/10.10/debian-11/Dockerfile
index 74ca4232f328a..17945c6774e18 100644
--- a/bitnami/mariadb/10.10/debian-11/Dockerfile
+++ b/bitnami/mariadb/10.10/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-07-27T18:39:41Z" \
+      org.opencontainers.image.created="2023-07-30T19:57:53Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.10.5-debian-11-r47" \
+      org.opencontainers.image.ref.name="10.10.5-debian-11-r50" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.10.5"
diff --git a/bitnami/mariadb/10.11/debian-11/Dockerfile b/bitnami/mariadb/10.11/debian-11/Dockerfile
index ca28bdbe262a4..95e9df39cb4d9 100644
--- a/bitnami/mariadb/10.11/debian-11/Dockerfile
+++ b/bitnami/mariadb/10.11/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-07-27T20:43:58Z" \
+      org.opencontainers.image.created="2023-07-30T22:12:18Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.11.4-debian-11-r48" \
+      org.opencontainers.image.ref.name="10.11.4-debian-11-r51" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.11.4"
diff --git a/bitnami/mariadb/10.4/debian-11/Dockerfile b/bitnami/mariadb/10.4/debian-11/Dockerfile
index dada672b37323..c4a3ed4f56309 100644
--- a/bitnami/mariadb/10.4/debian-11/Dockerfile
+++ b/bitnami/mariadb/10.4/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-07-27T20:39:10Z" \
+      org.opencontainers.image.created="2023-07-30T22:02:36Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.4.30-debian-11-r48" \
+      org.opencontainers.image.ref.name="10.4.30-debian-11-r51" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.4.30"
diff --git a/bitnami/mariadb/10.5/debian-11/Dockerfile b/bitnami/mariadb/10.5/debian-11/Dockerfile
index 767d5d197074e..bedfcee7b9ac8 100644
--- a/bitnami/mariadb/10.5/debian-11/Dockerfile
+++ b/bitnami/mariadb/10.5/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-07-27T21:18:31Z" \
+      org.opencontainers.image.created="2023-07-30T22:48:18Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.5.21-debian-11-r48" \
+      org.opencontainers.image.ref.name="10.5.21-debian-11-r51" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.5.21"
diff --git a/bitnami/mariadb/10.6/debian-11/Dockerfile b/bitnami/mariadb/10.6/debian-11/Dockerfile
index e5a88b7094e98..e3a8c94ebbc7a 100644
--- a/bitnami/mariadb/10.6/debian-11/Dockerfile
+++ b/bitnami/mariadb/10.6/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-07-27T21:57:07Z" \
+      org.opencontainers.image.created="2023-07-30T23:21:00Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.6.14-debian-11-r48" \
+      org.opencontainers.image.ref.name="10.6.14-debian-11-r51" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.6.14"
diff --git a/bitnami/mariadb/10.9/debian-11/Dockerfile b/bitnami/mariadb/10.9/debian-11/Dockerfile
index 166754761ad36..0dad368b04f96 100644
--- a/bitnami/mariadb/10.9/debian-11/Dockerfile
+++ b/bitnami/mariadb/10.9/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-07-27T22:22:44Z" \
+      org.opencontainers.image.created="2023-07-30T23:45:56Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.9.7-debian-11-r48" \
+      org.opencontainers.image.ref.name="10.9.7-debian-11-r51" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="10.9.7"
diff --git a/bitnami/mediawiki/1/debian-11/Dockerfile b/bitnami/mediawiki/1/debian-11/Dockerfile
index d26119b8fa79e..4fb6b3513ad52 100644
--- a/bitnami/mediawiki/1/debian-11/Dockerfile
+++ b/bitnami/mediawiki/1/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-07-27T22:26:04Z" \
+      org.opencontainers.image.created="2023-07-31T18:05:48Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.40.0-debian-11-r26" \
+      org.opencontainers.image.ref.name="1.40.0-debian-11-r27" \
       org.opencontainers.image.title="mediawiki" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.40.0"
diff --git a/bitnami/memcached-exporter/0/debian-11/Dockerfile b/bitnami/memcached-exporter/0/debian-11/Dockerfile
index f2448f958dbe8..eb6081561cfe5 100644
--- a/bitnami/memcached-exporter/0/debian-11/Dockerfile
+++ b/bitnami/memcached-exporter/0/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-07-27T21:44:37Z" \
+      org.opencontainers.image.created="2023-07-30T22:44:14Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.13.0-debian-11-r53" \
+      org.opencontainers.image.ref.name="0.13.0-debian-11-r56" \
       org.opencontainers.image.title="memcached-exporter" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.13.0"
diff --git a/bitnami/memcached/1/debian-11/Dockerfile b/bitnami/memcached/1/debian-11/Dockerfile
index d925da018eedd..994a07294b6b2 100644
--- a/bitnami/memcached/1/debian-11/Dockerfile
+++ b/bitnami/memcached/1/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-07-28T22:16:45Z" \
+      org.opencontainers.image.created="2023-07-30T22:56:04Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.6.21-debian-11-r41" \
+      org.opencontainers.image.ref.name="1.6.21-debian-11-r43" \
       org.opencontainers.image.title="memcached" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.6.21"
diff --git a/bitnami/metallb-controller/0/debian-11/Dockerfile b/bitnami/metallb-controller/0/debian-11/Dockerfile
index b6d0cb9ca14e0..0ed2c122628cc 100644
--- a/bitnami/metallb-controller/0/debian-11/Dockerfile
+++ b/bitnami/metallb-controller/0/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-07-27T22:12:59Z" \
+      org.opencontainers.image.created="2023-07-30T23:18:07Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.13.10-debian-11-r55" \
+      org.opencontainers.image.ref.name="0.13.10-debian-11-r58" \
       org.opencontainers.image.title="metallb-controller" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.13.10"
diff --git a/bitnami/metallb-speaker/0/debian-11/Dockerfile b/bitnami/metallb-speaker/0/debian-11/Dockerfile
index d0278559cfef6..c31181096cf81 100644
--- a/bitnami/metallb-speaker/0/debian-11/Dockerfile
+++ b/bitnami/metallb-speaker/0/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-07-27T22:03:34Z" \
+      org.opencontainers.image.created="2023-07-30T23:20:38Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.13.10-debian-11-r55" \
+      org.opencontainers.image.ref.name="0.13.10-debian-11-r58" \
       org.opencontainers.image.title="metallb-speaker" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.13.10"
diff --git a/bitnami/metrics-server/0/debian-11/Dockerfile b/bitnami/metrics-server/0/debian-11/Dockerfile
index 342229665273c..a1806bef1f36b 100644
--- a/bitnami/metrics-server/0/debian-11/Dockerfile
+++ b/bitnami/metrics-server/0/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-07-27T22:19:30Z" \
+      org.opencontainers.image.created="2023-07-30T23:30:38Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.6.4-debian-11-r2" \
+      org.opencontainers.image.ref.name="0.6.4-debian-11-r5" \
       org.opencontainers.image.title="metrics-server" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.6.4"
diff --git a/bitnami/minio-client/2023/debian-11/Dockerfile b/bitnami/minio-client/2023/debian-11/Dockerfile
index 8196171f12237..fe495000316c0 100644
--- a/bitnami/minio-client/2023/debian-11/Dockerfile
+++ b/bitnami/minio-client/2023/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-07-28T22:44:17Z" \
+      org.opencontainers.image.created="2023-07-30T23:30:18Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2023.7.21-debian-11-r8" \
+      org.opencontainers.image.ref.name="2023.7.21-debian-11-r10" \
       org.opencontainers.image.title="minio-client" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2023.7.21"
diff --git a/bitnami/mongodb-exporter/0/debian-11/Dockerfile b/bitnami/mongodb-exporter/0/debian-11/Dockerfile
index 34391fabbf951..186b5f4b405f0 100644
--- a/bitnami/mongodb-exporter/0/debian-11/Dockerfile
+++ b/bitnami/mongodb-exporter/0/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-07-27T22:25:25Z" \
+      org.opencontainers.image.created="2023-07-30T23:39:17Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.39.0-debian-11-r55" \
+      org.opencontainers.image.ref.name="0.39.0-debian-11-r58" \
       org.opencontainers.image.title="mongodb-exporter" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.39.0"
diff --git a/bitnami/mongodb-sharded/5.0/debian-11/Dockerfile b/bitnami/mongodb-sharded/5.0/debian-11/Dockerfile
index 2803bf2b2e58b..7a2ca92892572 100644
--- a/bitnami/mongodb-sharded/5.0/debian-11/Dockerfile
+++ b/bitnami/mongodb-sharded/5.0/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-07-28T01:13:57Z" \
+      org.opencontainers.image.created="2023-07-31T04:35:29Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.0.19-debian-11-r14" \
+      org.opencontainers.image.ref.name="5.0.19-debian-11-r17" \
       org.opencontainers.image.title="mongodb-sharded" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="5.0.19"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "mongodb-shell-1.10.1-1-linux-${OS_ARCH}-debian-11" \
+      "mongodb-shell-1.10.2-0-linux-${OS_ARCH}-debian-11" \
       "yq-4.34.2-1-linux-${OS_ARCH}-debian-11" \
       "wait-for-port-1.0.6-11-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-10-linux-${OS_ARCH}-debian-11" \
diff --git a/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 8a22384337412..5f0533467ce85 100644
--- a/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.10.1-1"
+        "version": "1.10.2-0"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile b/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile
index c6bb9778c7e2c..d7601f301c7e7 100644
--- a/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile
+++ b/bitnami/mongodb-sharded/6.0/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-07-28T02:40:17Z" \
+      org.opencontainers.image.created="2023-07-31T05:30:49Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.0.8-debian-11-r13" \
+      org.opencontainers.image.ref.name="6.0.8-debian-11-r16" \
       org.opencontainers.image.title="mongodb-sharded" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="6.0.8"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "mongodb-shell-1.10.1-1-linux-${OS_ARCH}-debian-11" \
+      "mongodb-shell-1.10.2-0-linux-${OS_ARCH}-debian-11" \
       "yq-4.34.2-1-linux-${OS_ARCH}-debian-11" \
       "wait-for-port-1.0.6-11-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-10-linux-${OS_ARCH}-debian-11" \
diff --git a/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 5b359643e1e9c..09ac5c47c45e6 100644
--- a/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.10.1-1"
+        "version": "1.10.2-0"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/mongodb/5.0/debian-11/Dockerfile b/bitnami/mongodb/5.0/debian-11/Dockerfile
index a59d0b2b38087..0714cbb987764 100644
--- a/bitnami/mongodb/5.0/debian-11/Dockerfile
+++ b/bitnami/mongodb/5.0/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-07-28T00:01:20Z" \
+      org.opencontainers.image.created="2023-07-31T02:23:25Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.0.19-debian-11-r13" \
+      org.opencontainers.image.ref.name="5.0.19-debian-11-r16" \
       org.opencontainers.image.title="mongodb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="5.0.19"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "mongodb-shell-1.10.1-1-linux-${OS_ARCH}-debian-11" \
+      "mongodb-shell-1.10.2-0-linux-${OS_ARCH}-debian-11" \
       "yq-4.34.2-1-linux-${OS_ARCH}-debian-11" \
       "wait-for-port-1.0.6-11-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-10-linux-${OS_ARCH}-debian-11" \
diff --git a/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 8a22384337412..5f0533467ce85 100644
--- a/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.10.1-1"
+        "version": "1.10.2-0"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/mongodb/6.0/debian-11/Dockerfile b/bitnami/mongodb/6.0/debian-11/Dockerfile
index b78cf8b69794b..27bdde9934164 100644
--- a/bitnami/mongodb/6.0/debian-11/Dockerfile
+++ b/bitnami/mongodb/6.0/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-07-28T01:06:29Z" \
+      org.opencontainers.image.created="2023-07-31T03:44:30Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.0.8-debian-11-r14" \
+      org.opencontainers.image.ref.name="6.0.8-debian-11-r17" \
       org.opencontainers.image.title="mongodb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="6.0.8"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "mongodb-shell-1.10.1-1-linux-${OS_ARCH}-debian-11" \
+      "mongodb-shell-1.10.2-0-linux-${OS_ARCH}-debian-11" \
       "yq-4.34.2-1-linux-${OS_ARCH}-debian-11" \
       "wait-for-port-1.0.6-11-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-10-linux-${OS_ARCH}-debian-11" \
diff --git a/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 5b359643e1e9c..09ac5c47c45e6 100644
--- a/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.10.1-1"
+        "version": "1.10.2-0"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/moodle/4.0/debian-11/Dockerfile b/bitnami/moodle/4.0/debian-11/Dockerfile
index 6407538ab8ea9..f154fe6a9a8bd 100644
--- a/bitnami/moodle/4.0/debian-11/Dockerfile
+++ b/bitnami/moodle/4.0/debian-11/Dockerfile
@@ -9,10 +9,10 @@ ARG WITH_ALL_LOCALES="no"
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-27T23:21:16Z" \
+      org.opencontainers.image.created="2023-07-31T18:28:34Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.0.9-debian-11-r32" \
+      org.opencontainers.image.ref.name="4.0.9-debian-11-r33" \
       org.opencontainers.image.title="moodle" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.0.9"
diff --git a/bitnami/moodle/4.1/debian-11/Dockerfile b/bitnami/moodle/4.1/debian-11/Dockerfile
index 7d649ee507433..7c51db77e09d7 100644
--- a/bitnami/moodle/4.1/debian-11/Dockerfile
+++ b/bitnami/moodle/4.1/debian-11/Dockerfile
@@ -9,10 +9,10 @@ ARG WITH_ALL_LOCALES="no"
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-27T23:58:06Z" \
+      org.opencontainers.image.created="2023-07-31T18:32:38Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.1.4-debian-11-r32" \
+      org.opencontainers.image.ref.name="4.1.4-debian-11-r33" \
       org.opencontainers.image.title="moodle" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.1.4"
diff --git a/bitnami/moodle/4.2/debian-11/Dockerfile b/bitnami/moodle/4.2/debian-11/Dockerfile
index 5bf548715fe5b..dcf650c2c4730 100644
--- a/bitnami/moodle/4.2/debian-11/Dockerfile
+++ b/bitnami/moodle/4.2/debian-11/Dockerfile
@@ -9,10 +9,10 @@ ARG WITH_ALL_LOCALES="no"
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-28T00:24:27Z" \
+      org.opencontainers.image.created="2023-07-31T18:04:23Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.2.1-debian-11-r32" \
+      org.opencontainers.image.ref.name="4.2.1-debian-11-r33" \
       org.opencontainers.image.title="moodle" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.2.1"
diff --git a/bitnami/multus-cni/4/debian-11/Dockerfile b/bitnami/multus-cni/4/debian-11/Dockerfile
index 95caac70dd653..8cdd125a4a07f 100644
--- a/bitnami/multus-cni/4/debian-11/Dockerfile
+++ b/bitnami/multus-cni/4/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-07-28T23:02:39Z" \
+      org.opencontainers.image.created="2023-07-30T23:45:50Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.0.2-debian-11-r60" \
+      org.opencontainers.image.ref.name="4.0.2-debian-11-r62" \
       org.opencontainers.image.title="multus-cni" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.0.2"
diff --git a/bitnami/mxnet/1/debian-11/Dockerfile b/bitnami/mxnet/1/debian-11/Dockerfile
index bfc2c33073f97..b7215f6b6ef55 100644
--- a/bitnami/mxnet/1/debian-11/Dockerfile
+++ b/bitnami/mxnet/1/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-07-27T23:33:51Z" \
+      org.opencontainers.image.created="2023-07-31T01:43:32Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.9.1-debian-11-r342" \
+      org.opencontainers.image.ref.name="1.9.1-debian-11-r345" \
       org.opencontainers.image.title="mxnet" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.9.1"
diff --git a/bitnami/mysql/5.7/debian-11/Dockerfile b/bitnami/mysql/5.7/debian-11/Dockerfile
index 402f5ed08c5d5..8c28c5d986490 100644
--- a/bitnami/mysql/5.7/debian-11/Dockerfile
+++ b/bitnami/mysql/5.7/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-07-28T00:22:45Z" \
+      org.opencontainers.image.created="2023-07-31T01:52:08Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.7.43-debian-11-r10" \
+      org.opencontainers.image.ref.name="5.7.43-debian-11-r13" \
       org.opencontainers.image.title="mysql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="5.7.43"
diff --git a/bitnami/mysql/8.0/debian-11/Dockerfile b/bitnami/mysql/8.0/debian-11/Dockerfile
index 77dd413bf596e..ccc20587affa7 100644
--- a/bitnami/mysql/8.0/debian-11/Dockerfile
+++ b/bitnami/mysql/8.0/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-07-28T00:54:17Z" \
+      org.opencontainers.image.created="2023-07-31T03:01:01Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.0.34-debian-11-r10" \
+      org.opencontainers.image.ref.name="8.0.34-debian-11-r13" \
       org.opencontainers.image.title="mysql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.0.34"
diff --git a/bitnami/mysqld-exporter/0/debian-11/Dockerfile b/bitnami/mysqld-exporter/0/debian-11/Dockerfile
index 42e6992ad09dc..53f551ceeddf8 100644
--- a/bitnami/mysqld-exporter/0/debian-11/Dockerfile
+++ b/bitnami/mysqld-exporter/0/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-07-27T19:38:39Z" \
+      org.opencontainers.image.created="2023-07-30T21:02:51Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.15.0-debian-11-r2" \
+      org.opencontainers.image.ref.name="0.15.0-debian-11-r5" \
       org.opencontainers.image.title="mysqld-exporter" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.15.0"
diff --git a/bitnami/nats-exporter/0/debian-11/Dockerfile b/bitnami/nats-exporter/0/debian-11/Dockerfile
index 02b48f76ced3b..a298c018c8de7 100644
--- a/bitnami/nats-exporter/0/debian-11/Dockerfile
+++ b/bitnami/nats-exporter/0/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-07-28T00:28:50Z" \
+      org.opencontainers.image.created="2023-07-31T01:30:48Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.12.0-debian-11-r30" \
+      org.opencontainers.image.ref.name="0.12.0-debian-11-r33" \
       org.opencontainers.image.title="nats-exporter" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.12.0"
diff --git a/bitnami/nats/2/debian-11/Dockerfile b/bitnami/nats/2/debian-11/Dockerfile
index 8a0e18edf31a3..3c67c825f323a 100644
--- a/bitnami/nats/2/debian-11/Dockerfile
+++ b/bitnami/nats/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-07-28T00:41:36Z" \
+      org.opencontainers.image.created="2023-07-31T01:46:53Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.9.20-debian-11-r14" \
+      org.opencontainers.image.ref.name="2.9.20-debian-11-r17" \
       org.opencontainers.image.title="nats" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.9.20"
diff --git a/bitnami/neo4j/4/debian-11/Dockerfile b/bitnami/neo4j/4/debian-11/Dockerfile
index 9b57e6e7be236..6ef2737c647d1 100644
--- a/bitnami/neo4j/4/debian-11/Dockerfile
+++ b/bitnami/neo4j/4/debian-11/Dockerfile
@@ -8,10 +8,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-07-28T00:59:54Z" \
+      org.opencontainers.image.created="2023-07-31T17:34:10Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.4.23-debian-11-r16" \
+      org.opencontainers.image.ref.name="4.4.23-debian-11-r17" \
       org.opencontainers.image.title="neo4j" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.4.23"
diff --git a/bitnami/nginx-exporter/0/debian-11/Dockerfile b/bitnami/nginx-exporter/0/debian-11/Dockerfile
index f334fc6af974c..1644e1b025116 100644
--- a/bitnami/nginx-exporter/0/debian-11/Dockerfile
+++ b/bitnami/nginx-exporter/0/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-07-28T00:47:26Z" \
+      org.opencontainers.image.created="2023-07-31T01:47:02Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.11.0-debian-11-r302" \
+      org.opencontainers.image.ref.name="0.11.0-debian-11-r305" \
       org.opencontainers.image.title="nginx-exporter" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.11.0"
diff --git a/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile b/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile
index bb21a22d52dde..5cbae1e2f45cc 100644
--- a/bitnami/nginx-ingress-controller/1/debian-11/Dockerfile
+++ b/bitnami/nginx-ingress-controller/1/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-07-28T01:10:05Z" \
+      org.opencontainers.image.created="2023-07-31T02:42:19Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.8.1-debian-11-r26" \
+      org.opencontainers.image.ref.name="1.8.1-debian-11-r29" \
       org.opencontainers.image.title="nginx-ingress-controller" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.8.1"
diff --git a/bitnami/nginx/1.24/debian-11/Dockerfile b/bitnami/nginx/1.24/debian-11/Dockerfile
index 1c953255f5731..cb4eb15d42919 100644
--- a/bitnami/nginx/1.24/debian-11/Dockerfile
+++ b/bitnami/nginx/1.24/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-07-28T01:12:19Z" \
+      org.opencontainers.image.created="2023-07-31T17:58:47Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.24.0-debian-11-r92" \
+      org.opencontainers.image.ref.name="1.24.0-debian-11-r93" \
       org.opencontainers.image.title="nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.24.0"
diff --git a/bitnami/nginx/1.25/debian-11/Dockerfile b/bitnami/nginx/1.25/debian-11/Dockerfile
index 741bb40014edc..ecc3b82439ab3 100644
--- a/bitnami/nginx/1.25/debian-11/Dockerfile
+++ b/bitnami/nginx/1.25/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-07-28T01:28:05Z" \
+      org.opencontainers.image.created="2023-07-31T17:50:36Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.25.1-debian-11-r41" \
+      org.opencontainers.image.ref.name="1.25.1-debian-11-r42" \
       org.opencontainers.image.title="nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.25.1"
diff --git a/bitnami/node-exporter/1/debian-11/Dockerfile b/bitnami/node-exporter/1/debian-11/Dockerfile
index 6d2e0cae80908..f13fab63b9c19 100644
--- a/bitnami/node-exporter/1/debian-11/Dockerfile
+++ b/bitnami/node-exporter/1/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-07-28T01:28:24Z" \
+      org.opencontainers.image.created="2023-07-31T02:56:20Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.6.1-debian-11-r10" \
+      org.opencontainers.image.ref.name="1.6.1-debian-11-r13" \
       org.opencontainers.image.title="node-exporter" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.6.1"
diff --git a/bitnami/node/16/debian-11/Dockerfile b/bitnami/node/16/debian-11/Dockerfile
index b360e74944149..11ac7a7e5d096 100644
--- a/bitnami/node/16/debian-11/Dockerfile
+++ b/bitnami/node/16/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-07-28T14:21:18Z" \
+      org.opencontainers.image.created="2023-07-31T15:57:29Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="16.20.1-debian-11-r35" \
+      org.opencontainers.image.ref.name="16.20.1-debian-11-r38" \
       org.opencontainers.image.title="node" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="16.20.1"
diff --git a/bitnami/node/18/debian-11/Dockerfile b/bitnami/node/18/debian-11/Dockerfile
index ca477d301d32a..c8c968d459d7c 100644
--- a/bitnami/node/18/debian-11/Dockerfile
+++ b/bitnami/node/18/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-07-28T14:22:26Z" \
+      org.opencontainers.image.created="2023-07-31T15:56:42Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="18.17.0-debian-11-r10" \
+      org.opencontainers.image.ref.name="18.17.0-debian-11-r13" \
       org.opencontainers.image.title="node" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="18.17.0"
diff --git a/bitnami/node/20/debian-11/Dockerfile b/bitnami/node/20/debian-11/Dockerfile
index 79134bf36f694..a95d96e0446f6 100644
--- a/bitnami/node/20/debian-11/Dockerfile
+++ b/bitnami/node/20/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-07-28T14:27:12Z" \
+      org.opencontainers.image.created="2023-07-31T15:54:43Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="20.5.0-debian-11-r8" \
+      org.opencontainers.image.ref.name="20.5.0-debian-11-r11" \
       org.opencontainers.image.title="node" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="20.5.0"
diff --git a/bitnami/oauth2-proxy/7/debian-11/Dockerfile b/bitnami/oauth2-proxy/7/debian-11/Dockerfile
index 68bdc1129b62a..5d47442d2da10 100644
--- a/bitnami/oauth2-proxy/7/debian-11/Dockerfile
+++ b/bitnami/oauth2-proxy/7/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-07-28T01:43:09Z" \
+      org.opencontainers.image.created="2023-07-31T03:23:14Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.4.0-debian-11-r254" \
+      org.opencontainers.image.ref.name="7.4.0-debian-11-r257" \
       org.opencontainers.image.title="oauth2-proxy" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.4.0"
diff --git a/bitnami/odoo/14/debian-11/Dockerfile b/bitnami/odoo/14/debian-11/Dockerfile
index e7a316d896507..cff551c9ab893 100644
--- a/bitnami/odoo/14/debian-11/Dockerfile
+++ b/bitnami/odoo/14/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-07-28T02:52:13Z" \
+      org.opencontainers.image.created="2023-07-31T05:33:30Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="14.0.20230710-debian-11-r17" \
+      org.opencontainers.image.ref.name="14.0.20230710-debian-11-r20" \
       org.opencontainers.image.title="odoo" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="14.0.20230710"
@@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "python-3.8.17-4-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-10-linux-${OS_ARCH}-debian-11" \
       "postgresql-client-15.3.0-2-linux-${OS_ARCH}-debian-11" \
-      "node-18.17.0-1-linux-${OS_ARCH}-debian-11" \
+      "node-18.17.0-2-linux-${OS_ARCH}-debian-11" \
       "odoo-14.0.20230710-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index e87dd3c74874a..a3ea348e27ee0 100644
--- a/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/odoo/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "18.17.0-1"
+        "version": "18.17.0-2"
     },
     "odoo": {
         "arch": "amd64",
diff --git a/bitnami/odoo/15/debian-11/Dockerfile b/bitnami/odoo/15/debian-11/Dockerfile
index 341f89c992448..7760cc9bb7b09 100644
--- a/bitnami/odoo/15/debian-11/Dockerfile
+++ b/bitnami/odoo/15/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-07-28T03:46:01Z" \
+      org.opencontainers.image.created="2023-07-31T06:50:27Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="15.0.20230710-debian-11-r16" \
+      org.opencontainers.image.ref.name="15.0.20230710-debian-11-r19" \
       org.opencontainers.image.title="odoo" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="15.0.20230710"
@@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "python-3.10.12-4-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-10-linux-${OS_ARCH}-debian-11" \
       "postgresql-client-15.3.0-2-linux-${OS_ARCH}-debian-11" \
-      "node-18.17.0-1-linux-${OS_ARCH}-debian-11" \
+      "node-18.17.0-2-linux-${OS_ARCH}-debian-11" \
       "odoo-15.0.20230710-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index f4d4ce56ea8aa..63b91d1e7cad9 100644
--- a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "18.17.0-1"
+        "version": "18.17.0-2"
     },
     "odoo": {
         "arch": "amd64",
diff --git a/bitnami/odoo/16/debian-11/Dockerfile b/bitnami/odoo/16/debian-11/Dockerfile
index 4aa3555f69dd2..571a31e6224f9 100644
--- a/bitnami/odoo/16/debian-11/Dockerfile
+++ b/bitnami/odoo/16/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-07-28T04:44:52Z" \
+      org.opencontainers.image.created="2023-07-31T07:56:01Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="16.0.20230715-debian-11-r11" \
+      org.opencontainers.image.ref.name="16.0.20230715-debian-11-r14" \
       org.opencontainers.image.title="odoo" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="16.0.20230715"
@@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "python-3.10.12-4-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.5-10-linux-${OS_ARCH}-debian-11" \
       "postgresql-client-15.3.0-2-linux-${OS_ARCH}-debian-11" \
-      "node-18.17.0-1-linux-${OS_ARCH}-debian-11" \
+      "node-18.17.0-2-linux-${OS_ARCH}-debian-11" \
       "odoo-16.0.20230715-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index f075485c6cf0f..ef7c20e3f5d1b 100644
--- a/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/odoo/16/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "18.17.0-1"
+        "version": "18.17.0-2"
     },
     "odoo": {
         "arch": "amd64",
diff --git a/bitnami/opencart/4/debian-11/Dockerfile b/bitnami/opencart/4/debian-11/Dockerfile
index 4bd0d70d46b16..3a10b3200f0bd 100644
--- a/bitnami/opencart/4/debian-11/Dockerfile
+++ b/bitnami/opencart/4/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-07-28T02:55:08Z" \
+      org.opencontainers.image.created="2023-07-31T18:21:15Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.0.2-2-debian-11-r17" \
+      org.opencontainers.image.ref.name="4.0.2-2-debian-11-r18" \
       org.opencontainers.image.title="opencart" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.0.2-2"
diff --git a/bitnami/openldap/2.5/debian-11/Dockerfile b/bitnami/openldap/2.5/debian-11/Dockerfile
index 9554a29cc4119..c58f329591f46 100644
--- a/bitnami/openldap/2.5/debian-11/Dockerfile
+++ b/bitnami/openldap/2.5/debian-11/Dockerfile
@@ -7,13 +7,13 @@ 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-07-29T02:10:24Z" \
+      org.opencontainers.image.created="2023-08-01T01:40:27Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.5.15-debian-11-r17" \
+      org.opencontainers.image.ref.name="2.5.16-debian-11-r0" \
       org.opencontainers.image.title="openldap" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="2.5.15"
+      org.opencontainers.image.version="2.5.16"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-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 libsasl2-2 libssl1.1 libtirpc3 libwrap0 mdbtools procps psmisc
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "openldap-2.5.15-1-linux-${OS_ARCH}-debian-11" \
+      "openldap-2.5.16-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/openldap/postunpack.sh
-ENV APP_VERSION="2.5.15" \
+ENV APP_VERSION="2.5.16" \
     BITNAMI_APP_NAME="openldap" \
     PATH="/opt/bitnami/openldap/bin:/opt/bitnami/openldap/sbin:$PATH"
 
diff --git a/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 7aa4982e775cf..d00b77aee474e 100644
--- a/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/openldap/2.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.5.15-1"
+        "version": "2.5.16-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/openldap/2.5/debian-11/tags-info.yaml b/bitnami/openldap/2.5/debian-11/tags-info.yaml
index 16d726ef3095e..9a839a887c1bb 100644
--- a/bitnami/openldap/2.5/debian-11/tags-info.yaml
+++ b/bitnami/openldap/2.5/debian-11/tags-info.yaml
@@ -1,4 +1,4 @@
 rolling-tags:
 - "2.5"
 - 2.5-debian-11
-- 2.5.15
+- 2.5.16
diff --git a/bitnami/openldap/2.6/debian-11/Dockerfile b/bitnami/openldap/2.6/debian-11/Dockerfile
index 59d687847b168..42345ba12baad 100644
--- a/bitnami/openldap/2.6/debian-11/Dockerfile
+++ b/bitnami/openldap/2.6/debian-11/Dockerfile
@@ -7,13 +7,13 @@ 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-07-28T02:27:18Z" \
+      org.opencontainers.image.created="2023-08-01T02:00:39Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.6.5-debian-11-r16" \
+      org.opencontainers.image.ref.name="2.6.6-debian-11-r0" \
       org.opencontainers.image.title="openldap" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="2.6.5"
+      org.opencontainers.image.version="2.6.6"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-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 libodbc1 libperl5.32 libsasl2-2 libssl1.1 libtirpc3 libwrap0 mdbtools procps psmisc
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "openldap-2.6.5-1-linux-${OS_ARCH}-debian-11" \
+      "openldap-2.6.6-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/openldap/postunpack.sh
-ENV APP_VERSION="2.6.5" \
+ENV APP_VERSION="2.6.6" \
     BITNAMI_APP_NAME="openldap" \
     PATH="/opt/bitnami/openldap/bin:/opt/bitnami/openldap/sbin:$PATH"
 
diff --git a/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 7e2a70a5ac97d..7ef46ef67ae0e 100644
--- a/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.6.5-1"
+        "version": "2.6.6-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/openldap/2.6/debian-11/tags-info.yaml b/bitnami/openldap/2.6/debian-11/tags-info.yaml
index 837e39d1c36d3..c89083ab9d4af 100644
--- a/bitnami/openldap/2.6/debian-11/tags-info.yaml
+++ b/bitnami/openldap/2.6/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "2.6"
 - 2.6-debian-11
-- 2.6.5
+- 2.6.6
 - latest
diff --git a/bitnami/openresty/1.21/debian-11/Dockerfile b/bitnami/openresty/1.21/debian-11/Dockerfile
index 3dc3fa56bd3e1..6e32c9121b7b8 100644
--- a/bitnami/openresty/1.21/debian-11/Dockerfile
+++ b/bitnami/openresty/1.21/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-07-28T02:17:21Z" \
+      org.opencontainers.image.created="2023-07-31T03:34:01Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.21.4-2-debian-11-r8" \
+      org.opencontainers.image.ref.name="1.21.4-2-debian-11-r11" \
       org.opencontainers.image.title="openresty" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.21.4-2"
diff --git a/bitnami/opensearch-dashboards/1/debian-11/Dockerfile b/bitnami/opensearch-dashboards/1/debian-11/Dockerfile
index 62caadaa471e0..3d7f026670c38 100644
--- a/bitnami/opensearch-dashboards/1/debian-11/Dockerfile
+++ b/bitnami/opensearch-dashboards/1/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-07-28T02:54:46Z" \
+      org.opencontainers.image.created="2023-07-31T04:43:25Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.3.11-debian-11-r9" \
+      org.opencontainers.image.ref.name="1.3.11-debian-11-r12" \
       org.opencontainers.image.title="opensearch-dashboards" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.3.11"
diff --git a/bitnami/opensearch/1/debian-11/Dockerfile b/bitnami/opensearch/1/debian-11/Dockerfile
index 1eadcb0505518..ea3b4a9491fdd 100644
--- a/bitnami/opensearch/1/debian-11/Dockerfile
+++ b/bitnami/opensearch/1/debian-11/Dockerfile
@@ -9,10 +9,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-07-28T03:11:34Z" \
+      org.opencontainers.image.created="2023-07-31T05:08:25Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.3.10-debian-11-r13" \
+      org.opencontainers.image.ref.name="1.3.10-debian-11-r16" \
       org.opencontainers.image.title="opensearch" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.3.10"
diff --git a/bitnami/opensearch/1/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh b/bitnami/opensearch/1/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh
index 8f15178073539..ff0bba9258b37 100644
--- a/bitnami/opensearch/1/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh
+++ b/bitnami/opensearch/1/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh
@@ -445,19 +445,23 @@ elasticsearch_validate() {
                 print_validation_error "Opensearch does not support plaintext conections (HTTP) when Security is enabled."
             fi
         fi
-        if is_boolean_yes "$DB_TRANSPORT_TLS_USE_PEM"; then
-            if [[ ! -f "$DB_TRANSPORT_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_CA_CERT_LOCATION" ]]; then
-                print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport you must provide your node key, certificate and a valid certification_authority certificate."
+        if ! is_boolean_yes "$DB_SKIP_TRANSPORT_TLS"; then
+            if is_boolean_yes "$DB_TRANSPORT_TLS_USE_PEM"; then
+                if [[ ! -f "$DB_TRANSPORT_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_CA_CERT_LOCATION" ]]; then
+                    print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport you must provide your node key, certificate and a valid certification_authority certificate."
+                fi
+            elif [[ ! -f "$DB_TRANSPORT_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_TRUSTSTORE_LOCATION" ]]; then
+                print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport with JKS/PKCS12 certs you must mount a valid keystore and truststore."
             fi
-        elif [[ ! -f "$DB_TRANSPORT_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_TRUSTSTORE_LOCATION" ]]; then
-            print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport with JKS/PKCS12 certs you must mount a valid keystore and truststore."
         fi
         if is_boolean_yes "$DB_HTTP_TLS_USE_PEM"; then
-            if [[ ! -f "$DB_HTTP_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_CA_CERT_LOCATION" ]]; then
-                print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} you must provide your node key, certificate and a valid certification_authority certificate."
+            if is_boolean_yes "$DB_HTTP_TLS_USE_PEM"; then
+                if [[ ! -f "$DB_HTTP_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_CA_CERT_LOCATION" ]]; then
+                    print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} you must provide your node key, certificate and a valid certification_authority certificate."
+                fi
+            elif [[ ! -f "$DB_HTTP_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_TRUSTSTORE_LOCATION" ]]; then
+                print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} with JKS/PKCS12 certs you must mount a valid keystore and truststore."
             fi
-        elif [[ ! -f "$DB_HTTP_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_TRUSTSTORE_LOCATION" ]]; then
-            print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} with JKS/PKCS12 certs you must mount a valid keystore and truststore."
         fi
     fi
 
diff --git a/bitnami/opensearch/2/debian-11/Dockerfile b/bitnami/opensearch/2/debian-11/Dockerfile
index 93a2633602f32..c065f1c5eb5ad 100644
--- a/bitnami/opensearch/2/debian-11/Dockerfile
+++ b/bitnami/opensearch/2/debian-11/Dockerfile
@@ -9,10 +9,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-07-28T03:45:20Z" \
+      org.opencontainers.image.created="2023-07-31T05:48:21Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.9.0-debian-11-r2" \
+      org.opencontainers.image.ref.name="2.9.0-debian-11-r5" \
       org.opencontainers.image.title="opensearch" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.9.0"
diff --git a/bitnami/opensearch/2/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh b/bitnami/opensearch/2/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh
index 8f15178073539..ff0bba9258b37 100644
--- a/bitnami/opensearch/2/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh
+++ b/bitnami/opensearch/2/debian-11/rootfs/opt/bitnami/scripts/libopensearch.sh
@@ -445,19 +445,23 @@ elasticsearch_validate() {
                 print_validation_error "Opensearch does not support plaintext conections (HTTP) when Security is enabled."
             fi
         fi
-        if is_boolean_yes "$DB_TRANSPORT_TLS_USE_PEM"; then
-            if [[ ! -f "$DB_TRANSPORT_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_CA_CERT_LOCATION" ]]; then
-                print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport you must provide your node key, certificate and a valid certification_authority certificate."
+        if ! is_boolean_yes "$DB_SKIP_TRANSPORT_TLS"; then
+            if is_boolean_yes "$DB_TRANSPORT_TLS_USE_PEM"; then
+                if [[ ! -f "$DB_TRANSPORT_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_CA_CERT_LOCATION" ]]; then
+                    print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport you must provide your node key, certificate and a valid certification_authority certificate."
+                fi
+            elif [[ ! -f "$DB_TRANSPORT_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_TRUSTSTORE_LOCATION" ]]; then
+                print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport with JKS/PKCS12 certs you must mount a valid keystore and truststore."
             fi
-        elif [[ ! -f "$DB_TRANSPORT_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_TRANSPORT_TLS_TRUSTSTORE_LOCATION" ]]; then
-            print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} Transport with JKS/PKCS12 certs you must mount a valid keystore and truststore."
         fi
         if is_boolean_yes "$DB_HTTP_TLS_USE_PEM"; then
-            if [[ ! -f "$DB_HTTP_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_CA_CERT_LOCATION" ]]; then
-                print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} you must provide your node key, certificate and a valid certification_authority certificate."
+            if is_boolean_yes "$DB_HTTP_TLS_USE_PEM"; then
+                if [[ ! -f "$DB_HTTP_TLS_NODE_CERT_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_NODE_KEY_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_CA_CERT_LOCATION" ]]; then
+                    print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} you must provide your node key, certificate and a valid certification_authority certificate."
+                fi
+            elif [[ ! -f "$DB_HTTP_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_TRUSTSTORE_LOCATION" ]]; then
+                print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} with JKS/PKCS12 certs you must mount a valid keystore and truststore."
             fi
-        elif [[ ! -f "$DB_HTTP_TLS_KEYSTORE_LOCATION" ]] || [[ ! -f "$DB_HTTP_TLS_TRUSTSTORE_LOCATION" ]]; then
-            print_validation_error "In order to configure the TLS encryption for ${DB_FLAVOR^} with JKS/PKCS12 certs you must mount a valid keystore and truststore."
         fi
     fi
 
diff --git a/bitnami/osclass/8/debian-11/Dockerfile b/bitnami/osclass/8/debian-11/Dockerfile
index 6fba5c614f7a2..e3fc54cb2b782 100644
--- a/bitnami/osclass/8/debian-11/Dockerfile
+++ b/bitnami/osclass/8/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-07-28T03:11:43Z" \
+      org.opencontainers.image.created="2023-07-31T17:34:29Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.1.2-debian-11-r35" \
+      org.opencontainers.image.ref.name="8.1.2-debian-11-r36" \
       org.opencontainers.image.title="osclass" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.1.2"
diff --git a/bitnami/parse-dashboard/5/debian-11/Dockerfile b/bitnami/parse-dashboard/5/debian-11/Dockerfile
index e0ce4bfd64a99..ff967ca773123 100644
--- a/bitnami/parse-dashboard/5/debian-11/Dockerfile
+++ b/bitnami/parse-dashboard/5/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-07-28T03:08:03Z" \
+      org.opencontainers.image.created="2023-07-31T04:51:20Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.1.0-debian-11-r83" \
+      org.opencontainers.image.ref.name="5.1.0-debian-11-r86" \
       org.opencontainers.image.title="parse-dashboard" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="5.1.0"
@@ -27,7 +27,7 @@ RUN install_packages ca-certificates curl jq libbz2-1.0 libcom-err2 libcrypt1 li
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "python-3.9.17-4-linux-${OS_ARCH}-debian-11" \
-      "node-16.20.1-1-linux-${OS_ARCH}-debian-11" \
+      "node-16.20.1-2-linux-${OS_ARCH}-debian-11" \
       "parse-dashboard-5.1.0-4-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index aef4da37e9ad6..10a1341fe9285 100644
--- a/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "16.20.1-1"
+        "version": "16.20.1-2"
     },
     "parse-dashboard": {
         "arch": "amd64",
diff --git a/bitnami/parse/6/debian-11/Dockerfile b/bitnami/parse/6/debian-11/Dockerfile
index f3f613b4fb72b..57fa90a0979b5 100644
--- a/bitnami/parse/6/debian-11/Dockerfile
+++ b/bitnami/parse/6/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-07-28T03:16:15Z" \
+      org.opencontainers.image.created="2023-07-31T04:59:55Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.2.1-debian-11-r27" \
+      org.opencontainers.image.ref.name="6.2.1-debian-11-r30" \
       org.opencontainers.image.title="parse" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="6.2.1"
@@ -27,8 +27,8 @@ RUN install_packages ca-certificates curl jq libbz2-1.0 libcom-err2 libcrypt1 li
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "python-3.9.17-4-linux-${OS_ARCH}-debian-11" \
-      "node-16.20.1-1-linux-${OS_ARCH}-debian-11" \
-      "mongodb-shell-1.10.1-1-linux-${OS_ARCH}-debian-11" \
+      "node-16.20.1-2-linux-${OS_ARCH}-debian-11" \
+      "mongodb-shell-1.10.2-0-linux-${OS_ARCH}-debian-11" \
       "parse-6.2.1-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index d8aa6abc14755..a077a41176c52 100644
--- a/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/parse/6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,13 +3,13 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.10.1-1"
+        "version": "1.10.2-0"
     },
     "node": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "16.20.1-1"
+        "version": "16.20.1-2"
     },
     "parse": {
         "arch": "amd64",
diff --git a/bitnami/percona-mysql/5.7/debian-11/Dockerfile b/bitnami/percona-mysql/5.7/debian-11/Dockerfile
index 8f6c1c398cfd4..7e21a214541eb 100644
--- a/bitnami/percona-mysql/5.7/debian-11/Dockerfile
+++ b/bitnami/percona-mysql/5.7/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-07-28T03:16:24Z" \
+      org.opencontainers.image.created="2023-07-31T05:00:59Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.7.42-46-debian-11-r52" \
+      org.opencontainers.image.ref.name="5.7.42-46-debian-11-r55" \
       org.opencontainers.image.title="percona-mysql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="5.7.42-46"
diff --git a/bitnami/percona-mysql/8.0/debian-11/Dockerfile b/bitnami/percona-mysql/8.0/debian-11/Dockerfile
index 7c0a5dab2a15f..9cb369add6341 100644
--- a/bitnami/percona-mysql/8.0/debian-11/Dockerfile
+++ b/bitnami/percona-mysql/8.0/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-07-28T03:39:03Z" \
+      org.opencontainers.image.created="2023-07-31T05:01:59Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.0.33-25-debian-11-r40" \
+      org.opencontainers.image.ref.name="8.0.33-25-debian-11-r43" \
       org.opencontainers.image.title="percona-mysql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.0.33-25"
diff --git a/bitnami/percona-xtrabackup/2.4/debian-11/Dockerfile b/bitnami/percona-xtrabackup/2.4/debian-11/Dockerfile
index 0011272626b93..2f62eb7056d1c 100644
--- a/bitnami/percona-xtrabackup/2.4/debian-11/Dockerfile
+++ b/bitnami/percona-xtrabackup/2.4/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-07-28T03:13:19Z" \
+      org.opencontainers.image.created="2023-07-31T04:18:23Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.4.28-debian-11-r104" \
+      org.opencontainers.image.ref.name="2.4.28-debian-11-r107" \
       org.opencontainers.image.title="percona-xtrabackup" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.4.28"
diff --git a/bitnami/percona-xtrabackup/8/debian-11/Dockerfile b/bitnami/percona-xtrabackup/8/debian-11/Dockerfile
index 3f1720facff47..7b7d0451ac355 100644
--- a/bitnami/percona-xtrabackup/8/debian-11/Dockerfile
+++ b/bitnami/percona-xtrabackup/8/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-07-28T03:18:54Z" \
+      org.opencontainers.image.created="2023-07-31T04:27:46Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.0.33-28-debian-11-r8" \
+      org.opencontainers.image.ref.name="8.0.33-28-debian-11-r11" \
       org.opencontainers.image.title="percona-xtrabackup" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.0.33-28"
diff --git a/bitnami/pgbouncer/1/debian-11/Dockerfile b/bitnami/pgbouncer/1/debian-11/Dockerfile
index 31567d55b5a8c..b8260be35ef4b 100644
--- a/bitnami/pgbouncer/1/debian-11/Dockerfile
+++ b/bitnami/pgbouncer/1/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-07-29T03:50:28Z" \
+      org.opencontainers.image.created="2023-07-31T04:43:42Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.20.0-debian-11-r8" \
+      org.opencontainers.image.ref.name="1.20.0-debian-11-r10" \
       org.opencontainers.image.title="pgbouncer" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.20.0"
diff --git a/bitnami/pgpool/4/debian-11/Dockerfile b/bitnami/pgpool/4/debian-11/Dockerfile
index bbe84dd8b7215..b79b6e9270537 100644
--- a/bitnami/pgpool/4/debian-11/Dockerfile
+++ b/bitnami/pgpool/4/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-07-28T03:32:17Z" \
+      org.opencontainers.image.created="2023-07-31T06:40:01Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.4.3-debian-11-r60" \
+      org.opencontainers.image.ref.name="4.4.3-debian-11-r63" \
       org.opencontainers.image.title="pgpool" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.4.3"
diff --git a/bitnami/php-fpm/8.0/debian-11/Dockerfile b/bitnami/php-fpm/8.0/debian-11/Dockerfile
index 309df93bb9a30..8f50b53e54aa8 100644
--- a/bitnami/php-fpm/8.0/debian-11/Dockerfile
+++ b/bitnami/php-fpm/8.0/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-07-28T03:47:22Z" \
+      org.opencontainers.image.created="2023-07-31T17:41:55Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.0.29-debian-11-r47" \
+      org.opencontainers.image.ref.name="8.0.29-debian-11-r48" \
       org.opencontainers.image.title="php-fpm" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.0.29"
diff --git a/bitnami/php-fpm/8.1/debian-11/Dockerfile b/bitnami/php-fpm/8.1/debian-11/Dockerfile
index 16ecda3a9e32b..3f2798a1d0c48 100644
--- a/bitnami/php-fpm/8.1/debian-11/Dockerfile
+++ b/bitnami/php-fpm/8.1/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-07-28T04:05:38Z" \
+      org.opencontainers.image.created="2023-07-31T17:53:17Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.1.21-debian-11-r22" \
+      org.opencontainers.image.ref.name="8.1.21-debian-11-r23" \
       org.opencontainers.image.title="php-fpm" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.1.21"
diff --git a/bitnami/php-fpm/8.2/debian-11/Dockerfile b/bitnami/php-fpm/8.2/debian-11/Dockerfile
index 2efe909677d7e..b1f73dceb34fc 100644
--- a/bitnami/php-fpm/8.2/debian-11/Dockerfile
+++ b/bitnami/php-fpm/8.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-07-28T04:11:45Z" \
+      org.opencontainers.image.created="2023-07-31T18:06:35Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.2.8-debian-11-r22" \
+      org.opencontainers.image.ref.name="8.2.8-debian-11-r23" \
       org.opencontainers.image.title="php-fpm" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.2.8"
diff --git a/bitnami/phpbb/3/debian-11/Dockerfile b/bitnami/phpbb/3/debian-11/Dockerfile
index 77cabb5e824bf..8e745148dbbc4 100644
--- a/bitnami/phpbb/3/debian-11/Dockerfile
+++ b/bitnami/phpbb/3/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-07-28T04:05:01Z" \
+      org.opencontainers.image.created="2023-07-31T18:39:14Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.3.10-debian-11-r56" \
+      org.opencontainers.image.ref.name="3.3.10-debian-11-r57" \
       org.opencontainers.image.title="phpbb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.3.10"
diff --git a/bitnami/phpmyadmin/5/debian-11/Dockerfile b/bitnami/phpmyadmin/5/debian-11/Dockerfile
index 463fa0eb7567a..2b7bc2160b7e6 100644
--- a/bitnami/phpmyadmin/5/debian-11/Dockerfile
+++ b/bitnami/phpmyadmin/5/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-07-28T04:09:49Z" \
+      org.opencontainers.image.created="2023-07-31T18:38:32Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.2.1-debian-11-r59" \
+      org.opencontainers.image.ref.name="5.2.1-debian-11-r60" \
       org.opencontainers.image.title="phpmyadmin" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="5.2.1"
diff --git a/bitnami/postgres-exporter/0/debian-11/Dockerfile b/bitnami/postgres-exporter/0/debian-11/Dockerfile
index 6340ab6d6eb35..f6b7651d14732 100644
--- a/bitnami/postgres-exporter/0/debian-11/Dockerfile
+++ b/bitnami/postgres-exporter/0/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-07-29T04:23:28Z" \
+      org.opencontainers.image.created="2023-07-31T04:59:25Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.13.2-debian-11-r4" \
+      org.opencontainers.image.ref.name="0.13.2-debian-11-r6" \
       org.opencontainers.image.title="postgres-exporter" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.13.2"
diff --git a/bitnami/postgresql-repmgr/11/debian-11/Dockerfile b/bitnami/postgresql-repmgr/11/debian-11/Dockerfile
index 0c208b99b7157..1a3f3264e0b95 100644
--- a/bitnami/postgresql-repmgr/11/debian-11/Dockerfile
+++ b/bitnami/postgresql-repmgr/11/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-07-27T22:40:17Z" \
+      org.opencontainers.image.created="2023-07-31T17:49:20Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="11.20.0-debian-11-r76" \
+      org.opencontainers.image.ref.name="11.20.0-debian-11-r77" \
       org.opencontainers.image.title="postgresql-repmgr" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="11.20.0"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "postgresql-repmgr-11.20.0-7-linux-${OS_ARCH}-debian-11" \
+      "postgresql-repmgr-11.20.0-8-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 14de7d5f531f8..67726b9b5c1e9 100644
--- a/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql-repmgr/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "11.20.0-7"
+        "version": "11.20.0-8"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgresql-repmgr/12/debian-11/Dockerfile b/bitnami/postgresql-repmgr/12/debian-11/Dockerfile
index d66fa27722397..8bacf2100c230 100644
--- a/bitnami/postgresql-repmgr/12/debian-11/Dockerfile
+++ b/bitnami/postgresql-repmgr/12/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-07-27T22:46:21Z" \
+      org.opencontainers.image.created="2023-07-31T17:34:18Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="12.15.0-debian-11-r75" \
+      org.opencontainers.image.ref.name="12.15.0-debian-11-r76" \
       org.opencontainers.image.title="postgresql-repmgr" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="12.15.0"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "postgresql-repmgr-12.15.0-7-linux-${OS_ARCH}-debian-11" \
+      "postgresql-repmgr-12.15.0-8-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index f51809e9773cf..607157ecba499 100644
--- a/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql-repmgr/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "12.15.0-7"
+        "version": "12.15.0-8"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgresql-repmgr/13/debian-11/Dockerfile b/bitnami/postgresql-repmgr/13/debian-11/Dockerfile
index 151c8317daa90..535f0c1ee7da4 100644
--- a/bitnami/postgresql-repmgr/13/debian-11/Dockerfile
+++ b/bitnami/postgresql-repmgr/13/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-07-27T22:53:12Z" \
+      org.opencontainers.image.created="2023-07-31T17:34:48Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="13.11.0-debian-11-r73" \
+      org.opencontainers.image.ref.name="13.11.0-debian-11-r74" \
       org.opencontainers.image.title="postgresql-repmgr" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="13.11.0"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "postgresql-repmgr-13.11.0-7-linux-${OS_ARCH}-debian-11" \
+      "postgresql-repmgr-13.11.0-8-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 6c7e4445aab68..d24ebbffa9acc 100644
--- a/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql-repmgr/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "13.11.0-7"
+        "version": "13.11.0-8"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgresql-repmgr/14/debian-11/Dockerfile b/bitnami/postgresql-repmgr/14/debian-11/Dockerfile
index 8d2da9e30694e..bf0ffe206553c 100644
--- a/bitnami/postgresql-repmgr/14/debian-11/Dockerfile
+++ b/bitnami/postgresql-repmgr/14/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-07-27T22:59:49Z" \
+      org.opencontainers.image.created="2023-07-31T18:38:34Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="14.8.0-debian-11-r75" \
+      org.opencontainers.image.ref.name="14.8.0-debian-11-r76" \
       org.opencontainers.image.title="postgresql-repmgr" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="14.8.0"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "postgresql-repmgr-14.8.0-7-linux-${OS_ARCH}-debian-11" \
+      "postgresql-repmgr-14.8.0-8-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 6b980bc3fd706..e1bbed1574afc 100644
--- a/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql-repmgr/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "14.8.0-7"
+        "version": "14.8.0-8"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgresql-repmgr/15/debian-11/Dockerfile b/bitnami/postgresql-repmgr/15/debian-11/Dockerfile
index 21d3ee9efeb89..d2c032ce359ee 100644
--- a/bitnami/postgresql-repmgr/15/debian-11/Dockerfile
+++ b/bitnami/postgresql-repmgr/15/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-07-27T23:05:41Z" \
+      org.opencontainers.image.created="2023-07-31T17:52:03Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="15.3.0-debian-11-r73" \
+      org.opencontainers.image.ref.name="15.3.0-debian-11-r74" \
       org.opencontainers.image.title="postgresql-repmgr" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="15.3.0"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbsd0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "postgresql-repmgr-15.3.0-6-linux-${OS_ARCH}-debian-11" \
+      "postgresql-repmgr-15.3.0-7-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index cf383a98f3b4b..0cba527f1c3ed 100644
--- a/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql-repmgr/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "15.3.0-6"
+        "version": "15.3.0-7"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgresql/11/debian-11/Dockerfile b/bitnami/postgresql/11/debian-11/Dockerfile
index 2add7c608b03c..472917c64a327 100644
--- a/bitnami/postgresql/11/debian-11/Dockerfile
+++ b/bitnami/postgresql/11/debian-11/Dockerfile
@@ -9,10 +9,10 @@ ARG WITH_ALL_LOCALES="no"
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-27T23:21:00Z" \
+      org.opencontainers.image.created="2023-07-31T18:37:21Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="11.20.0-debian-11-r76" \
+      org.opencontainers.image.ref.name="11.20.0-debian-11-r77" \
       org.opencontainers.image.title="postgresql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="11.20.0"
@@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbsd0 libbz2-1.0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "postgresql-11.20.0-10-linux-${OS_ARCH}-debian-11" \
+      "postgresql-11.20.0-11-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index d88ad9e1be469..eabaec802d0ef 100644
--- a/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql/11/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "11.20.0-10"
+        "version": "11.20.0-11"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgresql/12/debian-11/Dockerfile b/bitnami/postgresql/12/debian-11/Dockerfile
index fb0e99733f7e8..0119065e7e766 100644
--- a/bitnami/postgresql/12/debian-11/Dockerfile
+++ b/bitnami/postgresql/12/debian-11/Dockerfile
@@ -9,10 +9,10 @@ ARG WITH_ALL_LOCALES="no"
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-27T23:21:39Z" \
+      org.opencontainers.image.created="2023-07-31T18:37:12Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="12.15.0-debian-11-r76" \
+      org.opencontainers.image.ref.name="12.15.0-debian-11-r77" \
       org.opencontainers.image.title="postgresql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="12.15.0"
@@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbsd0 libbz2-1.0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "postgresql-12.15.0-9-linux-${OS_ARCH}-debian-11" \
+      "postgresql-12.15.0-10-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 5e963d61eff4d..25538e36be4cf 100644
--- a/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql/12/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "12.15.0-9"
+        "version": "12.15.0-10"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgresql/13/debian-11/Dockerfile b/bitnami/postgresql/13/debian-11/Dockerfile
index 9d97f704e1d2a..a06a9a81961d4 100644
--- a/bitnami/postgresql/13/debian-11/Dockerfile
+++ b/bitnami/postgresql/13/debian-11/Dockerfile
@@ -9,10 +9,10 @@ ARG WITH_ALL_LOCALES="no"
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-27T23:26:41Z" \
+      org.opencontainers.image.created="2023-07-31T18:37:49Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="13.11.0-debian-11-r74" \
+      org.opencontainers.image.ref.name="13.11.0-debian-11-r75" \
       org.opencontainers.image.title="postgresql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="13.11.0"
@@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbsd0 libbz2-1.0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "postgresql-13.11.0-9-linux-${OS_ARCH}-debian-11" \
+      "postgresql-13.11.0-10-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 76b405e41d324..2b04ff5be815a 100644
--- a/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql/13/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "13.11.0-9"
+        "version": "13.11.0-10"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgresql/14/debian-11/Dockerfile b/bitnami/postgresql/14/debian-11/Dockerfile
index 193731c0a508c..374ce08cbaf9b 100644
--- a/bitnami/postgresql/14/debian-11/Dockerfile
+++ b/bitnami/postgresql/14/debian-11/Dockerfile
@@ -9,10 +9,10 @@ ARG WITH_ALL_LOCALES="no"
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-27T23:30:10Z" \
+      org.opencontainers.image.created="2023-07-31T18:37:37Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="14.8.0-debian-11-r75" \
+      org.opencontainers.image.ref.name="14.8.0-debian-11-r76" \
       org.opencontainers.image.title="postgresql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="14.8.0"
@@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbsd0 libbz2-1.0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "postgresql-14.8.0-9-linux-${OS_ARCH}-debian-11" \
+      "postgresql-14.8.0-10-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 2783440c8d077..f0f755cf63486 100644
--- a/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql/14/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "14.8.0-9"
+        "version": "14.8.0-10"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgresql/15/debian-11/Dockerfile b/bitnami/postgresql/15/debian-11/Dockerfile
index f65ba5ee6b04b..e6e506a95ec9f 100644
--- a/bitnami/postgresql/15/debian-11/Dockerfile
+++ b/bitnami/postgresql/15/debian-11/Dockerfile
@@ -9,10 +9,10 @@ ARG WITH_ALL_LOCALES="no"
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-27T23:49:28Z" \
+      org.opencontainers.image.created="2023-07-31T17:03:18Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="15.3.0-debian-11-r76" \
+      org.opencontainers.image.ref.name="15.3.0-debian-11-r77" \
       org.opencontainers.image.title="postgresql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="15.3.0"
@@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbsd0 libbz2-1.0 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libmd0 libncurses6 libnettle8 libp11-kit0 libpcre3 libreadline8 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "postgresql-15.3.0-8-linux-${OS_ARCH}-debian-11" \
+      "postgresql-15.3.0-9-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 31f41df6fc997..2ca08c830dce6 100644
--- a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "15.3.0-8"
+        "version": "15.3.0-9"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgrest/11/debian-11/Dockerfile b/bitnami/postgrest/11/debian-11/Dockerfile
index 70500c7589d0b..40140a3a5d6e7 100644
--- a/bitnami/postgrest/11/debian-11/Dockerfile
+++ b/bitnami/postgrest/11/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-07-29T04:18:35Z" \
+      org.opencontainers.image.created="2023-07-31T04:44:00Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="11.1.0-debian-11-r48" \
+      org.opencontainers.image.ref.name="11.1.0-debian-11-r50" \
       org.opencontainers.image.title="postgrest" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="11.1.0"
diff --git a/bitnami/prestashop/8/debian-11/Dockerfile b/bitnami/prestashop/8/debian-11/Dockerfile
index 9fedaa7971654..1781469b39b1f 100644
--- a/bitnami/prestashop/8/debian-11/Dockerfile
+++ b/bitnami/prestashop/8/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-07-28T04:50:30Z" \
+      org.opencontainers.image.created="2023-07-31T18:33:41Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.1.0-debian-11-r15" \
+      org.opencontainers.image.ref.name="8.1.0-debian-11-r16" \
       org.opencontainers.image.title="prestashop" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.1.0"
diff --git a/bitnami/prometheus-operator/0/debian-11/Dockerfile b/bitnami/prometheus-operator/0/debian-11/Dockerfile
index e5d01f13c4183..d4f5c6cadeecd 100644
--- a/bitnami/prometheus-operator/0/debian-11/Dockerfile
+++ b/bitnami/prometheus-operator/0/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-07-28T15:36:01Z" \
+      org.opencontainers.image.created="2023-07-30T19:57:17Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.67.0-debian-11-r0" \
+      org.opencontainers.image.ref.name="0.67.0-debian-11-r2" \
       org.opencontainers.image.title="prometheus-operator" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.67.0"
diff --git a/bitnami/prometheus-rsocket-proxy/1/debian-11/Dockerfile b/bitnami/prometheus-rsocket-proxy/1/debian-11/Dockerfile
index 8ec0d417d3bb2..dce972794d8aa 100644
--- a/bitnami/prometheus-rsocket-proxy/1/debian-11/Dockerfile
+++ b/bitnami/prometheus-rsocket-proxy/1/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-07-28T04:17:32Z" \
+      org.opencontainers.image.created="2023-07-31T05:30:25Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.5.2-debian-11-r19" \
+      org.opencontainers.image.ref.name="1.5.2-debian-11-r22" \
       org.opencontainers.image.title="prometheus-rsocket-proxy" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.5.2"
diff --git a/bitnami/prometheus/2/debian-11/Dockerfile b/bitnami/prometheus/2/debian-11/Dockerfile
index 89ba52a45f916..9cb9ae47d11e1 100644
--- a/bitnami/prometheus/2/debian-11/Dockerfile
+++ b/bitnami/prometheus/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-07-29T04:45:16Z" \
+      org.opencontainers.image.created="2023-07-31T05:31:56Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.46.0-debian-11-r3" \
+      org.opencontainers.image.ref.name="2.46.0-debian-11-r5" \
       org.opencontainers.image.title="prometheus" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.46.0"
diff --git a/bitnami/promtail/2/debian-11/Dockerfile b/bitnami/promtail/2/debian-11/Dockerfile
index 49bbe76642b40..75ef8a74d648d 100644
--- a/bitnami/promtail/2/debian-11/Dockerfile
+++ b/bitnami/promtail/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-07-29T04:31:12Z" \
+      org.opencontainers.image.created="2023-07-31T05:07:45Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.8.3-debian-11-r7" \
+      org.opencontainers.image.ref.name="2.8.3-debian-11-r9" \
       org.opencontainers.image.title="promtail" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.8.3"
diff --git a/bitnami/pushgateway/1/debian-11/Dockerfile b/bitnami/pushgateway/1/debian-11/Dockerfile
index b8b7885a7f6c0..57201abbfce2a 100644
--- a/bitnami/pushgateway/1/debian-11/Dockerfile
+++ b/bitnami/pushgateway/1/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-07-29T04:40:44Z" \
+      org.opencontainers.image.created="2023-07-31T05:27:14Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.6.0-debian-11-r61" \
+      org.opencontainers.image.ref.name="1.6.0-debian-11-r63" \
       org.opencontainers.image.title="pushgateway" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.6.0"
diff --git a/bitnami/pymilvus/2/debian-11/Dockerfile b/bitnami/pymilvus/2/debian-11/Dockerfile
index 48e35153af003..7e6d5599e86eb 100644
--- a/bitnami/pymilvus/2/debian-11/Dockerfile
+++ b/bitnami/pymilvus/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-07-29T04:54:24Z" \
+      org.opencontainers.image.created="2023-07-31T05:46:27Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.2.14-debian-11-r3" \
+      org.opencontainers.image.ref.name="2.2.14-debian-11-r5" \
       org.opencontainers.image.title="pymilvus" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.2.14"
diff --git a/bitnami/python/3.10/debian-11/Dockerfile b/bitnami/python/3.10/debian-11/Dockerfile
index f9583f44f6635..7922b35b482dc 100644
--- a/bitnami/python/3.10/debian-11/Dockerfile
+++ b/bitnami/python/3.10/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-07-29T05:00:07Z" \
+      org.opencontainers.image.created="2023-07-31T05:54:47Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.10.12-debian-11-r49" \
+      org.opencontainers.image.ref.name="3.10.12-debian-11-r51" \
       org.opencontainers.image.title="python" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.10.12"
diff --git a/bitnami/python/3.11/debian-11/Dockerfile b/bitnami/python/3.11/debian-11/Dockerfile
index 1e0c97ac4bda9..30bd170cc544f 100644
--- a/bitnami/python/3.11/debian-11/Dockerfile
+++ b/bitnami/python/3.11/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-07-28T06:02:18Z" \
+      org.opencontainers.image.created="2023-07-31T07:24:50Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.11.4-debian-11-r49" \
+      org.opencontainers.image.ref.name="3.11.4-debian-11-r52" \
       org.opencontainers.image.title="python" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.11.4"
diff --git a/bitnami/python/3.8/debian-11/Dockerfile b/bitnami/python/3.8/debian-11/Dockerfile
index 3a4a3f5010637..6a25d279626ba 100644
--- a/bitnami/python/3.8/debian-11/Dockerfile
+++ b/bitnami/python/3.8/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-07-28T05:49:32Z" \
+      org.opencontainers.image.created="2023-07-31T07:19:04Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.8.17-debian-11-r48" \
+      org.opencontainers.image.ref.name="3.8.17-debian-11-r51" \
       org.opencontainers.image.title="python" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.8.17"
diff --git a/bitnami/pytorch/2/debian-11/Dockerfile b/bitnami/pytorch/2/debian-11/Dockerfile
index 7448f05a2d84a..bf9fa4694e54b 100644
--- a/bitnami/pytorch/2/debian-11/Dockerfile
+++ b/bitnami/pytorch/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-07-29T05:17:27Z" \
+      org.opencontainers.image.created="2023-07-31T06:01:35Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.0.1-debian-11-r77" \
+      org.opencontainers.image.ref.name="2.0.1-debian-11-r79" \
       org.opencontainers.image.title="pytorch" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.0.1"
diff --git a/bitnami/rabbitmq/3.10/debian-11/Dockerfile b/bitnami/rabbitmq/3.10/debian-11/Dockerfile
index e581352ad1cc2..539a2f4910d98 100644
--- a/bitnami/rabbitmq/3.10/debian-11/Dockerfile
+++ b/bitnami/rabbitmq/3.10/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-07-28T06:14:20Z" \
+      org.opencontainers.image.created="2023-07-31T08:05:37Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.10.25-debian-11-r9" \
+      org.opencontainers.image.ref.name="3.10.25-debian-11-r12" \
       org.opencontainers.image.title="rabbitmq" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.10.25"
diff --git a/bitnami/redis-cluster/6.2/debian-11/Dockerfile b/bitnami/redis-cluster/6.2/debian-11/Dockerfile
index 7049da1185f47..1758586210692 100644
--- a/bitnami/redis-cluster/6.2/debian-11/Dockerfile
+++ b/bitnami/redis-cluster/6.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-07-28T15:22:31Z" \
+      org.opencontainers.image.created="2023-07-30T16:01:00Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.2.13-debian-11-r15" \
+      org.opencontainers.image.ref.name="6.2.13-debian-11-r17" \
       org.opencontainers.image.title="redis-cluster" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="6.2.13"
diff --git a/bitnami/redis-cluster/7.0/debian-11/Dockerfile b/bitnami/redis-cluster/7.0/debian-11/Dockerfile
index 23f3fd4131759..9c69285563e12 100644
--- a/bitnami/redis-cluster/7.0/debian-11/Dockerfile
+++ b/bitnami/redis-cluster/7.0/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-07-28T15:23:39Z" \
+      org.opencontainers.image.created="2023-07-30T16:01:23Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.0.12-debian-11-r15" \
+      org.opencontainers.image.ref.name="7.0.12-debian-11-r17" \
       org.opencontainers.image.title="redis-cluster" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.0.12"
diff --git a/bitnami/redis/6.2/debian-11/Dockerfile b/bitnami/redis/6.2/debian-11/Dockerfile
index 4fdba2295881b..09b449991f3c8 100644
--- a/bitnami/redis/6.2/debian-11/Dockerfile
+++ b/bitnami/redis/6.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-07-28T16:08:14Z" \
+      org.opencontainers.image.created="2023-07-30T20:08:01Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.2.13-debian-11-r15" \
+      org.opencontainers.image.ref.name="6.2.13-debian-11-r17" \
       org.opencontainers.image.title="redis" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="6.2.13"
diff --git a/bitnami/redis/7.0/debian-11/Dockerfile b/bitnami/redis/7.0/debian-11/Dockerfile
index 07d12ea4870d9..9dbcb5d340124 100644
--- a/bitnami/redis/7.0/debian-11/Dockerfile
+++ b/bitnami/redis/7.0/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-07-28T16:11:00Z" \
+      org.opencontainers.image.created="2023-07-30T20:09:53Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.0.12-debian-11-r15" \
+      org.opencontainers.image.ref.name="7.0.12-debian-11-r17" \
       org.opencontainers.image.title="redis" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.0.12"
diff --git a/bitnami/solr/9/debian-11/Dockerfile b/bitnami/solr/9/debian-11/Dockerfile
index 2ae5282a3641c..f86145608bdd4 100644
--- a/bitnami/solr/9/debian-11/Dockerfile
+++ b/bitnami/solr/9/debian-11/Dockerfile
@@ -8,10 +8,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-07-27T17:22:28Z" \
+      org.opencontainers.image.created="2023-07-30T20:44:23Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.3.0-debian-11-r5" \
+      org.opencontainers.image.ref.name="9.3.0-debian-11-r8" \
       org.opencontainers.image.title="solr" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.3.0"
@@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages acl ca-certificates curl lsof netcat procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "java-17.0.8-7-1-linux-${OS_ARCH}-debian-11" \
+      "java-17.0.8-7-2-linux-${OS_ARCH}-debian-11" \
       "solr-9.3.0-1-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index f2651c270e8cf..63fd7bc55be43 100644
--- a/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/solr/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "17.0.8-7-1"
+        "version": "17.0.8-7-2"
     },
     "solr": {
         "arch": "amd64",
diff --git a/bitnami/spark/3.3/debian-11/Dockerfile b/bitnami/spark/3.3/debian-11/Dockerfile
index ff4f8d6a2fe65..0158ccf2a4466 100644
--- a/bitnami/spark/3.3/debian-11/Dockerfile
+++ b/bitnami/spark/3.3/debian-11/Dockerfile
@@ -8,10 +8,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-07-28T00:25:00Z" \
+      org.opencontainers.image.created="2023-07-31T18:38:57Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.3.2-debian-11-r140" \
+      org.opencontainers.image.ref.name="3.3.2-debian-11-r141" \
       org.opencontainers.image.title="spark" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.3.2"
@@ -30,7 +30,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "python-3.9.17-4-linux-${OS_ARCH}-debian-11" \
       "java-17.0.8-7-2-linux-${OS_ARCH}-debian-11" \
-      "spark-3.3.2-9-linux-${OS_ARCH}-debian-11" \
+      "spark-3.3.2-10-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 03d608390ea24..5ae336987a0ca 100644
--- a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,6 +15,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.3.2-9"
+        "version": "3.3.2-10"
     }
 }
\ No newline at end of file
diff --git a/bitnami/supabase-studio/0/debian-11/Dockerfile b/bitnami/supabase-studio/0/debian-11/Dockerfile
index 3da5a75cf2a79..a3021b48a1188 100644
--- a/bitnami/supabase-studio/0/debian-11/Dockerfile
+++ b/bitnami/supabase-studio/0/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-07-28T20:53:32Z" \
+      org.opencontainers.image.created="2023-07-30T21:53:20Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="0.23.6-debian-11-r19" \
+      org.opencontainers.image.ref.name="0.23.6-debian-11-r21" \
       org.opencontainers.image.title="supabase-studio" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.23.6"
diff --git a/bitnami/telegraf/1/debian-11/Dockerfile b/bitnami/telegraf/1/debian-11/Dockerfile
index e4ae2c6922913..2f3b2ffc8c265 100644
--- a/bitnami/telegraf/1/debian-11/Dockerfile
+++ b/bitnami/telegraf/1/debian-11/Dockerfile
@@ -7,13 +7,13 @@ 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-07-28T20:59:51Z" \
+      org.opencontainers.image.created="2023-07-31T21:07:39Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.27.2-debian-11-r16" \
+      org.opencontainers.image.ref.name="1.27.3-debian-11-r0" \
       org.opencontainers.image.title="telegraf" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="1.27.2"
+      org.opencontainers.image.version="1.27.3"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "telegraf-1.27.2-1-linux-${OS_ARCH}-debian-11" \
+      "telegraf-1.27.3-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -42,7 +42,7 @@ RUN apt-get autoremove --purge -y curl && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 
-ENV APP_VERSION="1.27.2" \
+ENV APP_VERSION="1.27.3" \
     BITNAMI_APP_NAME="telegraf" \
     PATH="/opt/bitnami/telegraf/bin:$PATH"
 
diff --git a/bitnami/telegraf/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/telegraf/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index bb98b1863c552..fd82fce72e1c4 100644
--- a/bitnami/telegraf/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/telegraf/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.27.2-1"
+        "version": "1.27.3-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/telegraf/1/debian-11/tags-info.yaml b/bitnami/telegraf/1/debian-11/tags-info.yaml
index fbf4fe1caacdb..874b867871803 100644
--- a/bitnami/telegraf/1/debian-11/tags-info.yaml
+++ b/bitnami/telegraf/1/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "1"
 - 1-debian-11
-- 1.27.2
+- 1.27.3
 - latest