diff --git a/cloud/cloud-stream-kafka-streams/docker-compose.yml b/cloud/cloud-stream-kafka-streams/docker-compose.yml
index 9845c364..450f2057 100644
--- a/cloud/cloud-stream-kafka-streams/docker-compose.yml
+++ b/cloud/cloud-stream-kafka-streams/docker-compose.yml
@@ -1,24 +1,17 @@
 services:
   kafka:
-    image: wurstmeister/kafka
+    image: apache/kafka:latest
     hostname: kafka
     ports:
-      - '9092'
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      - "9092:9092"
     environment:
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_LISTENERS: PLAINTEXT://:29092,PLAINTEXT_HOST://:9092
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:_{PORT_COMMAND}
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      PORT_COMMAND: "docker ps | egrep 'kafka(-|_)1' | cut -d: -f 2 | cut -d- -f 1"
-    depends_on:
-      - zookeeper
-
-  zookeeper:
-    image: wurstmeister/zookeeper
-    ports:
-      - '2181'
-    environment:
-      - KAFKA_ADVERTISED_HOST_NAME=zookeeper
+      KAFKA_NODE_ID: 1
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT_DOCKER:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_LISTENERS: 'PLAINTEXT_DOCKER://kafka:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT_DOCKER://kafka:29092,PLAINTEXT_HOST://localhost:9092'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT_DOCKER'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      PORT_COMMAND: "docker ps | egrep 'kafka' | cut -d: -f 3 | cut -d- -f 1"
diff --git a/cloud/cloud-stream-kafka/docker-compose.yml b/cloud/cloud-stream-kafka/docker-compose.yml
index 9845c364..d4ab36a3 100644
--- a/cloud/cloud-stream-kafka/docker-compose.yml
+++ b/cloud/cloud-stream-kafka/docker-compose.yml
@@ -1,24 +1,17 @@
 services:
   kafka:
-    image: wurstmeister/kafka
+    image: apache/kafka:latest
     hostname: kafka
     ports:
-      - '9092'
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      - "9092:9092"
     environment:
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_LISTENERS: PLAINTEXT://:29092,PLAINTEXT_HOST://:9092
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:_{PORT_COMMAND}
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      PORT_COMMAND: "docker ps | egrep 'kafka(-|_)1' | cut -d: -f 2 | cut -d- -f 1"
-    depends_on:
-      - zookeeper
-
-  zookeeper:
-    image: wurstmeister/zookeeper
-    ports:
-      - '2181'
-    environment:
-      - KAFKA_ADVERTISED_HOST_NAME=zookeeper
+      KAFKA_NODE_ID: 1
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT_DOCKER:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_LISTENERS: 'PLAINTEXT_DOCKER://kafka:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT_DOCKER://kafka:29092,PLAINTEXT_HOST://localhost:9092'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT_DOCKER'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      PORT_COMMAND: "docker ps | egrep 'kafka' | cut -d: -f 3 | cut -d- -f 1"
\ No newline at end of file
diff --git a/integration/spring-kafka-avro/docker-compose.yml b/integration/spring-kafka-avro/docker-compose.yml
index 9845c364..d4ab36a3 100644
--- a/integration/spring-kafka-avro/docker-compose.yml
+++ b/integration/spring-kafka-avro/docker-compose.yml
@@ -1,24 +1,17 @@
 services:
   kafka:
-    image: wurstmeister/kafka
+    image: apache/kafka:latest
     hostname: kafka
     ports:
-      - '9092'
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      - "9092:9092"
     environment:
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_LISTENERS: PLAINTEXT://:29092,PLAINTEXT_HOST://:9092
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:_{PORT_COMMAND}
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      PORT_COMMAND: "docker ps | egrep 'kafka(-|_)1' | cut -d: -f 2 | cut -d- -f 1"
-    depends_on:
-      - zookeeper
-
-  zookeeper:
-    image: wurstmeister/zookeeper
-    ports:
-      - '2181'
-    environment:
-      - KAFKA_ADVERTISED_HOST_NAME=zookeeper
+      KAFKA_NODE_ID: 1
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT_DOCKER:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_LISTENERS: 'PLAINTEXT_DOCKER://kafka:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT_DOCKER://kafka:29092,PLAINTEXT_HOST://localhost:9092'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT_DOCKER'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      PORT_COMMAND: "docker ps | egrep 'kafka' | cut -d: -f 3 | cut -d- -f 1"
\ No newline at end of file
diff --git a/integration/spring-kafka-streams/docker-compose.yml b/integration/spring-kafka-streams/docker-compose.yml
index 9845c364..d4ab36a3 100644
--- a/integration/spring-kafka-streams/docker-compose.yml
+++ b/integration/spring-kafka-streams/docker-compose.yml
@@ -1,24 +1,17 @@
 services:
   kafka:
-    image: wurstmeister/kafka
+    image: apache/kafka:latest
     hostname: kafka
     ports:
-      - '9092'
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      - "9092:9092"
     environment:
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_LISTENERS: PLAINTEXT://:29092,PLAINTEXT_HOST://:9092
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:_{PORT_COMMAND}
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      PORT_COMMAND: "docker ps | egrep 'kafka(-|_)1' | cut -d: -f 2 | cut -d- -f 1"
-    depends_on:
-      - zookeeper
-
-  zookeeper:
-    image: wurstmeister/zookeeper
-    ports:
-      - '2181'
-    environment:
-      - KAFKA_ADVERTISED_HOST_NAME=zookeeper
+      KAFKA_NODE_ID: 1
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT_DOCKER:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_LISTENERS: 'PLAINTEXT_DOCKER://kafka:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT_DOCKER://kafka:29092,PLAINTEXT_HOST://localhost:9092'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT_DOCKER'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      PORT_COMMAND: "docker ps | egrep 'kafka' | cut -d: -f 3 | cut -d- -f 1"
\ No newline at end of file
diff --git a/integration/spring-kafka/docker-compose.yml b/integration/spring-kafka/docker-compose.yml
index 9845c364..d4ab36a3 100644
--- a/integration/spring-kafka/docker-compose.yml
+++ b/integration/spring-kafka/docker-compose.yml
@@ -1,24 +1,17 @@
 services:
   kafka:
-    image: wurstmeister/kafka
+    image: apache/kafka:latest
     hostname: kafka
     ports:
-      - '9092'
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      - "9092:9092"
     environment:
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_LISTENERS: PLAINTEXT://:29092,PLAINTEXT_HOST://:9092
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:_{PORT_COMMAND}
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      PORT_COMMAND: "docker ps | egrep 'kafka(-|_)1' | cut -d: -f 2 | cut -d- -f 1"
-    depends_on:
-      - zookeeper
-
-  zookeeper:
-    image: wurstmeister/zookeeper
-    ports:
-      - '2181'
-    environment:
-      - KAFKA_ADVERTISED_HOST_NAME=zookeeper
+      KAFKA_NODE_ID: 1
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT_DOCKER:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_LISTENERS: 'PLAINTEXT_DOCKER://kafka:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT_DOCKER://kafka:29092,PLAINTEXT_HOST://localhost:9092'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT_DOCKER'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      PORT_COMMAND: "docker ps | egrep 'kafka' | cut -d: -f 3 | cut -d- -f 1"
\ No newline at end of file