diff --git a/kafka_consumer/hatch.toml b/kafka_consumer/hatch.toml
index cb9a27625d16a..5e63ef4b5ed7b 100644
--- a/kafka_consumer/hatch.toml
+++ b/kafka_consumer/hatch.toml
@@ -9,6 +9,7 @@ e2e-env = false
 [envs.default.env-vars]
 ZK_VERSION = "3.6.4"
 LEGACY_CLIENT = "false"
+AUTHENTICATION = "noauth"
 
 [[envs.default.matrix]]
 python = ["3.8"]
@@ -19,6 +20,11 @@ impl = ["legacy"]
 python = ["3.8"]
 version = ["1.1", "2.3", "3.3"]
 
+#[[envs.default.matrix]]
+#python = ["3.8"]
+#version = ["3.3"]
+#auth = ["ssl"]
+
 [envs.default.overrides]
 matrix.version.e2e-env = { value = true, if = ["3.3"] }
 matrix.version.env-vars = [
@@ -29,6 +35,7 @@ matrix.version.env-vars = [
 matrix.impl.env-vars = [
   { key = "LEGACY_CLIENT", value = "true", if = ["legacy"] },
 ]
+matrix.auth.env-vars = "AUTHENTICATION"
 
 [envs.latest.env-vars]
 KAFKA_VERSION = "latest"
diff --git a/kafka_consumer/tests/common.py b/kafka_consumer/tests/common.py
index ae09b96d224f4..b4d538f952058 100644
--- a/kafka_consumer/tests/common.py
+++ b/kafka_consumer/tests/common.py
@@ -14,11 +14,12 @@
 KAFKA_CONNECT_STR = f'{HOST_IP}:9092'
 TOPICS = ['marvel', 'dc']
 PARTITIONS = [0, 1]
-DOCKER_IMAGE_PATH = os.path.join(HERE, 'docker', 'docker-compose.yaml')
 KAFKA_VERSION = os.environ.get('KAFKA_VERSION')
 BROKER_METRICS = ['kafka.broker_offset']
 CONSUMER_METRICS = ['kafka.consumer_offset', 'kafka.consumer_lag']
 LEGACY_CLIENT = is_affirmative(os.environ.get('LEGACY_CLIENT', 'false'))
+AUTHENTICATION = os.environ.get('AUTHENTICATION', 'noauth')
+DOCKER_IMAGE_PATH = os.path.join(HERE, 'docker', AUTHENTICATION, "docker-compose.yaml")
 
 metrics = BROKER_METRICS + CONSUMER_METRICS
 
diff --git a/kafka_consumer/tests/docker/docker-compose.yaml b/kafka_consumer/tests/docker/noauth/docker-compose.yaml
similarity index 90%
rename from kafka_consumer/tests/docker/docker-compose.yaml
rename to kafka_consumer/tests/docker/noauth/docker-compose.yaml
index b2a2e69f2494b..3774e7e3381c8 100644
--- a/kafka_consumer/tests/docker/docker-compose.yaml
+++ b/kafka_consumer/tests/docker/noauth/docker-compose.yaml
@@ -3,6 +3,8 @@ version: '3.9'
 services:
   zookeeper:
     image: docker.io/bitnami/zookeeper:${ZK_VERSION}
+    container_name: zookeeper
+    hostname: zookeeper
     ports:
       - 2181:2181
     environment:
@@ -16,6 +18,8 @@ services:
 
   kafka1:
     image: docker.io/bitnami/kafka:${KAFKA_VERSION}
+    container_name: kafka1
+    hostname: kafka1
     ports:
       - 9092:9092
     environment:
@@ -34,6 +38,8 @@ services:
     image: docker.io/bitnami/kafka:${KAFKA_VERSION}
     ports:
       - 9093:9093
+    container_name: kafka2
+    hostname: kafka2
     environment:
       KAFKA_CFG_BROKER_ID: 2
       KAFKA_CFG_ZOOKEEPER_CONNECT: "zookeeper:2181"
@@ -48,6 +54,8 @@ services:
 
   kafka-init:
     image: docker.io/bitnami/kafka:${KAFKA_VERSION}
+    container_name: kafka-init
+    hostname: kafka-init
     command: >
       sh -c "sleep 10 &&./opt/bitnami/kafka/bin/kafka-topics.sh ${BOOTSTRAP_SERVER_FLAG} --create --topic marvel --if-not-exists --partitions 2 --replication-factor 1 &&
             ./opt/bitnami/kafka/bin/kafka-topics.sh ${BOOTSTRAP_SERVER_FLAG} --create --topic dc --if-not-exists --partitions 2 --replication-factor 1"