diff --git a/doc/specific_iocs/datastreaming/Datastreaming---Sample-Environment.md b/doc/specific_iocs/datastreaming/Datastreaming---Sample-Environment.md
index 213cc3d1b..4fdd8e066 100644
--- a/doc/specific_iocs/datastreaming/Datastreaming---Sample-Environment.md
+++ b/doc/specific_iocs/datastreaming/Datastreaming---Sample-Environment.md
@@ -1,20 +1,17 @@
 # Data streaming: Sample environment forwarding
 
-All IBEX instruments are currently forwarding their sample environment PVs into Kafka. This is done in two parts:
+All IBEX instruments are currently forwarding their sample environment PVs into Kafka.
 
-{#bskafka}
-## BlockserverToKafka
+This will be done in two parts:
 
-This is a Python process that runs on each NDX (see code [here](https://github.com/ISISComputingGroup/EPICS-inst_servers/tree/master/BlockServerToKafka)) it monitors the blockserver config PVs and any time the config changes it pushes a new configuration to the forwarder, via a Kafka topic `forwarder_config`. This is a process written and managed by IBEX developers.
+{#bskafka}
+## Kafka forwarder configurer
 
-The `procserv` name for the BlockServerToKafka service is `BSKAFKA`. 
+Repo [here](https://github.com/ISISComputingGroup/kafka_forwarder_configurer)
 
-## Forwarder
+This is a Python process which monitors the blockserver config PVs and any time the config changes it pushes a new configuration to the forwarder, to its configuration topic.
 
-Source for the forwarder is available [here](https://github.com/ess-dmsc/forwarder)
 
-As of IBEX version 25.8.0 we run this on every instrument under the `FWDR` `procserv` name.
-
-### Forwarder on HIFI
+## Forwarder
 
-HIFI uses a different broker currently, so we have changed the `KAFKA_BROKER` macro for `BSKAFKA` and `FWDR`. This is currently in `globals.txt`. 
+Source for the forwarder is available [here](https://github.com/ISISComputingGroup/forwarder)
diff --git a/doc/spelling_wordlist.txt b/doc/spelling_wordlist.txt
index 6fa703a05..6ba3e442b 100644
--- a/doc/spelling_wordlist.txt
+++ b/doc/spelling_wordlist.txt
@@ -137,6 +137,7 @@ configMenu
 configs
 configtool
 configurator
+configurer
 conserver
 correlator
 Cottee