diff --git a/tutorial/docker-compose-cassandra.yaml b/tutorial/docker-compose-cassandra.yaml
index eddd465c..c8be0112 100644
--- a/tutorial/docker-compose-cassandra.yaml
+++ b/tutorial/docker-compose-cassandra.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-      - 9092:9092
+      - 9093:9093
     links:
       - zookeeper
     environment:
       - ZOOKEEPER_CONNECT=zookeeper:2181
+      - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+      - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+      - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+      - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   cassandra:
     image: debezium/example-cassandra:${DEBEZIUM_VERSION}
     build:
diff --git a/tutorial/docker-compose-db2.yaml b/tutorial/docker-compose-db2.yaml
index d1374985..fb736e34 100644
--- a/tutorial/docker-compose-db2.yaml
+++ b/tutorial/docker-compose-db2.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-     - 9092:9092
+     - 9093:9093
     links:
      - zookeeper
     environment:
      - ZOOKEEPER_CONNECT=zookeeper:2181
+     - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+     - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+     - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+     - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   db2server:
     image: debezium/db2-cdc:${DEBEZIUM_VERSION}
     build:
@@ -22,10 +26,10 @@ services:
     ports:
      - 50000:50000
     environment:
-     - LICENSE=accept 
+     - LICENSE=accept
      - DBNAME=TESTDB
      - DB2INST1_PASSWORD==Password!
-    volumes: 
+    volumes:
      - ./db2data:/database
   connect:
     image: debezium/connect-db2:${DEBEZIUM_VERSION}
diff --git a/tutorial/docker-compose-mongodb.yaml b/tutorial/docker-compose-mongodb.yaml
index 3e955c2d..b2c7ebba 100644
--- a/tutorial/docker-compose-mongodb.yaml
+++ b/tutorial/docker-compose-mongodb.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-     - 9092:9092
+     - 9093:9093
     links:
      - zookeeper
     environment:
      - ZOOKEEPER_CONNECT=zookeeper:2181
+     - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+     - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+     - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+     - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   mongodb:
     image: quay.io/debezium/example-mongodb:${DEBEZIUM_VERSION}
     hostname: mongodb
diff --git a/tutorial/docker-compose-mysql-apicurio.yaml b/tutorial/docker-compose-mysql-apicurio.yaml
index 6149b261..76816ed1 100644
--- a/tutorial/docker-compose-mysql-apicurio.yaml
+++ b/tutorial/docker-compose-mysql-apicurio.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-     - 9092:9092
+     - 9093:9093
     links:
      - zookeeper
     environment:
      - ZOOKEEPER_CONNECT=zookeeper:2181
+     - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+     - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+     - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+     - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   mysql:
     image: quay.io/debezium/example-mysql:${DEBEZIUM_VERSION}
     ports:
diff --git a/tutorial/docker-compose-mysql-avro-connector.yaml b/tutorial/docker-compose-mysql-avro-connector.yaml
index 241778d9..ed28b6fc 100644
--- a/tutorial/docker-compose-mysql-avro-connector.yaml
+++ b/tutorial/docker-compose-mysql-avro-connector.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-     - 9092:9092
+     - 9093:9093
     links:
      - zookeeper
     environment:
      - ZOOKEEPER_CONNECT=zookeeper:2181
+     - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+     - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+     - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+     - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   mysql:
     image: quay.io/debezium/example-mysql:${DEBEZIUM_VERSION}
     ports:
diff --git a/tutorial/docker-compose-mysql-avro-worker.yaml b/tutorial/docker-compose-mysql-avro-worker.yaml
index 02083a19..83c4b8e3 100644
--- a/tutorial/docker-compose-mysql-avro-worker.yaml
+++ b/tutorial/docker-compose-mysql-avro-worker.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-     - 9092:9092
+     - 9093:9093
     links:
      - zookeeper
     environment:
      - ZOOKEEPER_CONNECT=zookeeper:2181
