diff --git a/source/_integrations/homekit.markdown b/source/_integrations/homekit.markdown
index a7070a0f127..5a85f7585ac 100644
--- a/source/_integrations/homekit.markdown
+++ b/source/_integrations/homekit.markdown
@@ -348,14 +348,7 @@ homekit:
 ```
 
 Restart your Home Assistant instance. This feature requires running an mDNS forwarder on your Docker host, e.g., `avahi-daemon` in reflector mode. This kind of setup most likely requires `safe_mode` during the bridge setup.
-
-## Troubleshooting
-
-If you see a traceback mentioning `zeroconf.NonUniqueNameException` in your log you likely need to
-enable `zeroconf_default_interface: true` and set a unique name `name: MyHASS42`.
-  
-If you had previously paired (even unsuccessfully), you may need to delete your `.homekit.state` file in order to able to successfully pair again.
-  
+ 
 ## Supported Components
 
 The following integrations are currently supported:
@@ -433,7 +426,7 @@ Remember that the iOS device needs to be in the same local network as the Home A
 
 #### `Home Assistant Bridge` doesn't appear in the Home App (for pairing) - Docker
 
-Set `network_mode: host`. If you have further problems this [issue](https://github.com/home-assistant/home-assistant/issues/15692) might help.
+Set `network_mode: host` in your `docker-compose.yaml`. If you have further problems this [issue](https://github.com/home-assistant/home-assistant/issues/15692) might help.
 
 You can also try to use `avahi-daemon` in reflector mode together with the option `advertise_ip`, see above.
 
@@ -445,6 +438,10 @@ Configure the network mode as `networkbridge`. Otherwise the Home Assistant Brid
 
 Pairing eventually fails, you might see and an error message `NonUniqueNameException`. Add the `safe_mode` option to your configuration, see [safe_mode](#safe-mode).
 
+If [safe_mode](#safe-mode) is not successful, you likely need to enable `zeroconf_default_interface: true` and set a unique name such as `name: MyHASS42`.
+  
+If you had previously paired (even unsuccessfully), you may need to delete your `.homekit.state` file in order to able to successfully pair again. See [Errors during pairing](#errors-during-pairing).
+
 #### Pairing hangs - only works with debug configuration
 
 Pairing works fine when the filter is set to only include `demo.demo`, but fails with normal configuration. See [specific entity doesn't work](#specific-entity-doesnt-work)