diff --git a/docs/rst/daemon/configuration.rst b/docs/rst/daemon/configuration.rst
index d5e65d18..506e3df9 100644
--- a/docs/rst/daemon/configuration.rst
+++ b/docs/rst/daemon/configuration.rst
@@ -20,13 +20,11 @@ the various options available.
 
    configuration/conf_file.rst
    configuration/components_and_profiles.rst
-   configuration/features.rst
    configuration/configuration_option_types.rst
-   configuration/settings.rst
    configuration/modifying_configuration.rst
    configuration/migration.rst
+   configuration/features.rst
+   configuration/settings.rst
    configuration/alsa.rst
    configuration/bluetooth.rst
    configuration/access.rst
-   configuration/locations.rst
-   configuration/multi_instance.rst
diff --git a/docs/rst/daemon/configuration/meson.build b/docs/rst/daemon/configuration/meson.build
index edcc93b4..679c4aff 100644
--- a/docs/rst/daemon/configuration/meson.build
+++ b/docs/rst/daemon/configuration/meson.build
@@ -10,6 +10,4 @@ sphinx_files += files(
   'alsa.rst',
   'bluetooth.rst',
   'access.rst',
-  'locations.rst',
-  'multi_instance.rst',
 )
diff --git a/docs/rst/daemon/configuration/migration.rst b/docs/rst/daemon/configuration/migration.rst
index 55b67f5d..8f7b7e93 100644
--- a/docs/rst/daemon/configuration/migration.rst
+++ b/docs/rst/daemon/configuration/migration.rst
@@ -302,4 +302,4 @@ and also make sure to require it in the profile:
    the XDG base directory specification for data files is honored, so the new
    location for custom scripts is ``~/.local/share/wireplumber/scripts/`` and
    anything else specified in ``$XDG_DATA_HOME`` and ``$XDG_DATA_DIRS``. See
-   :ref:`config_locations` for more information.
+   :ref:`daemon_file_locations` for more information.
diff --git a/docs/rst/daemon/configuration/settings.rst b/docs/rst/daemon/configuration/settings.rst
index 2b4e065a..7a5191ff 100644
--- a/docs/rst/daemon/configuration/settings.rst
+++ b/docs/rst/daemon/configuration/settings.rst
@@ -1,6 +1,6 @@
 .. _config_settings:
 
-Well-known Settings
+Well-known settings
 ===================
 
 This section describes the settings that can be configured on WirePlumber.
diff --git a/docs/rst/daemon/configuration/locations.rst b/docs/rst/daemon/locations.rst
similarity index 98%
rename from docs/rst/daemon/configuration/locations.rst
rename to docs/rst/daemon/locations.rst
index dc44ed87..702828bf 100644
--- a/docs/rst/daemon/configuration/locations.rst
+++ b/docs/rst/daemon/locations.rst
@@ -1,7 +1,9 @@
-.. _config_locations:
+.. _daemon_file_locations:
 
-Locations of files
-==================
+Locations of WirePlumber's files
+================================
+
+.. _config_locations:
 
 Location of configuration files
 -------------------------------
diff --git a/docs/rst/daemon/meson.build b/docs/rst/daemon/meson.build
index c6361818..79e25377 100644
--- a/docs/rst/daemon/meson.build
+++ b/docs/rst/daemon/meson.build
@@ -3,7 +3,9 @@ sphinx_files += files(
    'installing.rst',
    'running.rst',
    'configuration.rst',
+   'locations.rst',
    'logging.rst',
+   'multi_instance.rst',
 )
 
 subdir('configuration')
diff --git a/docs/rst/daemon/configuration/multi_instance.rst b/docs/rst/daemon/multi_instance.rst
similarity index 98%
rename from docs/rst/daemon/configuration/multi_instance.rst
rename to docs/rst/daemon/multi_instance.rst
index 0cd28311..ed9aea33 100644
--- a/docs/rst/daemon/configuration/multi_instance.rst
+++ b/docs/rst/daemon/multi_instance.rst
@@ -1,4 +1,4 @@
-.. _config_multi_instance:
+.. _daemon_multi_instance:
 
 Running multiple instances
 ==========================
diff --git a/docs/rst/index.rst b/docs/rst/index.rst
index ca9ce563..16e451ae 100644
--- a/docs/rst/index.rst
+++ b/docs/rst/index.rst
@@ -10,7 +10,9 @@ Table of Contents
    daemon/installing.rst
    daemon/running.rst
    daemon/configuration.rst
+   daemon/locations.rst
    daemon/logging.rst
+   daemon/multi_instance.rst
 
 .. toctree::
    :maxdepth: 2