diff --git a/docker-compose.yml b/docker-compose.yml
index 6eb6941..1be391a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,8 @@
 version: "3.3"
+
 services:
   spark-master:
-    image: nstanger/spark:latest
+    image: "nstanger/spark:latest"
     container_name: spark-master
     hostname: spark-master
     ports:
@@ -47,15 +48,41 @@
     working_dir: /home/pyspark/work
     volumes:
       - ${HOME}/tmp/sparkdata:/mnt/sparkdata
-  kafka:
-    image: nstanger/kafka:latest
-    hostname: kafka
+  zookeeper:
+    image: "bitnami/zookeeper:3"
+    hostname: zookeeper
     ports:
-      - 9092
+      - "2181:2181"
     networks:
       - spark-network
     volumes:
+      - "zookeeper_data:/bitnami"
+    environment:
+      - ALLOW_ANONYMOUS_LOGIN=yes
+  kafka:
+    image: "bitnami/kafka:2"
+    hostname: kafka
+    ports:
+      - "9092:9092"
+    networks:
+      - spark-network
+    environment:
+      - "ALLOW_PLAINTEXT_LISTENER=yes"
+      - "KAFKA_LISTENERS=PLAINTEXT://0.0.0.0:9092"
+      - "KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://localhost:9092"
+      - "KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper:2181"
+    volumes:
       - ${HOME}/tmp/sparkdata:/mnt/sparkdata
+      - 'kafka_data:/bitnami'
+    depends_on:
+      - zookeeper
+
+volumes:
+  zookeeper_data:
+    driver: local
+  kafka_data:
+    driver: local
+
 networks:
   spark-network:
     driver: bridge