diff --git a/docker/docker-compose.kafka.yml b/docker/docker-compose.kafka.yml
index 09c4554562..1683114605 100644
--- a/docker/docker-compose.kafka.yml
+++ b/docker/docker-compose.kafka.yml
@@ -19,7 +19,7 @@ version: '2.2'
 services:
   kafka:
     restart: always
-    image: "wurstmeister/kafka:2.13-2.6.0"
+    image: "bitnami/kafka:3.2.0"
     ports:
       - "9092:9092"
     env_file:
diff --git a/docker/kafka.env b/docker/kafka.env
index bd23f99ad1..9c28885252 100644
--- a/docker/kafka.env
+++ b/docker/kafka.env
@@ -1,12 +1,11 @@
-
-KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
-KAFKA_LISTENERS=INSIDE://:9093,OUTSIDE://:9092
-KAFKA_ADVERTISED_LISTENERS=INSIDE://:9093,OUTSIDE://kafka:9092
-KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
-KAFKA_INTER_BROKER_LISTENER_NAME=INSIDE
-KAFKA_CREATE_TOPICS=js_eval.requests:100:1:delete --config=retention.ms=60000 --config=segment.bytes=26214400 --config=retention.bytes=104857600,tb_transport.api.requests:3:1:delete --config=retention.ms=60000 --config=segment.bytes=26214400 --config=retention.bytes=104857600
-KAFKA_AUTO_CREATE_TOPICS_ENABLE=false
-KAFKA_LOG_RETENTION_BYTES=1073741824
-KAFKA_LOG_SEGMENT_BYTES=268435456
-KAFKA_LOG_RETENTION_MS=300000
-KAFKA_LOG_CLEANUP_POLICY=delete
+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
+KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE=false
+KAFKA_CFG_INTER_BROKER_LISTENER_NAME=INSIDE
+KAFKA_CFG_LOG_RETENTION_BYTES=1073741824
+KAFKA_CFG_SEGMENT_BYTES=268435456
+KAFKA_CFG_LOG_RETENTION_MS=300000
+KAFKA_CFG_LOG_CLEANUP_POLICY=delete