diff --git a/deploy/helm/charts/Chart.yaml b/deploy/helm/charts/Chart.yaml
index 7928b16..893e7ac 100644
--- a/deploy/helm/charts/Chart.yaml
+++ b/deploy/helm/charts/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: zfs-localpv
 description: Helm chart for CSI Driver for dynamic provisioning of ZFS Persistent Local Volumes. For instructions on how to use this helm chart, see - https://openebs.github.io/zfs-localpv/
-version: 1.9.3
+version: 1.9.4
 appVersion: 1.9.1
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png
 home: http://www.openebs.io/
diff --git a/deploy/helm/charts/templates/zfs-contoller.yaml b/deploy/helm/charts/templates/zfs-contoller.yaml
index 4f4a72e..82129ed 100644
--- a/deploy/helm/charts/templates/zfs-contoller.yaml
+++ b/deploy/helm/charts/templates/zfs-contoller.yaml
@@ -34,7 +34,9 @@ spec:
                 values:
                 - openebs-zfs-controller
             topologyKey: "kubernetes.io/hostname"
-      priorityClassName: system-cluster-critical
+{{- if .Values.zfsController.priorityClass.create }}
+      priorityClassName: {{ template "zfslocalpv.zfsController.priorityClassName" . }}
+{{- end }}
       serviceAccount: {{ .Values.serviceAccount.zfsController.name }}
       containers:
         - name: {{ .Values.zfsController.resizer.name }}
diff --git a/deploy/helm/charts/templates/zfs-node.yaml b/deploy/helm/charts/templates/zfs-node.yaml
index 5cc5c3c..42a9878 100644
--- a/deploy/helm/charts/templates/zfs-node.yaml
+++ b/deploy/helm/charts/templates/zfs-node.yaml
@@ -26,7 +26,9 @@ spec:
         {{ toYaml . | nindent 8 }}
         {{- end}}
     spec:
-      priorityClassName: system-node-critical
+{{- if .Values.zfsNode.priorityClass.create }}
+      priorityClassName: {{ template "zfslocalpv.zfsNode.priorityClassName" . }}
+{{- end }}
       serviceAccount: {{ .Values.serviceAccount.zfsNode.name }}
       hostNetwork: true
       containers: