diff --git a/deploy/helm/charts/Chart.yaml b/deploy/helm/charts/Chart.yaml
index 01da0a3b1..db35a74f8 100644
--- a/deploy/helm/charts/Chart.yaml
+++ b/deploy/helm/charts/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: zfs-localpv
 description: CSI Driver for dynamic provisioning of ZFS Persistent Local Volumes.
-version: 1.7.1
-appVersion: 1.7.0
+version: 1.8.0
+appVersion: 1.8.0
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png
 home: http://www.openebs.io/
 keywords:
diff --git a/deploy/helm/charts/crds/zfsnode.yaml b/deploy/helm/charts/crds/zfsnode.yaml
new file mode 100644
index 000000000..db0540d4b
--- /dev/null
+++ b/deploy/helm/charts/crds/zfsnode.yaml
@@ -0,0 +1,87 @@
+
+##############################################
+###########                       ############
+###########     ZFSNode CRD       ############
+###########                       ############
+##############################################
+
+# ZFSNode CRD is autogenerated via `make manifests` command.
+# Do the modification in the code and run the `make manifests` command
+# to generate the CRD definition
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.4.0
+  creationTimestamp: null
+  name: zfsnodes.zfs.openebs.io
+spec:
+  group: zfs.openebs.io
+  names:
+    kind: ZFSNode
+    listKind: ZFSNodeList
+    plural: zfsnodes
+    shortNames:
+    - zfsnode
+    singular: zfsnode
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: ZFSNode records information about all zfs pools available in
+          a node. In general, the openebs node-agent creates the ZFSNode object &
+          periodically synchronizing the zfs pools available in the node. ZFSNode
+          has an owner reference pointing to the corresponding node object.
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          pools:
+            items:
+              description: Pool specifies attributes of a given zfs pool that exists
+                on the node.
+              properties:
+                free:
+                  anyOf:
+                  - type: integer
+                  - type: string
+                  description: Free specifies the available capacity of zfs pool.
+                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                  x-kubernetes-int-or-string: true
+                name:
+                  description: Name of the zfs pool.
+                  minLength: 1
+                  type: string
+                uuid:
+                  description: UUID denotes a unique identity of a zfs pool.
+                  minLength: 1
+                  type: string
+              required:
+              - free
+              - name
+              - uuid
+              type: object
+            type: array
+        required:
+        - pools
+        type: object
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/deploy/helm/charts/templates/rbac.yaml b/deploy/helm/charts/templates/rbac.yaml
index 13ea0d59d..632ec42ce 100644
--- a/deploy/helm/charts/templates/rbac.yaml
+++ b/deploy/helm/charts/templates/rbac.yaml
@@ -32,6 +32,9 @@ rules:
   - apiGroups: ["storage.k8s.io"]
     resources: ["storageclasses", "csinodes"]
     verbs: ["get", "list", "watch"]
+  - apiGroups: [ "storage.k8s.io" ]
+    resources: [ "csistoragecapacities"]
+    verbs: ["*"]
   - apiGroups: [""]
     resources: ["events"]
     verbs: ["list", "watch", "create", "update", "patch"]
@@ -48,7 +51,7 @@ rules:
     resources: ["pods"]
     verbs: ["get", "list", "watch", "update", "patch"]
   - apiGroups: ["*"]
-    resources: ["zfsvolumes", "zfssnapshots", "zfsbackups", "zfsrestores"]
+    resources: ["zfsvolumes", "zfssnapshots", "zfsbackups", "zfsrestores", "zfsnodes"]
     verbs: ["*"]
 ---
 kind: ClusterRoleBinding
@@ -146,7 +149,7 @@ rules:
     resources: ["persistentvolumes", "nodes", "services"]
     verbs: ["get", "list"]
   - apiGroups: ["*"]
-    resources: ["zfsvolumes", "zfssnapshots", "zfsbackups", "zfsrestores"]
+    resources: ["zfsvolumes", "zfssnapshots", "zfsbackups", "zfsrestores", "zfsnodes"]
     verbs: ["get", "list", "watch", "create", "update", "patch"]
 ---
 kind: ClusterRoleBinding
diff --git a/deploy/helm/charts/values.yaml b/deploy/helm/charts/values.yaml
index 9f5f319a7..94b79e806 100644
--- a/deploy/helm/charts/values.yaml
+++ b/deploy/helm/charts/values.yaml
@@ -2,7 +2,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 release:
-  version: "1.7.0"
+  version: "1.8.0"
 
 imagePullSecrets:
 # - name: "image-pull-secret"
@@ -123,7 +123,7 @@ zfsPlugin:
     repository: openebs/zfs-driver
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 1.7.0
+    tag: 1.8.0
 
 role: openebs-zfs
 
diff --git a/deploy/yamls/zfsnode-crd.yaml b/deploy/yamls/zfsnode-crd.yaml
index 26ad2c58a..db0540d4b 100644
--- a/deploy/yamls/zfsnode-crd.yaml
+++ b/deploy/yamls/zfsnode-crd.yaml
@@ -50,8 +50,8 @@ spec:
             type: object
           pools:
             items:
-              description: Pool specifies attributes of a given zfs pool exists on
-                node.
+              description: Pool specifies attributes of a given zfs pool that exists
+                on the node.
               properties:
                 free:
                   anyOf:
@@ -61,7 +61,7 @@ spec:
                   pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                   x-kubernetes-int-or-string: true
                 name:
-                  description: Name of the zfs zfs pool.
+                  description: Name of the zfs pool.
                   minLength: 1
                   type: string
                 uuid:
diff --git a/deploy/zfs-operator.yaml b/deploy/zfs-operator.yaml
index 33fdcd2da..79af8a60a 100644
--- a/deploy/zfs-operator.yaml
+++ b/deploy/zfs-operator.yaml
@@ -1257,8 +1257,8 @@ spec:
             type: object
           pools:
             items:
-              description: Pool specifies attributes of a given zfs pool exists on
-                node.
+              description: Pool specifies attributes of a given zfs pool that exists
+                on the node.
               properties:
                 free:
                   anyOf:
@@ -1268,7 +1268,7 @@ spec:
                   pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                   x-kubernetes-int-or-string: true
                 name:
-                  description: Name of the zfs zfs pool.
+                  description: Name of the zfs pool.
                   minLength: 1
                   type: string
                 uuid: