diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8fe9ab77..d6962ce8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ jobs:
         environment:
           ZOOKEEPER_CLIENT_PORT: 2181
           ZOOKEEPER_TICK_TIME: 2000
-      - image: mongey/kafka
+      - image: mongey/kafka:5.0.0
         environment:
           KAFKA_BROKER_ID: 1
           KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
diff --git a/Dockerfile b/Dockerfile
index c0f16495..6330c9ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM confluentinc/cp-kafka:4.0.0-2
+FROM confluentinc/cp-kafka:5.0.0
 COPY secrets/ /etc/kafka/secrets
 
 ENV KAFKA_ADVERTISED_LISTENERS=SSL://localhost:9092
@@ -10,5 +10,7 @@ ENV KAFKA_SSL_TRUSTSTORE_FILENAME=kafka.broker1.truststore.jks
 ENV KAFKA_SSL_TRUSTSTORE_CREDENTIALS=broker1_truststore_creds
 ENV KAFKA_SECURITY_INTER_BROKER_PROTOCOL=SSL
 ENV KAFKA_SSL_CLIENT_AUTH=required
+ENV KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM=
+ENV KAFKA_LISTENER_NAME_INTERNAL_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM=
 ENV KAFKA_ALLOW_EVERYONE_IF_NO_ACL_FOUND="true"
 ENV KAFKA_AUTHORIZER_CLASS_NAME=kafka.security.auth.SimpleAclAuthorizer