diff --git a/bitnami/clickhouse-keeper/25/debian-12/Dockerfile b/bitnami/clickhouse-keeper/25/debian-12/Dockerfile
index b86435444f38..67385767009b 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-05-15T12:40:09Z" \
+      org.opencontainers.image.created="2025-05-16T15:12:21Z" \
       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.4.4-debian-12-r0" \
+      org.opencontainers.image.ref.name="25.4.4-debian-12-r1" \
       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/entrypoint.sh b/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper/entrypoint.sh
index 333871bdab81..e208a5424766 100755
--- a/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper/entrypoint.sh
+++ b/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper/entrypoint.sh
@@ -11,6 +11,7 @@ set -o pipefail
 
 # Load libraries
 . /opt/bitnami/scripts/libbitnami.sh
+. /opt/bitnami/scripts/libfs.sh
 . /opt/bitnami/scripts/liblog.sh
 
 # Load ClickHouse Keeper environment variables
@@ -28,6 +29,13 @@ else
     error "The folder $CLICKHOUSE_KEEPER_CONF_DIR is not writable. This is likely because a read-only filesystem is used, please ensure you mount a writable volume on this path."
     exit 1
 fi
+# For compatibility with running the image via Altiny's Operator, we need to
+# ensure the specific config files mounted at /etc/clickhouse-keeper
+# are copied to Bitnami's config directory
+[[ -f "/etc/clickhouse-keeper/keeper_config.xml" ]] && cp "/etc/clickhouse-keeper/keeper_config.xml" "$CLICKHOUSE_KEEPER_CONF_FILE"
+for dir in "conf.d" "keeper_config.d" "users.d"; do
+  ! is_mounted_dir_empty "/etc/clickhouse-keeper/${dir}" && cp -r "/etc/clickhouse-keeper/${dir}" "$CLICKHOUSE_KEEPER_CONF_DIR"
+done
 
 if [[ "$1" = "/opt/bitnami/scripts/clickhouse-keeper/run.sh" ]]; then
     info "** Starting ClickHouse Keeper setup **"
diff --git a/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper/postunpack.sh b/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper/postunpack.sh
index b7c4b6a5918a..8d1aaf5b6220 100755
--- a/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper/postunpack.sh
+++ b/bitnami/clickhouse-keeper/25/debian-12/rootfs/opt/bitnami/scripts/clickhouse-keeper/postunpack.sh
@@ -46,7 +46,6 @@ xmlstarlet ed -L --insert "/clickhouse/keeper_server/raft_configuration/server/p
 # Add symlinks to the default paths to make a similar UX as the upstream ClickHouse Keeper configuration
 # https://github.com/ClickHouse/ClickHouse/blob/master/programs/keeper/keeper_config.xml
 ln -s "$CLICKHOUSE_KEEPER_VOLUME_DIR" "/var/lib/clickhouse-keeper"
-ln -s "$CLICKHOUSE_KEEPER_CONF_DIR" "/etc/clickhouse-keeper"
 ln -s "$CLICKHOUSE_KEEPER_LOG_DIR" "/var/log/clickhouse-keeper"
 
 # ClickHouse Keeper uses some algorithms that are not FIPS compliant