diff --git a/pubsub/Dockerfile b/docker/pubsub/Dockerfile
similarity index 96%
rename from pubsub/Dockerfile
rename to docker/pubsub/Dockerfile
index 61bab3a..5905096 100644
--- a/pubsub/Dockerfile
+++ b/docker/pubsub/Dockerfile
@@ -35,7 +35,7 @@ ENV PYGEOAPI_CONFIG=/pygeoapi/local.config.yml
 ENV PYGEOAPI_OPENAPI=/pygeoapi/local.openapi.yml
 ENV PYGEOAPI_ASYNCAPI=/pygeoapi/local.asyncapi.yml
 
-COPY ./docker/pygeoapi-pubsub-demo.config.yml /pygeoapi/local.config.yml
+COPY ./pygeoapi/pygeoapi-pubsub-demo.config.yml /pygeoapi/local.config.yml
 
 RUN apt-get update && \
     apt-get install -y curl && \
diff --git a/pubsub/Makefile b/docker/pubsub/Makefile
similarity index 100%
rename from pubsub/Makefile
rename to docker/pubsub/Makefile
diff --git a/pubsub/README.md b/docker/pubsub/README.md
similarity index 100%
rename from pubsub/README.md
rename to docker/pubsub/README.md
diff --git a/pubsub/docker-compose.override.yml b/docker/pubsub/docker-compose.override.yml
similarity index 97%
rename from pubsub/docker-compose.override.yml
rename to docker/pubsub/docker-compose.override.yml
index 02cd927..410965a 100644
--- a/pubsub/docker-compose.override.yml
+++ b/docker/pubsub/docker-compose.override.yml
@@ -38,3 +38,6 @@ services:
   http-broker:
     ports:
       - 5003:80
+  kafka-broker:
+    ports:
+      - 9092:9092
diff --git a/pubsub/docker-compose.yml b/docker/pubsub/docker-compose.yml
similarity index 93%
rename from pubsub/docker-compose.yml
rename to docker/pubsub/docker-compose.yml
index 093e6f1..a961d45 100644
--- a/pubsub/docker-compose.yml
+++ b/docker/pubsub/docker-compose.yml
@@ -57,6 +57,14 @@ services:
       - pygeoapi-pubsub-demo-net
     <<: *logging
 
+  kafka-broker:
+    container_name: kafka-broker
+    image: apache/kafka:latest
+    restart: unless-stopped
+    networks:
+      - pygeoapi-pubsub-demo-net
+    <<: *logging
+
   pygeoapi-pubsub-demo-api:
     container_name: pygeoapi-pubsub-demo-api
     build:
diff --git a/pubsub/http-broker/ntfy b/docker/pubsub/http-broker/ntfy
similarity index 100%
rename from pubsub/http-broker/ntfy
rename to docker/pubsub/http-broker/ntfy
diff --git a/pubsub/mqtt-broker/Dockerfile b/docker/pubsub/mqtt-broker/Dockerfile
similarity index 100%
rename from pubsub/mqtt-broker/Dockerfile
rename to docker/pubsub/mqtt-broker/Dockerfile
diff --git a/pubsub/mqtt-broker/acl.conf b/docker/pubsub/mqtt-broker/acl.conf
similarity index 100%
rename from pubsub/mqtt-broker/acl.conf
rename to docker/pubsub/mqtt-broker/acl.conf
diff --git a/pubsub/mqtt-broker/entrypoint.sh b/docker/pubsub/mqtt-broker/entrypoint.sh
similarity index 100%
rename from pubsub/mqtt-broker/entrypoint.sh
rename to docker/pubsub/mqtt-broker/entrypoint.sh
diff --git a/pubsub/mqtt-broker/mosquitto.conf b/docker/pubsub/mqtt-broker/mosquitto.conf
similarity index 100%
rename from pubsub/mqtt-broker/mosquitto.conf
rename to docker/pubsub/mqtt-broker/mosquitto.conf
diff --git a/pubsub/docker/pygeoapi-pubsub-demo.config.yml b/docker/pubsub/pygeoapi/pygeoapi-pubsub-demo.config.yml
similarity index 97%
rename from pubsub/docker/pygeoapi-pubsub-demo.config.yml
rename to docker/pubsub/pygeoapi/pygeoapi-pubsub-demo.config.yml
index 0f6e8cc..a8df9f1 100644
--- a/pubsub/docker/pygeoapi-pubsub-demo.config.yml
+++ b/docker/pubsub/pygeoapi/pygeoapi-pubsub-demo.config.yml
@@ -30,6 +30,10 @@ pubsub:
     broker:
         url: http://http-broker
 
+#pubsub:
+#    name: Kafka
+#    broker:
+#        url: tcp://kafka-broker:9092
 
 logging:
     level: DEBUG