diff --git a/public/docs-static/img/get-started/android-tv/change-server.png b/public/docs-static/img/get-started/android-tv/change-server.png
new file mode 100644
index 00000000..ed2ab292
Binary files /dev/null and b/public/docs-static/img/get-started/android-tv/change-server.png differ
diff --git a/public/docs-static/img/get-started/android-tv/main-menu-change-server.png b/public/docs-static/img/get-started/android-tv/main-menu-change-server.png
new file mode 100644
index 00000000..66551eb6
Binary files /dev/null and b/public/docs-static/img/get-started/android-tv/main-menu-change-server.png differ
diff --git a/public/docs-static/img/get-started/android-tv/main-screen.png b/public/docs-static/img/get-started/android-tv/main-screen.png
new file mode 100644
index 00000000..a5cac45d
Binary files /dev/null and b/public/docs-static/img/get-started/android-tv/main-screen.png differ
diff --git a/public/docs-static/img/get-started/tvos/authentication-screen.png b/public/docs-static/img/get-started/tvos/authentication-screen.png
new file mode 100644
index 00000000..23e3b7fb
Binary files /dev/null and b/public/docs-static/img/get-started/tvos/authentication-screen.png differ
diff --git a/public/docs-static/img/get-started/tvos/confirm-add-vpn-config.png b/public/docs-static/img/get-started/tvos/confirm-add-vpn-config.png
new file mode 100644
index 00000000..9b5e578a
Binary files /dev/null and b/public/docs-static/img/get-started/tvos/confirm-add-vpn-config.png differ
diff --git a/public/docs-static/img/get-started/tvos/confirm-change-server.png b/public/docs-static/img/get-started/tvos/confirm-change-server.png
new file mode 100644
index 00000000..a7e618e5
Binary files /dev/null and b/public/docs-static/img/get-started/tvos/confirm-change-server.png differ
diff --git a/public/docs-static/img/get-started/tvos/main-screen-connected.png b/public/docs-static/img/get-started/tvos/main-screen-connected.png
new file mode 100644
index 00000000..894357b2
Binary files /dev/null and b/public/docs-static/img/get-started/tvos/main-screen-connected.png differ
diff --git a/src/components/NavigationDocs.jsx b/src/components/NavigationDocs.jsx
index 90444461..e6204131 100644
--- a/src/components/NavigationDocs.jsx
+++ b/src/components/NavigationDocs.jsx
@@ -37,7 +37,9 @@ export const docsNavigation = [
{ title: 'MacOS', href: '/get-started/install/macos' },
{ title: 'Docker', href: '/get-started/install/docker' },
{ title: 'iOS', href: '/get-started/install/ios' },
+ { title: 'tvOS', href: '/get-started/install/tvos'},
{ title: 'Android', href: '/get-started/install/android' },
+ { title: 'Android TV', href: '/get-started/install/android-tv'}
],
},
{
diff --git a/src/pages/get-started/install/android-tv.mdx b/src/pages/get-started/install/android-tv.mdx
new file mode 100644
index 00000000..7023d648
--- /dev/null
+++ b/src/pages/get-started/install/android-tv.mdx
@@ -0,0 +1,86 @@
+import {Note} from "@/components/mdx";
+
+# Install NetBird on an Android TV
+
+The Android TV app supports devices running Android 8.0 or later.
+
+
+
+
+
+
+
+
+Select 'Continue' to ackownledge and you'll be greeted with the app's main screen.
+
+
+
+### Management Server Configuration
+
+
+
+Changing servers erases the device's current NetBird config, so you'll need to confirm the action before proceeding:
+
+
+
+Enter your management server endpoint. For cloud users, this is `https://api.netbird.io:443`. For self-hosted users, it's usually `https://your_management_server_url:443`, but you can refer to your management.json configuration file if you're unsure.
+
+If enrolling the device with a setup key, select '+ Add this device with a setup key' and enter your setup key. Select 'change' to apply your new management server config, and if successful you'll see the following:
+
+
+
+You're now ready to connect to your Netbird network!
+
+#### Connecting to Your Network
+
+Select the NetBird logo button to connect. The app will request permission to create a VPN connection:
+
+
+
+Select 'OK'. If you didn't enter a setup key in the 'Change Server' menu, then you'll need to authenticate with your SSO provider. NetBird will open a browser window where you'll be instructed to sign in to your SSO provider.
+
+After logging in, NetBird will confirm your authentication. Once you close the browser window, your device should be connected!
+
+#### Authenticating
+
+
+
+Scan the QR code with your phone and you'll be able to sign in to your SSO provider there. If asked to confirm your device code, confirm that the code underneath the QR code matches the one presented by your SSO provider. Once you've completed
+the SSO flow, the QR code dialog in the NetBird app will automatically dismiss itself, and your device should now be connected!
+
+## What's next?
+- Manage your device's [access](/manage/access-control/manage-network-access) to the network
+- Use your device for [remote access access to your home network](/manage/networks/homelab/access-home-network)
+- Use your device as an [exit node](/manage/network-routes/configuring-default-routes-for-internet-traffic#make-the-peer-an-exit-node-routing-peer)
+
diff --git a/src/pages/get-started/install/android.mdx b/src/pages/get-started/install/android.mdx
index ecbe4cae..b2c9eb64 100644
--- a/src/pages/get-started/install/android.mdx
+++ b/src/pages/get-started/install/android.mdx
@@ -2,11 +2,7 @@ import {Note} from "@/components/mdx";
# Install NetBird on an Android
-The Android supports mobile devices, tablets and Android TV devices running Android 8.0 or later.
-
-
@@ -63,17 +59,10 @@ Select the NetBird logo button to connect. The app will request permission to cr
Select 'OK'. If you didn't enter a setup key in the 'Change Server' menu, then you'll need to authenticate with your SSO provider. NetBird will open a browser window where you'll be instructed to sign in to your SSO provider.
-After logging in, NetBird will confirm your authentication. Once you close the browser window, your device should be connected!
-
-#### Authenticating on Android TV
-
-Since Android TV doesn't ship with a built-in browser, and entering credentials with a remote may be less than ideal, the TV client uses a slightly different authentication flow. If you're not using a setup key, then after you grant the app permission
-to create a VPN connection, you'll be presented a QR code and device ID:
-
-
+After logging in, NetBird will confirm your authentication. Once you close the browser window, your device should be connected!
-Scan the QR code with your phone and you'll be able to sign in to your SSO provider there. If asked to confirm your device code, confirm that the code underneath the QR code matches the one presented by your SSO provider. Once you've completed
-the SSO flow, the QR code dialog in the NetBird app will automatically dismiss itself, and your device should now be connected!
+## What's next?
+- Configure the device's [group & policy](example.com) memberships
diff --git a/src/pages/get-started/install/tvos.mdx b/src/pages/get-started/install/tvos.mdx
new file mode 100644
index 00000000..f3884e1d
--- /dev/null
+++ b/src/pages/get-started/install/tvos.mdx
@@ -0,0 +1,58 @@
+import {Note} from "@/components/mdx";
+
+# tvOS (Apple TV)
+
+The tvOS app supports all Apple TV devices running tvOS 17.0 or later. It's available to download in the Apple TV app store.
+
+
+
+Upon first launch, NetBird will request permission to create a new VPN configuration. Select 'Allow' to continue.
+
+### Management Server Configuration
+
+
+
+After confirming, you'll be presented with a dialog to enter your management server URL. Cloud users who want to enroll the device with a setup key should enter the URL For cloud users, this is `https://api.netbird.io:443`.
+For self-hosted users, it's usually `https://your_management_server_url:443`, but you can refer to your management.json configuration file if you're unsure.
+
+If enrolling the device with a setup key, select '+ Add this device with a setup key' and enter your setup key. Select 'Change' to apply your new management server config. NetBird will run a brief verification step
+on the details you've entered, after which you can move on to connecting.
+
+### Connecting & Authenticating
+
+On the main 'Connection' screen, select the 'Connect' button to initiate a connection to your NetBird network.
+
+
+
+Scan the QR code with a mobile device and you'll be able to sign in to your SSO provider there. If asked to confirm your device code, confirm that the code underneath the QR code matches the one presented by your SSO provider. Once you've completed
+the SSO flow, after a few seconds the authentication dialog in the NetBird app will automatically dismiss itself. Select the 'Connect' button once more, and your device should now be connected!
+
+
+
+## What's next?
+- Manage your device's [access](/manage/access-control/manage-network-access) to the network
+- Use your device for [remote access access to your home network](/manage/networks/homelab/access-home-network)
+- Use your device as an [exit node](/manage/network-routes/configuring-default-routes-for-internet-traffic#make-the-peer-an-exit-node-routing-peer)
diff --git a/src/pages/ipa/resources/dns.mdx b/src/pages/ipa/resources/dns.mdx
new file mode 100644
index 00000000..e2548a37
--- /dev/null
+++ b/src/pages/ipa/resources/dns.mdx
@@ -0,0 +1,380 @@
+export const description = 'Control DNS management behavior for peer groups'
+
+# DNS Settings
+
+DNS Settings allow you to control whether NetBird manages DNS configuration for specific peer groups. This is useful when certain peers need to maintain their existing DNS setup.
+
+## Understanding DNS Management Modes
+
+NetBird supports two DNS management modes per peer:
+
+### Managed Mode (Default)
+
+When a peer's group is **not** in the disabled management list:
+
+- ✅ NetBird configures the system's DNS settings
+- ✅ All DNS queries route through NetBird's local resolver
+- ✅ Configured nameservers apply to this peer
+- ✅ Centralized DNS control from the dashboard
+
+**Use managed mode when**: You want full control over DNS resolution for the peer.
+
+### Unmanaged Mode
+
+When a peer's group **is** in the disabled management list:
+
+- ✅ NetBird does not modify system DNS settings
+- ✅ Peer uses its pre-existing DNS configuration
+- ✅ All configured nameservers are ignored for this peer
+- ✅ Peer maintains complete DNS independence
+
+**Use unmanaged mode when**:
+- Peer has conflicting VPN or DNS requirements
+- Corporate policy requires specific DNS settings
+- Testing or troubleshooting DNS issues
+- Peer is in a restricted environment
+
+### Client-Side DNS Control
+
+You can also disable DNS management directly on a peer using the `--disable-dns` flag:
+
+```bash
+# Disable DNS management on this peer
+netbird up --disable-dns
+
+# Enable DNS management on this peer
+netbird up --disable-dns=true
+```
+
+This is useful when:
+- You need to disable DNS on a single peer without changing server-side settings
+- Testing DNS behavior locally
+- The peer has special DNS requirements not covered by group settings
+
+
+
+
+### Disable DNS Management for a Group
+
+To prevent NetBird from managing DNS for specific groups:
+
+1. Go to **DNS** → **DNS Settings**
+2. Click the groups selection box and select groups existing groups, or type a new group name and press enter. This will create a new group inline and disable DNS management for said new group.
+3. Click 'Save Changes'.
+
+