diff --git a/charts/headscale-user/templates/headscale-user.yaml b/charts/headscale-user/templates/headscale-user.yaml
index 8fc998f..7a6dff7 100644
--- a/charts/headscale-user/templates/headscale-user.yaml
+++ b/charts/headscale-user/templates/headscale-user.yaml
@@ -1,7 +1,11 @@
 apiVersion: headscale.dodo.cloud/v1
 kind: HeadscaleUser
 metadata:
+  {{- if .Values.resourceName -}}
+  name: {{ .Values.resourceName }}
+  {{- else -}}
   name: {{ .Values.username }}
+  {{- end -}}
   namespace: {{ .Release.Namespace }}
 spec:
   headscaleAddress: {{ .Values.headscaleApiAddress }}
diff --git a/charts/headscale-user/values.yaml b/charts/headscale-user/values.yaml
index c91e8d8..a37f685 100644
--- a/charts/headscale-user/values.yaml
+++ b/charts/headscale-user/values.yaml
@@ -3,4 +3,4 @@
 preAuthKey:
   enabled: false
   secretName: foo-secret
-
+resourceName: ""
diff --git a/charts/memberships/templates/install.yaml b/charts/memberships/templates/install.yaml
index 1d0034b..dee0f59 100644
--- a/charts/memberships/templates/install.yaml
+++ b/charts/memberships/templates/install.yaml
@@ -64,4 +64,4 @@
       volumes:
       - name: memberships
         persistentVolumeClaim:
-          claimName: memberships
+          claimName: {{ .Values.volumeClaimName }}
diff --git a/charts/memberships/templates/volume.yaml b/charts/memberships/templates/volume.yaml
deleted file mode 100644
index 48bbcb8..0000000
--- a/charts/memberships/templates/volume.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: memberships
-  namespace: {{ .Release.Namespace }}
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ .Values.storage.size }}
diff --git a/charts/memberships/values.yaml b/charts/memberships/values.yaml
index c4be0f8..7dab384 100644
--- a/charts/memberships/values.yaml
+++ b/charts/memberships/values.yaml
@@ -2,6 +2,5 @@
   repository: giolekva/memberships
   tag: latest
   pullPolicy: Always
-storage:
-  size: 1Gi
+volumeClaimName: "data"
 portName: http
diff --git a/charts/tailscale-proxy/Chart.yaml b/charts/tailscale-proxy/Chart.yaml
index a87d9d7..a92ef36 100644
--- a/charts/tailscale-proxy/Chart.yaml
+++ b/charts/tailscale-proxy/Chart.yaml
@@ -2,5 +2,5 @@
 name: tailscale-proxy
 description: A Helm chart to run tailscale node
 type: application
-version: 0.0.1
-appVersion: "0.0.1"
+version: 0.0.2
+appVersion: "0.0.2"
diff --git a/charts/tailscale-proxy/templates/install.yaml b/charts/tailscale-proxy/templates/install.yaml
index f85f753..d1f5a7c 100644
--- a/charts/tailscale-proxy/templates/install.yaml
+++ b/charts/tailscale-proxy/templates/install.yaml
@@ -1,17 +1,3 @@
-# apiVersion: v1
-# kind: PersistentVolumeClaim
-# metadata:
-#   name: tailscale
-#   namespace: {{ .Release.Namespace }}
-#   annotations:
-#     helm.sh/resource-policy: keep
-# spec:
-#   accessModes:
-#     - ReadWriteOnce
-#   resources:
-#     requests:
-#       storage: 1Gi
----
 apiVersion: headscale.dodo.cloud/v1
 kind: HeadscaleUser
 metadata:
@@ -39,10 +25,6 @@
       labels:
         app: tailscale
     spec:
-      # volumes:
-      # - name: tailscale
-      #   persistentVolumeClaim:
-      #     claimName: tailscale
       containers:
       - name: tailscale
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
@@ -55,13 +37,6 @@
         env:
         - name: TS_KUBE_SECRET
           value: {{ .Values.preAuthKeySecret }}
-        # - name: TS_STATE_DIR
-        #   value: /tailscale-state
-        # - name: TS_AUTHKEY
-        #   valueFrom:
-        #     secretKeyRef:
-        #       name: {{ .Values.preAuthKeySecret }}
-        #       key: key
         - name: TS_HOSTNAME
           value: {{ .Values.hostname }}
         {{- if .Values.ipSubnet }}
@@ -70,30 +45,3 @@
         {{- end }}
         - name: TS_EXTRA_ARGS
           value: --login-server={{ .Values.loginServer }}
-        # volumeMounts:
-        # - name: tailscale
-        #   mountPath: /tailscale-state
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: secrets
-  namespace: {{ .Release.Namespace }}
-rules:
-- apiGroups: [""]
-  resources: ["secrets"]
-  verbs: ["get", "watch", "list", "patch", "update"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: secrets
-  namespace: {{ .Release.Namespace }}
-subjects:
-- kind: ServiceAccount
-  name: default
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: Role
-  name: secrets
-  apiGroup: rbac.authorization.k8s.io