diff --git a/docs/user/access-your-dappnode/vpn/tailscale.md b/docs/user/access-your-dappnode/vpn/tailscale.md
index 4796f7b8b..e365cf9e4 100644
--- a/docs/user/access-your-dappnode/vpn/tailscale.md
+++ b/docs/user/access-your-dappnode/vpn/tailscale.md
@@ -12,65 +12,131 @@ Using Tailscale is an excellent alternative if you're experiencing issues with U
Before starting, ensure you have:
+- Access to your [Dappnode's Admin UI](http://my.dappnode).
- A [Tailscale account](https://tailscale.com/).
-- Tailscale installed on your device. Download [here](https://tailscale.com/download)
-- Having access to your [Dappnode's Admin UI](https://my.dappnode)
+- Tailscale installed on the device you want to access your Dappnode from. Download [here](https://tailscale.com/download).
-## Step 1: Create an Auth Key
+## Setting Up Tailscale
-1. Visit [Tailscale Admin Settings](https://login.tailscale.com/admin/settings/keys).
-
+### 1. Create an Auth Key
+
+1. Log in to Tailscale and navigate to [Tailscale Admin Settings](https://login.tailscale.com/admin/settings/keys). Click on ***Generate auth key***.
+
+ 
+
2. Create a new auth key. Any name will work.
-
-3. Save the key for the next step.
-
+
+ 
+
+3. Save the key for the next step. Do not share this key with anyone.
+
+ 
+
-## Step 2: Install Tailscale on Your Dappnode
+### 2. Install Tailscale on Your Dappnode
1. Access your [Dappnode's Admin UI](https://my.dappnode)
2. Navigate to **Dappstore** and search for the `Tailscale` package.
3. Click **Install**
4. Go to the Tailscale package in **Packages** tab and enter the auth key you created during installation.
-
+
+ 
+
-Once installed, Tailscale will run as a service on your Dappnode.
+Once installed, Tailscale will run as as any other package on your Dappnode. In order to connect to your Dappnode with Tailscale, this package will need to be running.
-## Step 3: Configure Tailscale to Connect to Dappnode Internal Networks
+### 3. Configure Tailscale to Connect to Dappnode Internal Networks
-### a. Accept Advertised Routes from Your Dappnode
+#### a. Accept Advertised Routes from Your Dappnode
1. Go to your [Tailscale Machines Dashboard](https://login.tailscale.com/admin/machines).
-
+
+ 
+
2. Find your Dappnode device in the list of machines
3. Open the "Edit Route Settings" modal and check the Subnet Route that appears.
-
+
+ 
+
-### b. Add a Custom Nameserver
+#### b. Add a Custom Nameserver
1. Go to your [Tailscale DNS Admin Panel](https://login.tailscale.com/admin/dns).
-2. Find the Nameservers section, click Add nameserver button and add a custom nameserver.
-
+2. Find the Nameservers section, click on **"Add nameserver"** and add a custom nameserver.
+
+ 
+
+
3. Fill the popup with:
- **Nameserver IP:** `172.33.1.2`
- - Activate "Restrict to domain" switch.
+ - Activate **"Restrict to domain"** switch.
- Set the domain as `dappnode`.
-## Step 4: Access Your Dappnode
-### a. Connect to Tailscale
+That's it! You've successfully configured Tailscale to connect to your Dappnode. All that's left is to install Tailscale on the device you want to access your Dappnode from.
+
+### 4. Connecting to Dappnode with Tailscale
+
+
+
+macOS
-Ensure that your laptop, computer, or phone is connected to Tailscale.
+1. Open tailscale app in your finder
+2. Go to the top bar and click the tailscale logo (9 dots)
+
+ 
+
+3. Activate the switch to connect.
-### b. Access Dappnode Services
+
-Visit [http://my.dappnode](http://my.dappnode) in your browser.
+
+ Linux
-:::warning
-Have 2 or more Dappnodes? It won't work out of the box. You won't be able to choose which one it connects to.
+1. Open up a terminal and run the following command:
+```bash
+sudo tailscale up --accept-routes
+```
-You need to go to the machines you don't want to access and disable subnet routes. Your Tailscale will then direct you to the Dappnode that has subnets activated.
+2. If it's your first time using Tailscale in this device, a browser window may open asking to connect this device to your Tailscale account. Click on **"Connect"**. That's it! You're now connected to your Dappnode.
+
+3. To stop Tailscale in any moment, run the following command:
+```bash
+sudo tailscale down
+```
+:::info
+Having trouble using Tailscale on Linux? Check out the [Tailscale Linux documentation](https://tailscale.com/kb/1031/install-linux) for more information.
:::
----
+
+
+
+Windows
+
+1. Once installed, Tailscale's icon will appear in your system tray. Click on it.
+2. If it's your first time using Tailscale in this device, a browser window may open asking to connect this device to your Tailscale account. Click on **"Connect"**. That's it! You're now connected to your Dappnode.
+
+
+ 
+
+
+3. To disconnect tailscale, right click on the icon on the system tray and log out or exit the application.
+
+:::info
+Having trouble using Tailscale on Windows? Check out the [Tailscale Windows documentation](https://tailscale.com/kb/1022/install-windows) for more information.
+:::
+
+
+
+
+Android
+
+1. Open your Tailscale app
+2. Connect to your dappnode by clicking on the "Connect" button.
+
+
+
+
+
-If you encounter any issues or need further assistance, refer to the [Dappnode Community Forums](https://forum.dappnode.io/) or the [Tailscale Support](https://tailscale.com/support/).
+If you encounter any issues or need further assistance, refer to Dappnode's [Discord](https://discord.gg/dappnode), the [Dappnode Community Forums](https://forum.dappnode.io/), or [Tailscale Support](https://tailscale.com/support/).
diff --git a/static/img/tailscale-2.png b/static/img/tailscale-2.png
new file mode 100644
index 000000000..86fa624c9
Binary files /dev/null and b/static/img/tailscale-2.png differ
diff --git a/static/img/tailscalewindows.png b/static/img/tailscalewindows.png
new file mode 100644
index 000000000..956afd095
Binary files /dev/null and b/static/img/tailscalewindows.png differ