diff --git a/bitnami/clickhouse-keeper/25/debian-12/Dockerfile b/bitnami/clickhouse-keeper/25/debian-12/Dockerfile
index 4041b42c3e95..7b4e020b60c4 100644
--- a/bitnami/clickhouse-keeper/25/debian-12/Dockerfile
+++ b/bitnami/clickhouse-keeper/25/debian-12/Dockerfile
@@ -8,10 +8,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-04-05T18:24:10Z" \
+      org.opencontainers.image.created="2025-04-07T10:42:15Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse-keeper/README.md" \
-      org.opencontainers.image.ref.name="25.3.2-debian-12-r1" \
+      org.opencontainers.image.ref.name="25.3.2-debian-12-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse-keeper" \
       org.opencontainers.image.title="clickhouse-keeper" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
diff --git a/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper-env.sh b/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper-env.sh
index ed974ef7fbed..2e5d60137b66 100644
--- a/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper-env.sh
+++ b/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper-env.sh
@@ -24,6 +24,7 @@ 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
 clickhouse_keeper_env_vars=(
+    CLICKHOUSE_KEEPER_SKIP_SETUP
     CLICKHOUSE_KEEPER_SERVER_ID
     CLICKHOUSE_KEEPER_TCP_PORT
     CLICKHOUSE_KEEPER_RAFT_PORT
@@ -56,6 +57,7 @@ export CLICKHOUSE_KEEPER_TMP_DIR="${CLICKHOUSE_KEEPER_BASE_DIR}/tmp"
 export CLICKHOUSE_KEEPER_PID_FILE="${CLICKHOUSE_KEEPER_TMP_DIR}/clickhouse-keeper.pid"
 
 # ClickHouse Keeper configuration parameters
+export CLICKHOUSE_KEEPER_SKIP_SETUP="${CLICKHOUSE_KEEPER_SKIP_SETUP:-no}"
 export CLICKHOUSE_KEEPER_SERVER_ID="${CLICKHOUSE_KEEPER_SERVER_ID:-}"
 export CLICKHOUSE_KEEPER_TCP_PORT="${CLICKHOUSE_KEEPER_TCP_PORT:-9181}"
 export CLICKHOUSE_KEEPER_RAFT_PORT="${CLICKHOUSE_KEEPER_RAFT_PORT:-9234}"
diff --git a/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper/setup.sh b/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper/setup.sh
index ffe213d22c0f..f74a3e980701 100755
--- a/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper/setup.sh
+++ b/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper/setup.sh
@@ -19,7 +19,7 @@ set -o pipefail
 am_i_root && ensure_user_exists "$CLICKHOUSE_DAEMON_USER" --group "$CLICKHOUSE_DAEMON_GROUP"
 
 # ClickHouse Keeper initialization, skipped if custom keeper_config.xml was mounted
-if [[ ! -f "$CLICKHOUSE_KEEPER_CONF_FILE" ]]; then
+if ! is_boolean_yes "$CLICKHOUSE_KEEPER_SKIP_SETUP" && [[ ! -f "$CLICKHOUSE_KEEPER_CONF_FILE" ]]; then
     # Ensure ClickHouse Keeper environment settings are valid
     keeper_validate
     # Ensure ClickHouse Keeper is initialized
diff --git a/bitnami/clickhouse-keeper/README.md b/bitnami/clickhouse-keeper/README.md
index 7b7756c1cdde..92baa63469e4 100644
--- a/bitnami/clickhouse-keeper/README.md
+++ b/bitnami/clickhouse-keeper/README.md
@@ -186,11 +186,12 @@ Check the [official ClickHouse Keeper configuration documentation](https://click
 
 #### Customizable environment variables
 
-| Name                          | Description                  | Default Value |
-|-------------------------------|------------------------------|---------------|
-| `CLICKHOUSE_KEEPER_SERVER_ID` | ClickHouse Keeper server ID. | `nil`         |
-| `CLICKHOUSE_KEEPER_TCP_PORT`  | ClickHouse Keeper TCP port.  | `9181`        |
-| `CLICKHOUSE_KEEPER_RAFT_PORT` | ClickHouse Keeper Raft port. | `9234`        |
+| Name                           | Description                   | Default Value |
+|--------------------------------|-------------------------------|---------------|
+| `CLICKHOUSE_KEEPER_SKIP_SETUP` | Skip ClickHouse Keeper setup. | `no`          |
+| `CLICKHOUSE_KEEPER_SERVER_ID`  | ClickHouse Keeper server ID.  | `nil`         |
+| `CLICKHOUSE_KEEPER_TCP_PORT`   | ClickHouse Keeper TCP port.   | `9181`        |
+| `CLICKHOUSE_KEEPER_RAFT_PORT`  | ClickHouse Keeper Raft port.  | `9234`        |
 
 #### Read-only environment variables