diff --git a/README.md b/README.md
index 45dba30..dc6dd60 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ helm uninstall headplane
 | headscale.config.prefixes.v6 | string | `"fd7a:115c:a1e0::/48"` |  |
 | headscale.config.server_url | string | `"https://vpn.example.com"` |  |
 | headscale.envFrom | list | `[]` |  |
-| headscale.image | string | `"headscale/headscale:0.25.1"` |  |
+| headscale.image | string | `"headscale/headscale:0.26.1"` |  |
 | headscale.oidc.client_id | string | `"YOUR_OIDC_CLIENT_ID_FOR_HEADSCALE"` |  |
 | headscale.oidc.enabled | bool | `false` |  |
 | headscale.oidc.issuer | string | `"https://your-oidc-issuer.com"` |  |
diff --git a/templates/pvc-tailscale-relay.yaml b/templates/pvc-tailscale-relay.yaml
deleted file mode 100644
index 3cad25d..0000000
--- a/templates/pvc-tailscale-relay.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-{{- if and .Values.relay.enabled .Values.relay.pvc.enabled }}
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ .Values.relay.pvc.name }}
-  namespace: {{ .Release.Namespace }}
-  {{- if .Values.pvc.annotations }}
-  annotations:
-    {{- range $key, $value := .Values.pvc.annotations }}
-    {{ $key | quote }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  {{- if .Values.pvc.labels }}
-  labels:
-    {{- range $key, $value := .Values.pvc.labels }}
-    {{ $key | quote }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-spec:
-  accessModes:
-    {{- range .Values.relay.pvc.accessModes }}
-    - {{ . | quote }}
-    {{- end }}
-  resources:
-    requests:
-      storage: {{ .Values.relay.pvc.storage | quote }}
-  {{- if .Values.relay.pvc.storageClassName }}
-  storageClassName: {{ .Values.relay.pvc.storageClassName | quote }}
-  {{- end }}
-{{- end }} 
\ No newline at end of file
diff --git a/templates/pvc.yaml b/templates/pvc.yaml
deleted file mode 100644
index 648b4fc..0000000
--- a/templates/pvc.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-{{- if .Values.pvc.enabled }}
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ .Values.pvc.name | quote }}
-  {{- if .Values.pvc.annotations }}
-  annotations:
-    {{- range $key, $value := .Values.pvc.annotations }}
-    {{ $key | quote }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  {{- if .Values.pvc.labels }}
-  labels:
-    {{- range $key, $value := .Values.pvc.labels }}
-    {{ $key | quote }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-spec:
-  accessModes:
-    {{- range .Values.pvc.accessModes }}
-    - {{ . | quote }}
-    {{- end }}
-  resources:
-    requests:
-      storage: {{ .Values.pvc.storage | quote }}
-  {{- if .Values.pvc.storageClassName }}
-  storageClassName: {{ .Values.pvc.storageClassName | quote }}
-  {{- end }}
-{{- end }}
diff --git a/templates/statefulset-headplane.yaml b/templates/statefulset-headplane.yaml
index c4a58da..6d4b6bf 100644
--- a/templates/statefulset-headplane.yaml
+++ b/templates/statefulset-headplane.yaml
@@ -76,12 +76,37 @@ spec:
         - name: headscale-config
           secret:
             secretName: headscale-config
-        - name: headscale-data
-          persistentVolumeClaim:
-            claimName: headscale-config
         - name: headplane-config
           secret:
             secretName: headplane-config
         - name: headscale-acl
           configMap:
             name: headscale-acl
+  {{- if .Values.pvc.enabled }}
+  volumeClaimTemplates:
+  - metadata:
+      name: headscale-data
+      {{- if .Values.pvc.annotations }}
+      annotations:
+        {{- range $key, $value := .Values.pvc.annotations }}
+        {{ $key | quote }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
+      {{- if .Values.pvc.labels }}
+      labels:
+        {{- range $key, $value := .Values.pvc.labels }}
+        {{ $key | quote }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
+    spec:
+      accessModes:
+        {{- range .Values.pvc.accessModes }}
+        - {{ . | quote }}
+        {{- end }}
+      resources:
+        requests:
+          storage: {{ .Values.pvc.storage | quote }}
+      {{- if .Values.pvc.storageClassName }}
+      storageClassName: {{ .Values.pvc.storageClassName | quote }}
+      {{- end }}
+  {{- end }}
diff --git a/templates/statefulset-tailscale-relay.yaml b/templates/statefulset-tailscale-relay.yaml
index 6d41e46..02e6d24 100644
--- a/templates/statefulset-tailscale-relay.yaml
+++ b/templates/statefulset-tailscale-relay.yaml
@@ -72,7 +72,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.uid
-        {{- if and .Values.relay.enabled .Values.relay.pvc.enabled }}
+        {{- if .Values.relay.pvc.enabled }}
         volumeMounts:
         - name: tailscale-data
           mountPath: /var/lib/tailscale
@@ -81,10 +81,20 @@ spec:
           capabilities:
             add:
               - NET_ADMIN
-      {{- if and .Values.relay.enabled .Values.relay.pvc.enabled }}
-      volumes:
-      - name: tailscale-data
-        persistentVolumeClaim:
-          claimName: {{ .Values.relay.pvc.name }}
+  {{- if .Values.relay.pvc.enabled }}
+  volumeClaimTemplates:
+  - metadata:
+      name: tailscale-data
+    spec:
+      accessModes:
+        {{- range .Values.relay.pvc.accessModes }}
+        - {{ . | quote }}
+        {{- end }}
+      resources:
+        requests:
+          storage: {{ .Values.relay.pvc.storage | quote }}
+      {{- if .Values.relay.pvc.storageClassName }}
+      storageClassName: {{ .Values.relay.pvc.storageClassName | quote }}
       {{- end }}
+  {{- end }}
 {{- end }}
diff --git a/values.yaml b/values.yaml
index 01a292a..3a63fb8 100644
--- a/values.yaml
+++ b/values.yaml
@@ -48,7 +48,7 @@ headplane:
 # Headscale server configuration
 headscale:
   # The container image for Headscale
-  image: headscale/headscale:0.25.1
+  image: headscale/headscale:0.26.1
 
   # Access Control List configuration (JSON format)
   # Only applicable if headscale.config.policy.mode is 'file'