diff --git a/docker-compose.yml b/docker-compose.yml
index a5919c1..8cf9ff3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,6 +29,8 @@ services:
       - db
       - elasticsearch
       - redis
+      - kafka
+      - zookeeper
     networks:
       - proxy
 
@@ -62,9 +64,11 @@ services:
       - db
       - redis
       - elasticsearch
+      - kafka
+      - zookeeper
     environment:
       name: core-services
-      SERVICES: api,library,importqueue,settings,search,socket,imagetransformation,opds
+      SERVICES: api,library,jobqueue,settings,search,socket,imagetransformation,torrentjobs,opds
     env_file: docker-compose.env
     volumes:
       - *comics-volume
@@ -73,6 +77,31 @@ services:
     networks:
       - proxy
 
+  zookeeper:
+    image: zookeeper:latest
+    container_name: zookeeper
+    ports:
+      - "2181:2181"
+    networks:
+      - proxy
+
+  kafka:
+    image: apache/kafka:latest
+    container_name: kafka
+    ports:
+      - "9092:9092"
+    environment:
+      KAFKA_ADVERTISED_LISTENERS: INSIDE://kafka:9093,OUTSIDE://localhost:9092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
+      KAFKA_LISTENERS: INSIDE://0.0.0.0:9093,OUTSIDE://0.0.0.0:9092
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+      - zookeeper
+    networks:
+      - proxy
+
   db:
     image: "bitnami/mongodb:latest"
     container_name: database