+     - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+     - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+     - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+     - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   mysql:
     image: quay.io/debezium/example-mysql:${DEBEZIUM_VERSION}
     ports:
diff --git a/tutorial/docker-compose-mysql-ext-secrets.yaml b/tutorial/docker-compose-mysql-ext-secrets.yaml
index 7b377c9f..fb635da6 100644
--- a/tutorial/docker-compose-mysql-ext-secrets.yaml
+++ b/tutorial/docker-compose-mysql-ext-secrets.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-     - 9092:9092
+     - 9093:9093
     links:
      - zookeeper
     environment:
      - ZOOKEEPER_CONNECT=zookeeper:2181
+     - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+     - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+     - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+     - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   mysql:
     image: quay.io/debezium/example-mysql:${DEBEZIUM_VERSION}
     ports:
diff --git a/tutorial/docker-compose-mysql.yaml b/tutorial/docker-compose-mysql.yaml
index 4be3508e..ebe497d8 100644
--- a/tutorial/docker-compose-mysql.yaml
+++ b/tutorial/docker-compose-mysql.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-     - 9092:9092
+     - 9093:9093
     links:
      - zookeeper
     environment:
      - ZOOKEEPER_CONNECT=zookeeper:2181
+     - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+     - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+     - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+     - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   mysql:
     image: quay.io/debezium/example-mysql:${DEBEZIUM_VERSION}
     ports:
diff --git a/tutorial/docker-compose-oracle.yaml b/tutorial/docker-compose-oracle.yaml
index a2621520..a33e6ed3 100644
--- a/tutorial/docker-compose-oracle.yaml
+++ b/tutorial/docker-compose-oracle.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-     - 9092:9092
+     - 9093:9093
     links:
      - zookeeper
     environment:
      - ZOOKEEPER_CONNECT=zookeeper:2181
+     - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+     - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+     - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+     - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   connect:
     image: debezium/connect-with-oracle-jdbc:${DEBEZIUM_VERSION}
     build:
diff --git a/tutorial/docker-compose-postgres.yaml b/tutorial/docker-compose-postgres.yaml
index f9812768..34098c40 100644
--- a/tutorial/docker-compose-postgres.yaml
+++ b/tutorial/docker-compose-postgres.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-     - 9092:9092
+     - 9093:9093
     links:
      - zookeeper
     environment:
      - ZOOKEEPER_CONNECT=zookeeper:2181
+     - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+     - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+     - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+     - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   postgres:
     image: quay.io/debezium/example-postgres:${DEBEZIUM_VERSION}
     ports:
diff --git a/tutorial/docker-compose-sqlserver.yaml b/tutorial/docker-compose-sqlserver.yaml
index b81e1a54..ce1b903f 100644
--- a/tutorial/docker-compose-sqlserver.yaml
+++ b/tutorial/docker-compose-sqlserver.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-     - 9092:9092
+     - 9093:9093
     links:
      - zookeeper
     environment:
      - ZOOKEEPER_CONNECT=zookeeper:2181
+     - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+     - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+     - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+     - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   sqlserver:
     image: mcr.microsoft.com/mssql/server:2019-latest
     ports:
diff --git a/tutorial/docker-compose-vitess.yaml b/tutorial/docker-compose-vitess.yaml
index 52b86e37..9bacc45b 100644
--- a/tutorial/docker-compose-vitess.yaml
+++ b/tutorial/docker-compose-vitess.yaml
@@ -9,11 +9,15 @@ services:
   kafka:
     image: quay.io/debezium/kafka:${DEBEZIUM_VERSION}
     ports:
-      - 9092:9092
+      - 9093:9093
     links:
       - zookeeper
     environment:
       - ZOOKEEPER_CONNECT=zookeeper:2181
+      - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
+      - KAFKA_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
+      - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
+      - KAFKA_INTER_BROKER_LISTENER_NAME=CLIENT
   vitess:
     image: quay.io/debezium/example-vitess:${DEBEZIUM_VERSION}
     build: