diff --git a/src/pages/how-to/ssh.mdx b/src/pages/how-to/ssh.mdx
index a11679c2..33697ec9 100644
--- a/src/pages/how-to/ssh.mdx
+++ b/src/pages/how-to/ssh.mdx
@@ -12,27 +12,47 @@ NetBird provides SSH access to peers through its built-in SSH server. Unlike tra
## Concepts
### SSH Server
-Each NetBird peer can run an SSH server by enabling `--allow-server-ssh`. The server listens on TCP port 22022 internally but automatically redirects traffic from port 22 (from NetBird network only) for seamless integration with standard SSH workflows.
+
+Each NetBird peer can run an embedded SSH server by enabling `--allow-server-ssh`. From the peer's perspective the session arrives on its normal port (TCP 22); internally it's re-routed to the NetBird client on port 22022.
+
+Management may automatically ensure the mesh access policy permits 22022 for a peer when the policy explicitly allows port 22 (or a range containing 22) and the peer advertises native SSH support (NetBird v0.60.0+). That access policy is distributed by the management plane; enforcement and forwarding are performed by the NetBird client on the peer.
### Authentication Methods
-- **JWT Authentication (default)**: Connects SSH sessions to user identities via your configured Identity Provider. Requires OIDC flow on first connection.
-- **Machine Identity (`--disable-ssh-auth`)**: Allows SSH access based on network-level ACL policies without user authentication.
+
+- **JWT Authentication (default)**: Maps SSH sessions to user identities via your configured Identity Provider (OIDC). Each new session will require completing the OIDC flow to mint the JWT used for SSH authentication (unless JWT caching is enabled, in which case JWT tokens are cached for a configurable duration).
+- **Machine Identity (`--disable-ssh-auth`)**: When SSH auth is disabled, SSH access is governed by NetBird network ACLs (machine-level access) rather than per-user JWT identity.
### OpenSSH Integration
-For OpenSSH clients, NetBird installs a configuration file (`/etc/ssh/ssh_config.d/99-netbird.conf`) that automatically detects NetBird SSH servers and handles JWT authentication transparently.
+
+NetBird can provide configuration so the remote peer's OpenSSH clients behave transparently. The remote peer's NetBird client performs interception and JWT handling; NetBird may install OpenSSH configuration snippets on the client to simplify usage. The interception and forwarding logic lives in the remote peer's NetBird client, not the management server.
### Port 22 Redirection
-When the SSH server is enabled, NetBird redirects inbound TCP port 22 traffic (from the NetBird network only) to port 22022. This allows standard SSH clients to connect to port 22 without configuration changes while keeping your system's existing SSH server (if any) accessible from outside the NetBird network.
+
+The management server does not edit your host OS firewall or perform OS-level port redirects. The model is:
+
+- **22** - the standard SSH port used by SSH clients and the local SSH daemon.
+- **22022** - the NetBird-native endpoint used by the NetBird client on remote peers. When NetBird SSH is enabled for a peer, standard SSH traffic is redirected here.
+
+**Behavior:**
+
+- A modern NetBird client can intercept an `ssh user@remote` (which targets remote:22) and redirect the SSH stream to the NetBird client on port 22022.
+- Management will auto-add a NetBird access-policy rule for 22022 when a policy allows 22 (or a range containing 22) and the peer supports native SSH (v0.60.0+) and SSH is enabled on the peer in the NetBird dashboard.
## Requirements
To use SSH access through NetBird, you need:
-1. **NetBird v0.60.0 or later** installed on both client and server
-2. **SSH enabled on target peer** - The peer must run with `--allow-server-ssh`
-3. **SSH enabled in Dashboard** - SSH access must be enabled for the peer
-4. **Access Control Policy** - An ACL rule allowing TCP port 22022 access
-5. **(Optional)** For JWT authentication: An Identity Provider configured in NetBird
+1. **NetBird v0.60.0 or later** on peers that should support native SSH (dev/development versions are treated as supporting native SSH).
+2. **SSH enabled on target peer** - the peer must run with `--allow-server-ssh`.
+3. **SSH enabled in Dashboard** - SSH access must be enabled for the peer and ServerSSHAllowed set in the peer meta.
+4. **Access Control Policy** - an ACL rule allowing TCP port 22 for the peer (management will auto-add 22022 behind the scenes for modern peers).
+5. **(Optional)** For JWT authentication: an Identity Provider configured in NetBird.
+
+
+
+
-
-