diff --git a/deployment/helm/label-studio/templates/postgres.yaml b/deployment/helm/label-studio/templates/postgres.yaml
index 47ee2d3..4f92433 100644
--- a/deployment/helm/label-studio/templates/postgres.yaml
+++ b/deployment/helm/label-studio/templates/postgres.yaml
@@ -62,5 +62,8 @@ spec:
   resources:
     requests:
       storage: {{ .Values.postgres.persistence.size }}
+  {{- if .Values.persistence.storageClass }}
+  storageClassName: {{ .Values.postgres.persistence.storageClass }}
+  {{- end }}
 {{- end }}
 
diff --git a/deployment/helm/label-studio/templates/pvc.yaml b/deployment/helm/label-studio/templates/pvc.yaml
index 6273798..33b0186 100644
--- a/deployment/helm/label-studio/templates/pvc.yaml
+++ b/deployment/helm/label-studio/templates/pvc.yaml
@@ -10,8 +10,8 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.size }}
-  {{- if .Values.persistence.storageClassName }}
-  storageClassName: {{ .Values.persistence.storageClassName }}
+  {{- if .Values.persistence.storageClass }}
+  storageClassName: {{ .Values.persistence.storageClass }}
   {{- end }}
 ---
 apiVersion: v1
@@ -24,8 +24,8 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.size }}
-  {{- if .Values.persistence.storageClassName }}
-  storageClassName: {{ .Values.persistence.storageClassName }}
+  {{- if .Values.persistence.storageClass }}
+  storageClassName: {{ .Values.persistence.storageClass }}
   {{- end }}
 {{- end }}
 
diff --git a/deployment/helm/label-studio/values.yaml b/deployment/helm/label-studio/values.yaml
index c16f0d8..950b728 100644
--- a/deployment/helm/label-studio/values.yaml
+++ b/deployment/helm/label-studio/values.yaml
@@ -26,6 +26,7 @@ postgres:
   persistence:
     enabled: true
     size: 10Gi
+    storageClass: ""
 
 service:
   type: NodePort
@@ -73,7 +74,7 @@ persistence:
   enabled: true
   existingClaim: "" # if you already have PVC that maps to external datamate-dataset-volume
   size: 10Gi
-  storageClassName: ""
+  storageClass: ""
 
 # Name of the Kubernetes PVC to simulate external Docker volume `datamate-dataset-volume`
 # If not set and persistence.enabled=true, a PVC will be created automatically.