diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index a81e7869..268451d8 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 5.2.2
+version: 6.0.0
 appVersion: 29.0.3
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
diff --git a/charts/nextcloud/templates/_helpers.tpl b/charts/nextcloud/templates/_helpers.tpl
index d9570f76..588705f9 100644
--- a/charts/nextcloud/templates/_helpers.tpl
+++ b/charts/nextcloud/templates/_helpers.tpl
@@ -246,11 +246,13 @@ Create volume mounts for the nextcloud container as well as the cron sidecar con
 - name: nextcloud-main
   mountPath: /var/www/html
   subPath: {{ ternary "html" (printf "%s/html" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
-{{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }}
+{{- if .Values.persistence.nextcloudData.enabled }}
 - name: nextcloud-data
   mountPath: {{ .Values.nextcloud.datadir }}
-  subPath: {{ ternary "data" (printf "%s/data" .Values.persistence.nextcloudData.subPath) (empty .Values.persistence.nextcloudData.subPath) }}
-{{- else }}
+{{- if not (empty .Values.persistence.nextcloudData.subPath) }}
+  subPath: {{ .Values.persistence.nextcloudData.subPath }}
+{{- end }}
+{{- else if .Values.persistence.enabled }}
 - name: nextcloud-main
   mountPath: {{ .Values.nextcloud.datadir }}
   subPath: {{ ternary "data" (printf "%s/data" .Values.persistence.subPath) (empty .Values.persistence.subPath) }}
diff --git a/charts/nextcloud/templates/deployment.yaml b/charts/nextcloud/templates/deployment.yaml
index 51a79d67..eaf22905 100644
--- a/charts/nextcloud/templates/deployment.yaml
+++ b/charts/nextcloud/templates/deployment.yaml
@@ -219,11 +219,13 @@ spec:
             - name: nextcloud-main
               mountPath: /var/www/html
               subPath: {{ ternary "html" (printf "%s/html" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
-            {{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }}
+            {{- if .Values.persistence.nextcloudData.enabled }}
             - name: nextcloud-data
               mountPath: {{ .Values.nextcloud.datadir }}
-              subPath: {{ ternary "data" (printf "%s/data" .Values.persistence.nextcloudData.subPath) (empty .Values.persistence.nextcloudData.subPath) }}
-            {{- else }}
+            {{- if not (empty .Values.persistence.nextcloudData.subPath) }}
+              subPath: {{ .Values.persistence.nextcloudData.subPath }}
+            {{- end }}
+            {{- else if .Values.persistence.enabled }}
             - name: nextcloud-main
               mountPath: {{ .Values.nextcloud.datadir }}
               subPath: {{ ternary "data" (printf "%s/data" .Values.persistence.subPath) (empty .Values.persistence.subPath) }}