diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index a5e3e44396f84..dba92a0046034 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -35,7 +35,7 @@ services:
         restart: on-failure
 
     kafka:
-        image: bitnami/kafka:2.8.1-debian-10-r99
+        image: ghcr.io/posthog/kafka-container:v2.8.2
         restart: on-failure
         depends_on:
             - zookeeper
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 84f0f1c827174..2045dee0804c5 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -46,6 +46,8 @@ services:
         extends:
             file: docker-compose.base.yml
             service: zookeeper
+        ports:
+            - '2181:2181'
 
     kafka:
         extends: