diff --git a/.github/workflows/charts-lint-test.yaml b/.github/workflows/charts-lint-test.yaml
index f4ef4d6d..ff82b26d 100644
--- a/.github/workflows/charts-lint-test.yaml
+++ b/.github/workflows/charts-lint-test.yaml
@@ -29,7 +29,7 @@ jobs:
         python-version: 3.7
 
     - name: Set up chart-testing
-      uses: helm/chart-testing-action@09ed88797198755e5031f25be13da255e7e33aad # tag=v2.3.0
+      uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
 
     - name: Run chart-testing (list-changed)
       id: list-changed
@@ -86,7 +86,7 @@ jobs:
         python-version: 3.7
 
     - name: Set up chart-testing
-      uses: helm/chart-testing-action@09ed88797198755e5031f25be13da255e7e33aad # tag=v2.3.0
+      uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec # tag=v2.3.1
 
     - name: Create k3d cluster
       uses: nolar/setup-k3d-k3s@v1
diff --git a/charts/common/templates/class/_pvc.tpl b/charts/common/templates/class/_pvc.tpl
index 1fe87269..28b04626 100644
--- a/charts/common/templates/class/_pvc.tpl
+++ b/charts/common/templates/class/_pvc.tpl
@@ -42,7 +42,7 @@ spec:
     - {{ ( $values.accessMode | default "ReadWriteOnce" ) | quote }}
   resources:
     requests:
-      storage: {{ $values.size | default "999Gi" | quote }}
+      storage: {{ $values.size | default "256Gi" | quote }}
   {{- with $values.spec }}
   {{ tpl ( toYaml . ) $ | indent 2 }}
   {{- end }}
diff --git a/charts/common/values.yaml b/charts/common/values.yaml
index 9e62b85b..0508a764 100644
--- a/charts/common/values.yaml
+++ b/charts/common/values.yaml
@@ -740,7 +740,7 @@ persistence:
     accessMode: ReadWriteOnce
 
     # -- The amount of storage that is requested for the persistent volume.
-    size: 999Gi
+    size: 256Gi
 
     # -- Set to true to retain the PVC upon `helm uninstall`
     retain: false
diff --git a/cspell.config.yaml b/cspell.config.yaml
new file mode 100644
index 00000000..6b06eb75
--- /dev/null
+++ b/cspell.config.yaml
@@ -0,0 +1,2 @@
+words:
+- tailscale
diff --git a/helper-charts/common-test/tests/addons/vpn_test.yaml b/helper-charts/common-test/tests/addons/vpn_test.yaml
index 8db67590..17fde3aa 100644
--- a/helper-charts/common-test/tests/addons/vpn_test.yaml
+++ b/helper-charts/common-test/tests/addons/vpn_test.yaml
@@ -78,3 +78,64 @@ tests:
         equal:
           path: spec.template.spec.containers[0].name
           value: vpn
+
+  - it: tailscale addon enabled with authkey should pass
+    set:
+      addons:
+        vpn:
+          type: tailscale
+          tailscale:
+            authkey: something
+    asserts:
+      - hasDocuments:
+          count: 6
+      - documentIndex: &ServiceAccountDocument 0
+        isKind:
+          of: ServiceAccount
+      - documentIndex: *ServiceAccountDocument
+        equal:
+          path: metadata.name
+          value: RELEASE-NAME-common-test-tailscale-addon
+      - documentIndex: &ClusterRoleDocument 1
+        isKind:
+          of: ClusterRole
+      - documentIndex: *ClusterRoleDocument
+        equal:
+          path: rules[1].resourceNames[0]
+          value: RELEASE-NAME-common-test-tailscale-secret
+      - documentIndex: &ClusterRoleBindingDocument 2
+        isKind:
+          of: ClusterRoleBinding
+      - documentIndex: *ClusterRoleBindingDocument
+        equal:
+          path: subjects[0].name
+          value: RELEASE-NAME-common-test-tailscale-addon
+      - documentIndex: &SecretDocument 3
+        isKind:
+          of: Secret
+      - documentIndex: *SecretDocument
+        equal:
+          path: metadata.name
+          value: RELEASE-NAME-common-test-tailscale-secret
+      - documentIndex: *SecretDocument
+        isNotNull:
+          path: data.TS_AUTH_KEY
+      - documentIndex: &DeploymentDocument 4
+        isKind:
+          of: Deployment
+      - documentIndex: *DeploymentDocument
+        not: true
+        equal:
+          path: spec.template.spec.containers[0].name
+          value: tailscale
+      - documentIndex: *DeploymentDocument
+        equal:
+          path: spec.template.spec.containers[1].name
+          value: tailscale
+      - documentIndex: *DeploymentDocument
+        equal:
+          path: spec.template.spec.containers[1].env[0].value
+          value: RELEASE-NAME-common-test-tailscale-secret
+      - documentIndex: &ServiceDocument 5
+        isKind:
+          of: Service