diff --git a/charts/stable/tailscale/Chart.yaml b/charts/stable/tailscale/Chart.yaml
index e5343e48307..13342042aa8 100644
--- a/charts/stable/tailscale/Chart.yaml
+++ b/charts/stable/tailscale/Chart.yaml
@@ -19,7 +19,7 @@ name: tailscale
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/tailscale
   - https://github.com/tailscale/tailscale/blob/main/docs/k8s/run.sh
-version: 4.0.4
+version: 4.0.5
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/stable/tailscale/templates/common.yaml b/charts/stable/tailscale/templates/common.yaml
index b8f8b1435e4..2ece816da1a 100644
--- a/charts/stable/tailscale/templates/common.yaml
+++ b/charts/stable/tailscale/templates/common.yaml
@@ -1,9 +1,6 @@
 {{/* Make sure all variables are set properly */}}
 {{- include "tc.v1.common.loader.init" . }}
 
-{{/* Render secret */}}
-{{- include "tailscale.secret" . }}
-
 {{/* Render configmap for tailscale */}}
 {{- $configmap := include "tailscale.config" . | fromYaml -}}
 {{- if $configmap -}}
@@ -11,7 +8,7 @@
 {{- end -}}
 
 {{/* Render secret for tailscale */}}
-{{- $secret := include "tailscale.config" . | fromYaml -}}
+{{- $secret := include "tailscale.secret" . | fromYaml -}}
 {{- if $secret -}}
   {{- $_ := set .Values.secret "tailscale-secret" $secret -}}
 {{- end -}}
diff --git a/charts/stable/tailscale/values.yaml b/charts/stable/tailscale/values.yaml
index a0346ce7025..c31051beecc 100644
--- a/charts/stable/tailscale/values.yaml
+++ b/charts/stable/tailscale/values.yaml
@@ -72,15 +72,28 @@ securityContext:
 workload:
   main:
     podSpec:
+      automountServiceAccountToken: true
       containers:
         main:
           probes:
             liveness:
               enabled: false
+              type: exec
+              command:
+                - tailscale
+                - status
             readiness:
               enabled: false
+              type: exec
+              command:
+                - tailscale
+                - status
             startup:
               enabled: false
+              type: exec
+              command:
+                - tailscale
+                - status
           envFrom:
             - configMapRef:
                 name: "tailscale-config"