diff --git a/tailscale/Dockerfile b/tailscale/Dockerfile
index 4946f146..e7dd72fa 100755
--- a/tailscale/Dockerfile
+++ b/tailscale/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:16.3.5
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:16.3.6
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/tailscale/build.yaml b/tailscale/build.yaml
index 846d62a7..8aaa269a 100644
--- a/tailscale/build.yaml
+++ b/tailscale/build.yaml
@@ -1,8 +1,8 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/base/aarch64:16.3.5
-  amd64: ghcr.io/hassio-addons/base/amd64:16.3.5
-  armv7: ghcr.io/hassio-addons/base/armv7:16.3.5
+  aarch64: ghcr.io/hassio-addons/base/aarch64:16.3.6
+  amd64: ghcr.io/hassio-addons/base/amd64:16.3.6
+  armv7: ghcr.io/hassio-addons/base/armv7:16.3.6
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev