diff --git a/docker/docker-compose.kafka.yml b/docker/docker-compose.kafka.yml
index 9d33f33941..7e6fcae09c 100644
--- a/docker/docker-compose.kafka.yml
+++ b/docker/docker-compose.kafka.yml
@@ -19,13 +19,11 @@ version: '3.0'
 services:
   kafka:
     restart: always
-    image: "bitnami/kafka:3.7.0"
+    image: "bitnami/kafka:4.0"
     ports:
       - "9092:9092"
     env_file:
       - kafka.env
-    depends_on:
-      - zookeeper
   tb-js-executor:
     env_file:
       - queue-kafka.env
diff --git a/docker/kafka.env b/docker/kafka.env
index 9c28885252..e5da2aec1a 100644
--- a/docker/kafka.env
+++ b/docker/kafka.env
@@ -1,11 +1,19 @@
-ALLOW_PLAINTEXT_LISTENER=yes
-KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper:2181
-KAFKA_CFG_LISTENERS=INSIDE://:9093,OUTSIDE://:9092
-KAFKA_CFG_ADVERTISED_LISTENERS=INSIDE://:9093,OUTSIDE://kafka:9092
-KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
+# KRaft settings
+KAFKA_CFG_NODE_ID=0
+KAFKA_CFG_PROCESS_ROLES=controller,broker
+KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
+# Listeners
+KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
+KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://:9092
+KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
+KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
+# Kafka settings
 KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE=false
-KAFKA_CFG_INTER_BROKER_LISTENER_NAME=INSIDE
 KAFKA_CFG_LOG_RETENTION_BYTES=1073741824
+# default is 1 GB
 KAFKA_CFG_SEGMENT_BYTES=268435456
-KAFKA_CFG_LOG_RETENTION_MS=300000
-KAFKA_CFG_LOG_CLEANUP_POLICY=delete
+# default 7 days
+#KAFKA_CFG_LOG_RETENTION_MS=300000
+# default
+#KAFKA_CFG_LOG_CLEANUP_POLICY=delete
\ No newline at end of file