diff --git a/README.md b/README.md
index de78e8c7b..9bbe8f61e 100644
--- a/README.md
+++ b/README.md
@@ -939,10 +939,10 @@ SOFTWARE.
 [vscode-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [vscode-armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg
 [vscode-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
-[addon-tailscale]: https://github.com/hassio-addons/addon-tailscale/tree/3285675
-[addon-doc-tailscale]: https://github.com/hassio-addons/addon-tailscale/blob/3285675/README.md
+[addon-tailscale]: https://github.com/hassio-addons/addon-tailscale/tree/4318158
+[addon-doc-tailscale]: https://github.com/hassio-addons/addon-tailscale/blob/4318158/README.md
 [tailscale-issue]: https://github.com/hassio-addons/addon-tailscale/issues
-[tailscale-version-shield]: https://img.shields.io/badge/version-3285675-blue.svg
+[tailscale-version-shield]: https://img.shields.io/badge/version-4318158-blue.svg
 [tailscale-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [tailscale-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [tailscale-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
diff --git a/tailscale/CHANGELOG.md b/tailscale/CHANGELOG.md
index 25e962b0f..c2aeb9a2d 100644
--- a/tailscale/CHANGELOG.md
+++ b/tailscale/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog since v0.11.1
+- Make userspace networking configurable (#199)
+
+Co-authored-by: Franck Nijhof <frenck@frenck.nl> 
 - make accepting subnet routes optional (#252) 
 - Use new .Self.CapMap in status JSON for HTTPS support check (#260) 
 - Update Installation section in documentation (#242) 
diff --git a/tailscale/DOCS.md b/tailscale/DOCS.md
index 856bcb4bd..317e45c73 100644
--- a/tailscale/DOCS.md
+++ b/tailscale/DOCS.md
@@ -70,6 +70,7 @@ tags:
   - tag:example
   - tag:homeassistant
 taildrop: true
+userspace_networking: true
 ```
 
 ### Option: `accept_dns`
@@ -186,6 +187,22 @@ the default (`https://controlplane.tailscale.com`). This is useful if you
 are running your own Tailscale control server, for example, a self-hosted
 [Headscale] instance.
 
+### Option: `userspace_networking`
+
+The add-on uses [userspace networking mode][tailscale_info_userspace_networking]
+to make your Home Assistant instance (and optionally the local subnets)
+accessible within your tailnet.
+
+When not set, this option is enabled by default.
+
+If you need to access other clients on your tailnet from your Home Assistant
+instance, disable userspace networking mode, which will create a `tailscale0`
+network interface on your host.
+
+If you want to access other clients on your tailnet even from your local subnet,
+execute steps 2 and 3 as described on [Site-to-site
+networking][tailscale_info_site_to_site].
+
 ### Option: `proxy`
 
 When not set, this option is enabled by default.
@@ -325,3 +342,5 @@ SOFTWARE.
 [tailscale_info_funnel]: https://tailscale.com/kb/1223/tailscale-funnel/
 [tailscale_info_https]: https://tailscale.com/kb/1153/enabling-https/
 [tailscale_info_key_expiry]: https://tailscale.com/kb/1028/key-expiry/
+[tailscale_info_site_to_site]: https://tailscale.com/kb/1214/site-to-site/
+[tailscale_info_userspace_networking]: https://tailscale.com/kb/1112/userspace-networking/
diff --git a/tailscale/README.md b/tailscale/README.md
index 2741193f5..67c554361 100644
--- a/tailscale/README.md
+++ b/tailscale/README.md
@@ -48,5 +48,5 @@ If you are more interested in stable releases of our add-ons:
 [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-3285675-blue.svg
-[release]: https://github.com/hassio-addons/addon-tailscale/tree/3285675
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-4318158-blue.svg
+[release]: https://github.com/hassio-addons/addon-tailscale/tree/4318158
\ No newline at end of file
diff --git a/tailscale/config.yaml b/tailscale/config.yaml
index 82f31a49c..a2897d239 100644
--- a/tailscale/config.yaml
+++ b/tailscale/config.yaml
@@ -1,5 +1,5 @@
 name: Tailscale
-version: '3285675'
+version: '4318158'
 slug: tailscale
 description: Zero config VPN for building secure networks
 url: https://github.com/hassio-addons/addon-tailscale
@@ -36,4 +36,5 @@ schema:
   tags:
   - match(^tag:[a-zA-Z0-9]-?[a-zA-Z0-9]+$)?
   taildrop: bool?
+  userspace_networking: bool?
 image: ghcr.io/hassio-addons/tailscale/{arch}
diff --git a/tailscale/translations/en.yaml b/tailscale/translations/en.yaml
index ab8406872..daf00eedc 100644
--- a/tailscale/translations/en.yaml
+++ b/tailscale/translations/en.yaml
@@ -54,3 +54,11 @@ configuration:
       This option allows you to enable Taildrop, a file sharing service
       that allows you to share files with other Tailscale nodes.
       When not set, this option is enabled by default.
+  userspace_networking:
+    name: Userspace networking mode
+    description: >-
+      This option allows you to enable userspace networking mode.
+      If you need to access other clients on your Tailnet from your Home
+      Assistant instance, disable userspace networking mode, which will create a
+      `tailscale0` network interface on your host.
+      When not set, this option is enabled by default.