diff --git a/config/docker/env/kafka-server.env b/config/docker/env/kafka-server.env
index 9c0cdc187e1..bf5cb9d3991 100644
--- a/config/docker/env/kafka-server.env
+++ b/config/docker/env/kafka-server.env
@@ -17,11 +17,16 @@
 # under the License.
 #
 
-KAFKA_CFG_NODE_ID=0
-KAFKA_CFG_PROCESS_ROLES=controller,broker
-KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
-KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
-KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
-KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
-ALLOW_PLAINTEXT_LISTENER=yes
-KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
+
+    KAFKA_NODE_ID: 0
+    KAFKA_PROCESS_ROLES: controller,broker
+    KAFKA_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
+    KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092
+    KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+    KAFKA_CONTROLLER_QUORUM_VOTERS: 0@kafka:9093
+    KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+    KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+    KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+    KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+    KAFKA_LOG_DIRS: /var/lib/kafka/data
+    KAFKA_BROKER_ID: 0
\ No newline at end of file
diff --git a/docker-compose-postgresql-kafka.yml b/docker-compose-postgresql-kafka.yml
index 7d644cb5182..3a9bbb72a4c 100644
--- a/docker-compose-postgresql-kafka.yml
+++ b/docker-compose-postgresql-kafka.yml
@@ -20,7 +20,7 @@
 version: "3.7"
 services:
   kafka:
-    image: "bitnamilegacy/kafka:4.0.0-debian-12-r10"
+    image: "apache/kafka:4.1.1-rc2"
     ports:
       - "9092:9092"
     env_file: