diff --git a/bitnami/clickhouse/22.8/debian-11/Dockerfile b/bitnami/clickhouse/22.8/debian-11/Dockerfile
index 3bd20afe6761..072a9c184498 100644
--- a/bitnami/clickhouse/22.8/debian-11/Dockerfile
+++ b/bitnami/clickhouse/22.8/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-08-27T16:33:30Z" \
+      org.opencontainers.image.created="2023-08-28T17:35:58Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="22.8.20-debian-11-r46" \
+      org.opencontainers.image.ref.name="22.8.21-debian-11-r0" \
       org.opencontainers.image.title="clickhouse" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="22.8.20"
+      org.opencontainers.image.version="22.8.21"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps xmlstarlet
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "clickhouse-22.8.20-2-linux-${OS_ARCH}-debian-11" \
+      "clickhouse-22.8.21-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/clickhouse/postunpack.sh
-ENV APP_VERSION="22.8.20" \
+ENV APP_VERSION="22.8.21" \
     BITNAMI_APP_NAME="clickhouse" \
     PATH="/opt/bitnami/clickhouse/bin:/opt/bitnami/common/bin:$PATH" \
     clickhouseCTL_API="3"
diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index ea42ae4f77a3..828a38dca490 100644
--- a/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/clickhouse/22.8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "22.8.20-2"
+        "version": "22.8.21-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/clickhouse/22.8/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/clickhouse/22.8/debian-11/prebuildfs/usr/sbin/run-script
new file mode 100755
index 000000000000..4ca0f897277e
--- /dev/null
+++ b/bitnami/clickhouse/22.8/debian-11/prebuildfs/usr/sbin/run-script
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+set -u
+
+if [ $# -eq 0 ]; then
+    >&2 echo "No arguments provided"
+    exit 1
+fi
+
+script=$1
+exit_code="${2:-96}"
+fail_if_not_present="${3:-n}"
+
+if test -f "$script"; then
+  sh $script
+
+  if [ $? -ne 0 ]; then
+    exit $((exit_code))
+  fi
+elif [ "$fail_if_not_present" = "y" ]; then
+  >&2 echo "script not found: $script"
+  exit 127
+fi
diff --git a/bitnami/clickhouse/22.8/debian-11/tags-info.yaml b/bitnami/clickhouse/22.8/debian-11/tags-info.yaml
index 804086d26413..66bb90c63190 100644
--- a/bitnami/clickhouse/22.8/debian-11/tags-info.yaml
+++ b/bitnami/clickhouse/22.8/debian-11/tags-info.yaml
@@ -1,4 +1,4 @@
 rolling-tags:
 - "22.8"
 - 22.8-debian-11
-- 22.8.20
+- 22.8.21