diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 85e9664d..56700d58 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,7 +36,7 @@ jobs:
             --no-deps \
             --no-cache-dir \
             --dest deps \
-            --no-binary=chaostoolkit-aws,chaostoolkit-azure,chaostoolkit-cloud-foundry,chaostoolkit-google-cloud-platform,chaostoolkit-humio,chaostoolkit-kubernetes,chaostoolkit-prometheus,chaostoolkit-spring,chaostoolkit-toxiproxy,chaostoolkit-opentracing,chaostoolkit-service-fabric,chaostoolkit-istio,chaostoolkit-wiremock,chaostoolkit-gandi,chaostoolkit-dynatrace,chaostoolkit-reliably,chaostoolkit-addons,chaostoolkit-grafana,chaostoolkit-slack,chaostoolkit-datadog,chaostoolkit-terraform,chaostoolkit-honeycomb \
+            --no-binary=chaostoolkit-aws,chaostoolkit-azure,chaostoolkit-cloud-foundry,chaostoolkit-google-cloud-platform,chaostoolkit-humio,chaostoolkit-kubernetes,chaostoolkit-prometheus,chaostoolkit-spring,chaostoolkit-toxiproxy,chaostoolkit-opentracing,chaostoolkit-service-fabric,chaostoolkit-istio,chaostoolkit-wiremock,chaostoolkit-gandi,chaostoolkit-dynatrace,chaostoolkit-reliably,chaostoolkit-addons,chaostoolkit-grafana,chaostoolkit-slack,chaostoolkit-datadog,chaostoolkit-terraform,chaostoolkit-honeycomb,chaostoolkit-kafka \
             -r requirements-toolkit.txt
 
         echo "Installing each extension individually"
diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml
index f0353704..363b8b12 100644
--- a/.github/workflows/build_and_deploy.yaml
+++ b/.github/workflows/build_and_deploy.yaml
@@ -39,7 +39,7 @@ jobs:
             --no-deps \
             --no-cache-dir \
             --dest deps \
-            --no-binary=chaostoolkit-aws,chaostoolkit-azure,chaostoolkit-cloud-foundry,chaostoolkit-google-cloud-platform,chaostoolkit-humio,chaostoolkit-kubernetes,chaostoolkit-prometheus,chaostoolkit-spring,chaostoolkit-toxiproxy,chaostoolkit-opentracing,chaostoolkit-service-fabric,chaostoolkit-istio,chaostoolkit-wiremock,chaostoolkit-gandi,chaostoolkit-dynatrace,chaostoolkit-k6,chaostoolkit-ansible,chaostoolkit-reliably,chaostoolkit-addons,chaostoolkit-grafana,chaostoolkit-slack,chaostoolkit-datadog,chaostoolkit-terraform,chaostoolkit-honeycomb \
+            --no-binary=chaostoolkit-aws,chaostoolkit-azure,chaostoolkit-cloud-foundry,chaostoolkit-google-cloud-platform,chaostoolkit-humio,chaostoolkit-kubernetes,chaostoolkit-prometheus,chaostoolkit-spring,chaostoolkit-toxiproxy,chaostoolkit-opentracing,chaostoolkit-service-fabric,chaostoolkit-istio,chaostoolkit-wiremock,chaostoolkit-gandi,chaostoolkit-dynatrace,chaostoolkit-k6,chaostoolkit-ansible,chaostoolkit-reliably,chaostoolkit-addons,chaostoolkit-grafana,chaostoolkit-slack,chaostoolkit-datadog,chaostoolkit-terraform,chaostoolkit-honeycomb,chaostoolkit-kafka \
             -r requirements-toolkit.txt
 
         echo "Installing each extension individually"
diff --git a/extensions-doc-builder/extensions.json b/extensions-doc-builder/extensions.json
index 90ead766..715a96db 100644
--- a/extensions-doc-builder/extensions.json
+++ b/extensions-doc-builder/extensions.json
@@ -108,5 +108,10 @@
         "name": "chaoshoneycomb",
         "doc_path": "../sources/drivers/honeycomb.md",
         "repo": "https://github.com/chaostoolkit-incubator/chaostoolkit-honeycomb"
+    },
+    {
+        "name": "chaoskafka",
+        "doc_path": "../sources/drivers/kafka.md",
+        "repo": "https://github.com/friki-io/chaostoolkit-kafka"
     }
 ]
\ No newline at end of file
diff --git a/extensions-doc-builder/requirements-toolkit.txt b/extensions-doc-builder/requirements-toolkit.txt
index 1d6882fb..c8016b5f 100644
--- a/extensions-doc-builder/requirements-toolkit.txt
+++ b/extensions-doc-builder/requirements-toolkit.txt
@@ -23,3 +23,4 @@ chaostoolkit-slack
 chaostoolkit-datadog
 chaostoolkit-terraform
 chaostoolkit-honeycomb
+chaostoolkit-kafka
diff --git a/mkdocs.yml b/mkdocs.yml
index 5472de99..196121da 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -126,6 +126,7 @@ nav:
               - Service Fabric: drivers/service-fabric.md
           - Application:
               - Spring: drivers/spring.md
+              - Kafka: drivers/kafka.md
           - Network:
               - ToxiProxy: drivers/toxiproxy.md
               - Istio: drivers/istio.md
diff --git a/sources/drivers/kafka.md b/sources/drivers/kafka.md
new file mode 100644
index 00000000..e69de29b