diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5170530d..3adf166d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,14 +43,15 @@ jobs:
         image: bitnami/kafka:3.3
         env:
           KAFKA_BROKER_ID: "1"
+          KAFKA_ENABLE_KRAFT: "no"
           KAFKA_CFG_ZOOKEEPER_CONNECT: "zookeeper:2181"
-          KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CLIENT:PLAINTEXT,CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT
-          KAFKA_CFG_LISTENERS: CLIENT://:9092,CONTROLLER://:9093,EXTERNAL://:9094
+          KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+          KAFKA_CFG_LISTENERS: CLIENT://:9092,EXTERNAL://:9093
           KAFKA_CFG_ADVERTISED_LISTENERS: CLIENT://kafka:9092,EXTERNAL://localhost:9092
           KAFKA_CFG_INTER_BROKER_LISTENER_NAME: CLIENT
           ALLOW_PLAINTEXT_LISTENER: "yes"
         ports:
-          - 9092:9094
+          - 9092:9093
       redis:
         image: bitnami/redis:7.0
         env:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7df4bd1..6e671396 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,8 @@ run tests:
     # kafka
     ALLOW_PLAINTEXT_LISTENER: "yes"
     KAFKA_BROKER_ID: "1"
-    KAFKA_CFG_LISTENERS: "PLAINTEXT://:9092,CONTROLLER://:9093"
+    KAFKA_ENABLE_KRAFT: "no"
+    KAFKA_CFG_LISTENERS: "PLAINTEXT://:9092"
     KAFKA_CFG_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092"
     KAFKA_CFG_ZOOKEEPER_CONNECT: "zookeeper:2181"
     # redis
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index b75ed39a..c3dd85a5 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -12,16 +12,16 @@ services:
     environment:
       - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
       - KAFKA_BROKER_ID=1
-      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT
-      - KAFKA_CFG_LISTENERS=CLIENT://:9092,CONTROLLER://:9093,EXTERNAL://:9094
+      - KAFKA_ENABLE_KRAFT=no
+      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+      - KAFKA_CFG_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
       - KAFKA_CFG_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9092
       - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=CLIENT
       - ALLOW_PLAINTEXT_LISTENER=yes
-      - BITNAMI_DEBUG=true
     depends_on:
       - zookeeper
     ports:
-      - 127.0.0.1:9092:9094/tcp
+      - 127.0.0.1:9092:9093/tcp
 
   redis:
     image: bitnami/redis:7.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 09b205c8..4f47bf2b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,6 +34,7 @@ services:
       - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
       - ALLOW_PLAINTEXT_LISTENER=yes
       - KAFKA_DELETE_TOPIC_ENABLE=true
+      - KAFKA_ENABLE_KRAFT=no
     restart: unless-stopped
     depends_on:
       - zookeeper