diff --git a/public/svgs/tailscale.svg b/public/svgs/tailscale.svg
new file mode 100644
index 000000000..cde7dbd50
--- /dev/null
+++ b/public/svgs/tailscale.svg
@@ -0,0 +1,7 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" id="Tailscale--Streamline-Simple-Icons" height="24" width="24">
+  <desc>
+    Tailscale Streamline Icon: https://streamlinehq.com
+  </desc>
+  <title>Tailscale</title>
+  <path d="M24 12a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zm-9 9a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zm0 -9a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zm6 -6a3 3 0 1 1 0 -6 3 3 0 0 1 0 6zm0 -0.5a2.5 2.5 0 1 0 0 -5 2.5 2.5 0 0 0 0 5zM3 24a3 3 0 1 1 0 -6 3 3 0 0 1 0 6zm0 -0.5a2.5 2.5 0 1 0 0 -5 2.5 2.5 0 0 0 0 5zm18 0.5a3 3 0 1 1 0 -6 3 3 0 0 1 0 6zm0 -0.5a2.5 2.5 0 1 0 0 -5 2.5 2.5 0 0 0 0 5zM6 12a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zm9 -9a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zm-3 2.5a2.5 2.5 0 1 0 0 -5 2.5 2.5 0 0 0 0 5zM6 3a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zM3 5.5a2.5 2.5 0 1 0 0 -5 2.5 2.5 0 0 0 0 5z" fill="#000000" stroke-width="1"></path>
+</svg>
\ No newline at end of file
diff --git a/templates/compose/tailscale.yaml b/templates/compose/tailscale.yaml
new file mode 100644
index 000000000..3fd0ae622
--- /dev/null
+++ b/templates/compose/tailscale.yaml
@@ -0,0 +1,37 @@
+# documentation: https://tailscale.com/kb
+# slogan: Tailscale securely connects your devices over the internet using WireGuard.
+# category: networking
+# tags: vpn, wireguard, remote-access
+# logo: svgs/tailscale.svg
+
+version: '3.7'
+services:
+  tailscale-nginx:
+    image: 'tailscale/tailscale:latest'
+    hostname: '${TS_HOSTNAME:-coolify-ts}'
+    environment:
+      - 'TS_HOSTNAME=${TS_HOSTNAME:-coolify-ts}'
+      - 'TS_AUTHKEY=${TS_AUTHKEY:-your_authkey}'
+      - 'TS_STATE_DIR=${TS_STATE_DIR:-/var/lib/tailscale}'
+      - 'TS_USERSPACE=${TS_USERSPACE:-false}'
+    volumes:
+      - 'tailscale-state:/var/lib/tailscale'
+    devices:
+      - '/dev/net/tun:/dev/net/tun'
+    cap_add:
+      - net_admin
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "tailscale status --json | grep -q 'BackendState'"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  nginx:
+    image: nginx
+    depends_on:
+      - tailscale-nginx
+    network_mode: 'service:tailscale-nginx'
+
+volumes:
+  tailscale-state: null