diff --git a/tailscale/CHANGELOG.md b/tailscale/CHANGELOG.md
index 4900fd70..81c4b858 100644
--- a/tailscale/CHANGELOG.md
+++ b/tailscale/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.17.0.2 (forked)
+
+- Update tailscale/tailscale to v1.64.0
+
 ## 0.17.0.1 (forked)
 
 - Merge unmerged changes from community add-on
diff --git a/tailscale/DOCS.md b/tailscale/DOCS.md
index e0a71ff5..f51c0870 100644
--- a/tailscale/DOCS.md
+++ b/tailscale/DOCS.md
@@ -5,8 +5,9 @@
 > This is a **fork** of the [community add-on][community_addon]!
 >
 > Changes:
+>   - Update tailscale/tailscale to v1.64.0
+>   - Fix tag name validation regex
 >   - Release unmerged changes from community add-on:
->     - Fix tag name validation regex
 >     - Optionally copy Tailscale Proxy's certificate files to /ssl folder
 
 ![Warning][warning_stripe]
diff --git a/tailscale/Dockerfile b/tailscale/Dockerfile
index f66ba2e9..1dc79f11 100755
--- a/tailscale/Dockerfile
+++ b/tailscale/Dockerfile
@@ -7,7 +7,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Setup base
 ARG BUILD_ARCH=amd64
-ARG TAILSCALE_VERSION="v1.62.1"
+ARG TAILSCALE_VERSION="v1.64.0"
 RUN \
     apk add --no-cache \
         ipcalc=1.0.3-r0 \
diff --git a/tailscale/README.md b/tailscale/README.md
index 775bf6db..07ba4dbf 100644
--- a/tailscale/README.md
+++ b/tailscale/README.md
@@ -7,8 +7,9 @@ Zero config VPN for building secure networks.
 > This is a **fork** of the [community add-on][community_addon]!
 >
 > Changes:
+>   - Update tailscale/tailscale to v1.64.0
+>   - Fix tag name validation regex
 >   - Release unmerged changes from community add-on:
->     - Fix tag name validation regex
 >     - Optionally copy Tailscale Proxy's certificate files to /ssl folder
 
 ![Warning][warning_stripe]
diff --git a/tailscale/config.yaml b/tailscale/config.yaml
index 5aa09022..bdc2ee0a 100644
--- a/tailscale/config.yaml
+++ b/tailscale/config.yaml
@@ -1,6 +1,6 @@
 ---
 name: Tailscale with features
-version: 0.17.0.1
+version: 0.17.0.2
 slug: tailscale
 description: Zero config VPN for building secure networks
 url: https://github.com/lmagyar/homeassistant-addon-tailscale