diff --git a/app/Chart.yaml b/app/Chart.yaml
index c6f6af3e..5b1d6eed 100644
--- a/app/Chart.yaml
+++ b/app/Chart.yaml
@@ -13,4 +13,4 @@ maintainers:
 #
 # NOTE: this value is set at build time. DO NOT CHANGE.
 #
-version: 1.3.5
+version: 1.3.6
diff --git a/app/templates/pvc.yaml b/app/templates/pvc.yaml
index 99a55827..9968cc6c 100644
--- a/app/templates/pvc.yaml
+++ b/app/templates/pvc.yaml
@@ -18,35 +18,11 @@ metadata:
     {{- toYaml $values.customLabels | nindent 4 }}
     {{- end }}
 spec:
-  storageClassName: ""
+  storageClassName: {{ default nfs .storageClassName | quote }}
   accessModes:
     - ReadWriteMany
   resources:
     requests:
       storage: {{ .size }}
-
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: {{ $fullname }}-{{ .name }}
-  labels:
-    application: {{ $fullname }}
-    {{- toYaml $values.commonLabels | nindent 4 }}
-    {{- if $values.customLabels }}
-    {{- toYaml $values.customLabels | nindent 4 }}
-    {{- end }}
-spec:
-  claimRef:
-    namespace: {{ $namespace }}
-    name: {{ $fullname }}-{{ .name }}
-  accessModes:
-  - ReadWriteMany
-  capacity:
-    storage: {{ .size }}
-  nfs:
-    path: {{ .nfs.path }}
-    server: {{ .nfs.server }}
-  persistentVolumeReclaimPolicy: Delete
 {{- end }}
 {{- end }}