diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index d39f86a0198..ef755a682b7 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 8.3.10
+version: 8.3.11
diff --git a/charts/library/common/templates/_statefulset.tpl b/charts/library/common/templates/_statefulset.tpl
index 588e649de67..a7fd2bb3713 100644
--- a/charts/library/common/templates/_statefulset.tpl
+++ b/charts/library/common/templates/_statefulset.tpl
@@ -64,6 +64,8 @@ spec:
             storage: {{ required (printf "size is required for PVC %v" $vct.name) $vct.size | quote }}
         {{- if $vct.storageClass }}
         storageClassName: {{ if (eq "-" $vct.storageClass) }}""{{- else if (eq "SCALE-ZFS" $vct.storageClass ) }}{{ ( printf "%v-%v"  "ix-storage-class" $releaseName ) }}{{- else }}{{ $vct.storageClass | quote }}{{- end }}
+        {{- else if .Values.ixChartContext }}
+        storageClassName: {{ printf "%v-%v"  "ix-storage-class" .Release.Name }}
         {{- end }}
     {{- end }}
 {{- end }}
diff --git a/charts/library/common/templates/classes/_pvc.tpl b/charts/library/common/templates/classes/_pvc.tpl
index 4fa631609ff..7ece0529678 100644
--- a/charts/library/common/templates/classes/_pvc.tpl
+++ b/charts/library/common/templates/classes/_pvc.tpl
@@ -45,6 +45,8 @@ spec:
       storage: {{ $values.size | default "100Gi" | quote }}
   {{- if $values.storageClass }}
   storageClassName: {{ if (eq "-" $values.storageClass) }}""{{- else if (eq "SCALE-ZFS" $values.storageClass ) }}{{ ( printf "%v-%v"  "ix-storage-class" .Release.Name ) }}{{- else }}{{ $values.storageClass | quote }}{{- end }}
+  {{- else if .Values.ixChartContext }}
+  storageClassName: {{ printf "%v-%v"  "ix-storage-class" .Release.Name }}
   {{- end }}
   {{- if $values.volumeName }}
   volumeName: {{ $values.volumeName | quote }}