diff --git a/Chart.yaml b/Chart.yaml
index bb9c7fc33c85205772a9010a60818a7a3d823f42..e6e950e65a5cc86aa114a43245ef1534ace620c1 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 description: |
   A helm chart for installing NextCloud and setting up ONLYOFFICE integration
 name: nextcloud-onlyoffice
-version: 0.2.9
+version: 0.2.9-alpha1
 appVersion: NC-19.0.3-OO-6.2.2.21
 dependencies:
   - name: nextcloud
diff --git a/templates/onlyoffice-deployment.yaml b/templates/onlyoffice-deployment.yaml
index 73a7695134c86305550397a71750faea18ec4e46..42e9f08e927f82816a0938babcde2ad78c8cdd01 100644
--- a/templates/onlyoffice-deployment.yaml
+++ b/templates/onlyoffice-deployment.yaml
@@ -102,9 +102,9 @@ spec:
               mountPath: /var/lib/onlyoffice
       volumes:
         - name: onlyoffice-data
-        {{- if .Values.persistence.enabled }}
+        {{- if .Values.onlyoffice.persistence.enabled }}
           persistentVolumeClaim:
-            claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "onlyoffice-documentserver.fullname" . }}-onlyoffice{{- end }}
+            claimName: {{ if .Values.onlyoffice.persistence.existingClaim }}{{ .Values.onlyoffice.persistence.existingClaim }}{{- else }}{{ template "onlyoffice-documentserver.fullname" . }}-onlyoffice{{- end }}
         {{- else }}
           emptyDir: {}
         {{- end }}
diff --git a/templates/onlyoffice-pvc.yml b/templates/onlyoffice-pvc.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1345709150b4ed8b0c95b828b256b4c3106563a1
--- /dev/null
+++ b/templates/onlyoffice-pvc.yml
@@ -0,0 +1,31 @@
+{{- if .Values.onlyoffice.persistence.enabled -}}
+{{- if not .Values.onlyoffice.persistence.existingClaim -}}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "onlyoffice-documentserver.fullname" . }}-onlyoffice
+  labels:
+    app.kubernetes.io/name: {{ include "onlyoffice-documentserver.name" . }}
+    helm.sh/chart: {{ include "onlyoffice-documentserver.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/component: app
+{{- if .Values.onlyoffice.persistence.annotations }}
+  annotations:
+{{ toYaml .Values.onlyoffice.persistence.annotations | indent 4 }}
+{{- end }}
+spec:
+  accessModes:
+    - {{ .Values.onlyoffice.persistence.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.onlyoffice.persistence.size | quote }}
+{{- if .Values.onlyoffice.persistence.storageClass }}
+{{- if (eq "-" .Values.onlyoffice.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.onlyoffice.persistence.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end -}}
+{{- end -}}