diff --git a/public/docs-static/img/how-to-guides/netbird-nameserver-add-button.png b/public/docs-static/img/how-to-guides/netbird-nameserver-add-button.png
index b722d899..fd3da37e 100644
Binary files a/public/docs-static/img/how-to-guides/netbird-nameserver-add-button.png and b/public/docs-static/img/how-to-guides/netbird-nameserver-add-button.png differ
diff --git a/public/docs-static/img/how-to-guides/netbird-nameserver-all-group.png b/public/docs-static/img/how-to-guides/netbird-nameserver-all-group.png
index 1434d019..57b3e1a5 100644
Binary files a/public/docs-static/img/how-to-guides/netbird-nameserver-all-group.png and b/public/docs-static/img/how-to-guides/netbird-nameserver-all-group.png differ
diff --git a/public/docs-static/img/how-to-guides/netbird-nameserver-custom.png b/public/docs-static/img/how-to-guides/netbird-nameserver-custom.png
index b5d81a65..6729fec1 100644
Binary files a/public/docs-static/img/how-to-guides/netbird-nameserver-custom.png and b/public/docs-static/img/how-to-guides/netbird-nameserver-custom.png differ
diff --git a/public/docs-static/img/how-to-guides/netbird-nameserver-remote-resolver.png b/public/docs-static/img/how-to-guides/netbird-nameserver-remote-resolver.png
index e80d1485..95e9904e 100644
Binary files a/public/docs-static/img/how-to-guides/netbird-nameserver-remote-resolver.png and b/public/docs-static/img/how-to-guides/netbird-nameserver-remote-resolver.png differ
diff --git a/public/docs-static/img/how-to-guides/netbird-nameserver-remote-rule.png b/public/docs-static/img/how-to-guides/netbird-nameserver-remote-rule.png
index c863ff00..bb024f1d 100644
Binary files a/public/docs-static/img/how-to-guides/netbird-nameserver-remote-rule.png and b/public/docs-static/img/how-to-guides/netbird-nameserver-remote-rule.png differ
diff --git a/public/docs-static/img/how-to-guides/netbird-nameserver-selection-view-open.png b/public/docs-static/img/how-to-guides/netbird-nameserver-selection-view-open.png
index b43f0dcd..640d4640 100644
Binary files a/public/docs-static/img/how-to-guides/netbird-nameserver-selection-view-open.png and b/public/docs-static/img/how-to-guides/netbird-nameserver-selection-view-open.png differ
diff --git a/src/pages/how-to/manage-dns-in-your-network.mdx b/src/pages/how-to/manage-dns-in-your-network.mdx
index 438fdca2..b1b3083d 100644
--- a/src/pages/how-to/manage-dns-in-your-network.mdx
+++ b/src/pages/how-to/manage-dns-in-your-network.mdx
@@ -30,20 +30,17 @@ To minimize the number of changes in your system, NetBird will spin up a local D
This local resolver will be responsible for queries to the domain names of peers registered in your network and forwarding queries to upstream nameservers you configure in the system.
-It listens on the peer's IP, and usually, it will use the default port 53, but if it is in use, it will use the 5053 port.
-
- Custom port support is not builtin into most operating systems. At the time of release, the supported systems are:
- - MacOS
- - Linux with systemd-resolved
-
#### Nameserver
Nameserver is an upstream DNS server for name resolution, if a query comes and is not a peer domain name, it will be resolved by one of the upstream servers. You can assign private and public IPs and custom ports. Remember that you might need a network route for private addresses to allow peers to connect to it.
#### Match domains
-Match domains allow you to route queries of names, matching them to specific nameservers. This is useful when you have an internal DNS configuration that only internal servers can resolve.
-#### All domains option
-The all domains option defines a default nameserver configuration to resolve all domains that don't have a match domain setting. Because not all operating systems support match domain configuration, we recommend configuring at least one nameserver set with this option enabled per distribution group. You may also consider using the group All for distribution, so you don't have to define multiple sets of nameservers to resolve all domains.
+By default, when creating nameserver groups without match domains, implies that the nameservers will resolve all DNS queries. For some cases, you might want to deploy a split horizon configuration for private or specific domains, Match domains allow you to route queries of names, matching them to specific nameservers. This is useful when you have an internal DNS configuration that only internal servers can resolve.
- A nameserver set may only be configured with either All domains or match domains, you can't have both settings in a single configuration as they overlap.
+ Only MacOS, Windows 10+, and Linux running `systemd-resolved` support nameservers with only match domains. For a better experience, we recommend setting at least a nameserver group without match domains to be applied to the `All` group.
+
+#### Mark match domains as search domains
+Marking a match domain as search domains configures the peers to use only hostnames to perform FQDN queries. e.g. `ping host-a` instead of `ping host-a.netbird.cloud`.
+
+ Marking a match domains as search domains feature is available in NetBird [v0.24.0](https://github.com/netbirdio/netbird/releases) or later.
#### Distribution groups
Distribution defines that peers that belong to groups set in this field will receive the nameserver configuration.
@@ -85,7 +82,6 @@ In the example below, we are creating a nameserver with the following informatio
- Name: `Office resolver`
- Description: `Berlin office resolver`
- Add at least one nameserver: `192.168.0.32` with port `53`
-- Match mode: `All domains`
- Distribution group: `Remote developers`
@@ -100,7 +96,7 @@ Below you can see the same nameserver setup but only for the `berlinoffice.com`
- Currently, only MacOS, Windows 10+, and Linux running systemd-resolved support nameservers without an all domains resolver. For a better experience, we recommend setting at least one all domain resolver to be applied to all groups.
+ Only MacOS, Windows 10+, and Linux running `systemd-resolved` support nameservers with only match domains. For a better experience, we recommend setting at least a nameserver group without match domains to be applied to the `All` group.
### Distributing the settings with groups