diff --git a/bitnami/kafka/3.6/debian-11/Dockerfile b/bitnami/kafka/3.6/debian-11/Dockerfile
index 3e5bb4967a39..678b66453e2a 100644
--- a/bitnami/kafka/3.6/debian-11/Dockerfile
+++ b/bitnami/kafka/3.6/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="2024-01-22T10:36:35Z" \
+      org.opencontainers.image.created="2024-01-24T20:02:33Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.6.1-debian-11-r2" \
+      org.opencontainers.image.ref.name="3.6.1-debian-11-r3" \
       org.opencontainers.image.title="kafka" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.6.1"
diff --git a/bitnami/kafka/3.6/debian-11/rootfs/opt/bitnami/scripts/kafka-env.sh b/bitnami/kafka/3.6/debian-11/rootfs/opt/bitnami/scripts/kafka-env.sh
index ff4684a556fd..9f33fc07871a 100644
--- a/bitnami/kafka/3.6/debian-11/rootfs/opt/bitnami/scripts/kafka-env.sh
+++ b/bitnami/kafka/3.6/debian-11/rootfs/opt/bitnami/scripts/kafka-env.sh
@@ -37,9 +37,6 @@ kafka_env_vars=(
     KAFKA_CFG_SASL_ENABLED_MECHANISMS
     KAFKA_KRAFT_CLUSTER_ID
     KAFKA_SKIP_KRAFT_STORAGE_INIT
-    KAFKA_CFG_MAX_REQUEST_SIZE
-    KAFKA_CFG_MESSAGE_MAX_BYTES
-    KAFKA_CFG_MAX_PARTITION_FETCH_BYTES
     KAFKA_CLIENT_LISTENER_NAME
     KAFKA_ZOOKEEPER_PROTOCOL
     KAFKA_ZOOKEEPER_PASSWORD
@@ -98,9 +95,6 @@ export KAFKA_OPTS="${KAFKA_OPTS:-}"
 export KAFKA_CFG_SASL_ENABLED_MECHANISMS="${KAFKA_CFG_SASL_ENABLED_MECHANISMS:-PLAIN,SCRAM-SHA-256,SCRAM-SHA-512}"
 export KAFKA_KRAFT_CLUSTER_ID="${KAFKA_KRAFT_CLUSTER_ID:-}"
 export KAFKA_SKIP_KRAFT_STORAGE_INIT="${KAFKA_SKIP_KRAFT_STORAGE_INIT:-false}"
-export KAFKA_CFG_MAX_REQUEST_SIZE="${KAFKA_CFG_MAX_REQUEST_SIZE:-}"
-export KAFKA_CFG_MESSAGE_MAX_BYTES="${KAFKA_CFG_MESSAGE_MAX_BYTES:-}"
-export KAFKA_CFG_MAX_PARTITION_FETCH_BYTES="${KAFKA_CFG_MAX_PARTITION_FETCH_BYTES:-}"
 export KAFKA_CLIENT_LISTENER_NAME="${KAFKA_CLIENT_LISTENER_NAME:-}"
 
 # ZooKeeper connection settings
diff --git a/bitnami/kafka/3.6/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh b/bitnami/kafka/3.6/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh
index ce17a97f810b..0efa81c4b873 100644
--- a/bitnami/kafka/3.6/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh
+++ b/bitnami/kafka/3.6/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh
@@ -940,7 +940,6 @@ kafka_initialize() {
         kafka_configure_from_environment_variables
         # 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_MESSAGE_MAX_BYTES:-}" && kafka_server_conf_set message.max.bytes "$KAFKA_CFG_MESSAGE_MAX_BYTES"
         ! 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