diff --git a/helm/rustfs/templates/pvc.yaml b/helm/rustfs/templates/pvc.yaml
index 849da8f2..1942a685 100644
--- a/helm/rustfs/templates/pvc.yaml
+++ b/helm/rustfs/templates/pvc.yaml
@@ -1,32 +1,39 @@
 {{- if .Values.mode.standalone.enabled }}
+{{- with .Values.storageclass }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
     helm.sh/resource-policy: keep
-  name: {{ include "rustfs.fullname" . }}-data
+  name: {{ include "rustfs.fullname" $ }}-data
   labels:
-    {{- toYaml .Values.commonLabels | nindent 4 }}
+    {{- toYaml $.Values.commonLabels | nindent 4 }}
 spec:
-  accessModes: ["ReadWriteOnce"]
-  storageClassName: {{ .Values.storageclass.name }}
+  accessModes: [ ReadWriteOnce ]
+  {{- with .name }}
+  storageClassName: {{ . }}
+  {{- end }}
   resources:
     requests:
-      storage: {{ .Values.storageclass.dataStorageSize }}
+      storage: {{ .dataStorageSize }}
 
 ---
+
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
     helm.sh/resource-policy: keep
-  name: {{ include "rustfs.fullname" . }}-logs
+  name: {{ include "rustfs.fullname" $ }}-logs
   labels:
-    {{- toYaml .Values.commonLabels | nindent 4 }}
+    {{- toYaml $.Values.commonLabels | nindent 4 }}
 spec:
-  accessModes: ["ReadWriteOnce"]
-  storageClassName: {{ .Values.storageclass.name }}
+  accessModes: [ ReadWriteOnce ]
+  {{- with .name }}
+  storageClassName: {{ . }}
+  {{- end }}
   resources:
     requests:
-      storage: {{ .Values.storageclass.logStorageSize }}
+      storage: {{ .logStorageSize }}
+{{- end }}
 {{- end }}