diff --git a/docs/source/documentation/brainglobe-workflows/brainmapper/index.md b/docs/source/documentation/brainglobe-workflows/brainmapper/index.md
index febc4eee..a97a3fa7 100644
--- a/docs/source/documentation/brainglobe-workflows/brainmapper/index.md
+++ b/docs/source/documentation/brainglobe-workflows/brainmapper/index.md
@@ -28,12 +28,8 @@ training/index
 
 ## Troubleshooting
 
-```{toctree}
-:maxdepth: 1
-troubleshooting/index
-troubleshooting/error-messages
-troubleshooting/speed-up
-```
+Since `brainmapper` uses `cellfinder`, you may encounter issues when using the command-line tool that are [documented on the `cellfinder` page](../cellfinder/troubleshooting/index.md).
+[Head there](../cellfinder/troubleshooting/index.md) for more information on some common issues and debugging tips.
 
 ## Notes
 
diff --git a/docs/source/documentation/cellfinder/index.md b/docs/source/documentation/cellfinder/index.md
index a448a1db..01e3e910 100644
--- a/docs/source/documentation/cellfinder/index.md
+++ b/docs/source/documentation/cellfinder/index.md
@@ -49,8 +49,14 @@ user-guide/cellfinder-core
 user-guide/training-strategy
 ```
 
-If you are experiencing issues with `cellfinder`'s speed or configuration, you may want to take a look at the [troubleshooting guide for `brainmapper`](../brainglobe-workflows/brainmapper/troubleshooting/index.md).
-`brainmapper` uses your `cellfinder` installation when it runs, and many of the problems you encounter with `cellfinder` will be solved in the same way as those for `brainmapper`.
+## Troubleshooting
+
+```{toctree}
+:maxdepth: 1
+troubleshooting/index
+troubleshooting/error-messages
+troubleshooting/speed-up
+```
 
 ## Citing cellfinder
 
diff --git a/docs/source/documentation/brainglobe-workflows/brainmapper/troubleshooting/error-messages.md b/docs/source/documentation/cellfinder/troubleshooting/error-messages.md
similarity index 100%
rename from docs/source/documentation/brainglobe-workflows/brainmapper/troubleshooting/error-messages.md
rename to docs/source/documentation/cellfinder/troubleshooting/error-messages.md
diff --git a/docs/source/documentation/brainglobe-workflows/brainmapper/troubleshooting/index.md b/docs/source/documentation/cellfinder/troubleshooting/index.md
similarity index 100%
rename from docs/source/documentation/brainglobe-workflows/brainmapper/troubleshooting/index.md
rename to docs/source/documentation/cellfinder/troubleshooting/index.md
diff --git a/docs/source/documentation/brainglobe-workflows/brainmapper/troubleshooting/speed-up.md b/docs/source/documentation/cellfinder/troubleshooting/speed-up.md
similarity index 100%
rename from docs/source/documentation/brainglobe-workflows/brainmapper/troubleshooting/speed-up.md
rename to docs/source/documentation/cellfinder/troubleshooting/speed-up.md