diff --git a/bitnami/clickhouse/22.8/debian-11/Dockerfile b/bitnami/clickhouse/22.8/debian-11/Dockerfile
index 21b00fbcb2a8..0769a0e7f0e0 100644
--- a/bitnami/clickhouse/22.8/debian-11/Dockerfile
+++ b/bitnami/clickhouse/22.8/debian-11/Dockerfile
@@ -4,7 +4,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="22.8.6-debian-11-r2" \
+      org.opencontainers.image.ref.name="22.8.6-debian-11-r3" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse" \
       org.opencontainers.image.title="clickhouse" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -20,21 +20,19 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl procps xmlstarlet
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f clickhouse-22.8.6-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/clickhouse-22.8.6-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/clickhouse-22.8.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c clickhouse-22.8.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf clickhouse-22.8.6-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf clickhouse-22.8.6-0-linux-${OS_ARCH}-debian-11.tar.gz clickhouse-22.8.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
+    COMPONENTS=( \
+      "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \
+      "clickhouse-22.8.6-1-linux-${OS_ARCH}-debian-11" \
+    ) && \
+    for COMPONENT in "${COMPONENTS[@]}"; do \
+      if [ ! -f "${COMPONENT}.tar.gz" ]; then \
+        curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \
+        curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \
+      fi && \
+      sha256sum -c "${COMPONENT}.tar.gz.sha256" && \
+      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+      rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \
+    done
 RUN apt-get autoremove --purge -y curl && \
     apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
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 81e183ccbf96..b2c38d519afc 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
@@ -1,16 +1,16 @@
 {
     "clickhouse": {
         "arch": "amd64",
-        "digest": "9321950c1a237f4df2bd6fbf8f1cf9f738cdf967751ad4f85f5539ae9f4b07a2",
+        "digest": "2307841664d64ac5c0a9de75d84e50681164de7d629f88d7871cb1a40682c088",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "22.8.6-0"
+        "version": "22.8.6-1"
     },
     "gosu": {
         "arch": "amd64",
-        "digest": "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab",
+        "digest": "f21869b27c26b9c3053bce8b419a0fdf1dc45fcf13a7c2058e0afb6996d3687f",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.14.0-154"
+        "version": "1.14.0-155"
     }
 }
\ No newline at end of file
diff --git a/bitnami/clickhouse/README.md b/bitnami/clickhouse/README.md
index 58ea1dd49bca..b0acfc1c9432 100644
--- a/bitnami/clickhouse/README.md
+++ b/bitnami/clickhouse/README.md
@@ -41,10 +41,10 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`22.8`, `22.8-debian-11`, `22.8.6`, `22.8.6-debian-11-r2`, `latest` (22.8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.8/debian-11/Dockerfile)
-* [`22.7`, `22.7-debian-11`, `22.7.6`, `22.7.6-debian-11-r2` (22.7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.7/debian-11/Dockerfile)
-* [`22.6`, `22.6-debian-11`, `22.6.9`, `22.6.9-debian-11-r-1` (22.6/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.6/debian-11/Dockerfile)
-* [`22.5`, `22.5-debian-11`, `22.5.4`, `22.5.4-debian-11-r6` (22.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.5/debian-11/Dockerfile)
+* [`22.8`, `22.8-debian-11`, `22.8.6`, `22.8.6-debian-11-r3`, `latest` (22.8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.8/debian-11/Dockerfile)
+* [`22.7`, `22.7-debian-11`, `22.7.6`, `22.7.6-debian-11-r3` (22.7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.7/debian-11/Dockerfile)
+* [`22.6`, `22.6-debian-11`, `22.6.9`, `22.6.9-debian-11-r1` (22.6/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.6/debian-11/Dockerfile)
+* [`22.5`, `22.5-debian-11`, `22.5.4`, `22.5.4-debian-11-r7` (22.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.5/debian-11/Dockerfile)
 * [`22.3`, `22.3-debian-11`, `22.3.13`, `22.3.13-debian-11-r2` (22.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/clickhouse/22.3/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).