diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
index e624e31100e..f40cb2e1073 100644
--- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
+++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties
@@ -290,7 +290,9 @@ che.infra.kubernetes.pvc.strategy=common
 # Note that this property has effect only if the 'common' PVC strategy used.
 che.infra.kubernetes.pvc.precreate_subpaths=true
 
-# Defines the name of Persistent Volume Claim for che workspaces.
+# Defines the settings of PVC name for che workspaces.
+# Each PVC strategy suplies this value differently.
+# See doc for che.infra.kubernetes.pvc.strategy property
 che.infra.kubernetes.pvc.name=claim-che-workspace
 
 # Defines the storage class of Persistent Volume Claim for the workspaces.
@@ -392,7 +394,7 @@ che.infra.kubernetes.client.http.async_requests.max=1000
 che.infra.kubernetes.client.http.async_requests.max_per_host=1000
 
 # Max number of idle connections in the connection pool
-# of the Kubernetes-client shared http client 
+# of the Kubernetes-client shared http client
 che.infra.kubernetes.client.http.connection_pool.max_idle=5
 
 # Keep-alive timeout of the connection pool
diff --git a/deploy/kubernetes/helm/che/custom-charts/che-postgres/templates/postgres-data-claim.yaml b/deploy/kubernetes/helm/che/custom-charts/che-postgres/templates/postgres-data-claim.yaml
index 2c48d2c6805..376e6c3ee5d 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-postgres/templates/postgres-data-claim.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-postgres/templates/postgres-data-claim.yaml
@@ -15,6 +15,9 @@ metadata:
     io.kompose.service: postgres-data
   name: postgres-data
 spec:
+  {{- if .Values.global.chePostgresPVCStorageClassName }}
+  storageClassName: {{ .Values.global.chePostgresPVCStorageClassName }}
+  {{- end }}
   accessModes:
   - ReadWriteOnce
   resources:
diff --git a/deploy/kubernetes/helm/che/templates/configmap.yaml b/deploy/kubernetes/helm/che/templates/configmap.yaml
index ca81c4c0f2f..7aad45fc4e1 100644
--- a/deploy/kubernetes/helm/che/templates/configmap.yaml
+++ b/deploy/kubernetes/helm/che/templates/configmap.yaml
@@ -59,6 +59,7 @@ data:
   CHE_INFRA_KUBERNETES_PVC_STRATEGY: "{{ .Values.global.cheWorkspacesPVCStrategy }}"
   CHE_INFRA_KUBERNETES_PVC_QUANTITY: {{ .Values.global.pvcClaim }}
   CHE_INFRA_KUBERNETES_PVC_PRECREATE__SUBPATHS: "true"
+  CHE_INFRA_KUBERNETES_PVC_STORAGE__CLASS__NAME: "{{ .Values.global.cheWorkspacePVCStorageClassName }}"
   CHE_INFRA_KUBERNETES_POD_SECURITY__CONTEXT_RUN__AS__USER: "{{ .Values.global.securityContext.runAsUser }}"
   CHE_INFRA_KUBERNETES_POD_SECURITY__CONTEXT_FS__GROUP: "{{ .Values.global.securityContext.fsGroup }}"
   CHE_LOCAL_CONF_DIR: /etc/conf
diff --git a/deploy/kubernetes/helm/che/values.yaml b/deploy/kubernetes/helm/che/values.yaml
index 1d3c9941091..39f85c04ea1 100644
--- a/deploy/kubernetes/helm/che/values.yaml
+++ b/deploy/kubernetes/helm/che/values.yaml
@@ -62,6 +62,8 @@ global:
   # Possible values: common, per-workspace, unique
   cheWorkspacesPVCStrategy: "common"
   pvcClaim: "1Gi"
+  # Defines the storage class of Persistent Volume Claim(s) for the workspaces.
+  cheWorkspacePVCStorageClassName: ""
   cheWorkspacesNamespace: "<username>-che"
   # Service account name that will be mounted to workspaces pods
   # Note that:
@@ -81,6 +83,8 @@ global:
     runAsUser: 1724
     fsGroup: 1724
   postgresDebugLogs: false
+  # Defines the storage class of Persistent Volume Claim for Postgres database.
+  chePostgresPVCStorageClassName: ""
   cheDevfileRegistryUrlFormat: "devfile-registry-%s.%s"
   chePluginRegistryUrlFormat: "plugin-registry-%s.%s"