diff --git a/Database/docker-compose.yml b/Database/docker-compose.yml
index b4935f9..b532725 100644
--- a/Database/docker-compose.yml
+++ b/Database/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - proxy
     labels:
       - "traefik.enable=true"
-      - "traefik.tcp.routers.mongodb.rule=HostSNI(`*`)"
+      - "traefik.tcp.routers.mongodb.rule=HostSNI(`mongo.luke-else.co.uk`)"
       - "traefik.tcp.routers.mongodb.entrypoints=mongo"
       - "traefik.tcp.routers.mongodb.service=mongodb"
       - "traefik.tcp.services.mongodb.loadbalancer.server.port=27017"
diff --git a/Kafka/docker-compose.yml b/Kafka/docker-compose.yml
index b2edd49..dd48c34 100644
--- a/Kafka/docker-compose.yml
+++ b/Kafka/docker-compose.yml
@@ -22,16 +22,19 @@ services:
       - proxy
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_LISTENERS: PLAINTEXT://server.luke-else.co.uk:9092
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://server.luke-else.co.uk:9092
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
+      KAFKA_HOSTNAME: "kafka.luke-else.co.uk"
+      KAFKA_LISTENERS: "INTERNAL://kafka:9092,EXTERNAL://0.0.0.0:9093"
+      KAFKA_ADVERTISED_LISTENERS: "INTERNAL://kafka:9092,EXTERNAL://kafka.luke-else.co.uk:9093"
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT"
+      KAFKA_INTER_BROKER_LISTENER_NAME: "INTERNAL"
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
     labels:
       - "traefik.enable=true"
-      - "traefik.tcp.routers.kafka.rule=HostSNI(`*`)"
+      - "traefik.tcp.routers.kafka.rule=HostSNI(`kafka.luke-else.co.uk`)"
       - "traefik.tcp.routers.kafka.entrypoints=kafka"
       - "traefik.tcp.routers.kafka.service=kafka"
-      - "traefik.tcp.services.kafka.loadbalancer.server.port=9092"
+      - "traefik.tcp.services.kafka.loadbalancer.server.port=9093"
 
 networks:
   kafka_network:
diff --git a/Traefik/docker-compose.yml b/Traefik/docker-compose.yml
index ca6d0aa..9880bb4 100644
--- a/Traefik/docker-compose.yml
+++ b/Traefik/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - "--providers.docker.exposedbydefault=false"
       - "--entrypoints.web.address=:80"
       - "--entrypoints.websecure.address=:443"
-      - "--entrypoints.kafka.address=:9092"
+      - "--entrypoints.kafka.address=:9093"
       - "--entrypoints.mongo.address=:27017"
       - "--certificatesresolvers.myresolver.acme.tlschallenge=true"
       - "--certificatesresolvers.myresolver.acme.email=contact@luke-else.co.uk"
@@ -17,7 +17,7 @@ services:
     ports:
       - "80:80"
       - "443:443"
-      - "9092:9092"
+      - "9093:9093"
       - "27017:27017"
     volumes:
       - "./letsencrypt:/letsencrypt"
diff --git a/todo.md b/todo.md
index 8d9e498..37fea1a 100644
--- a/todo.md
+++ b/todo.md
@@ -10,7 +10,7 @@
    - ssh
    - ftp
    - 27017
-   - 9092
+   - 9093
 
 - Install SSH keys
 - Setup unattended upgrades