diff --git a/infrastructure/talos/home/talconfig.yaml b/infrastructure/talos/home/talconfig.yaml
index c01bbda3..47525f82 100644
--- a/infrastructure/talos/home/talconfig.yaml
+++ b/infrastructure/talos/home/talconfig.yaml
@@ -88,15 +88,9 @@ nodes:
     patches:
       - |-
         - op: add
-          path: /machine/kubelet/extraMounts
+          path: /machine/sysctls
           value:
-            - destination: /var/openebs/local
-              type: bind
-              source: /var/openebs/local
-              options:
-                - bind
-                - rshared
-                - rw
+            vm.nr_hugepages: "1024"
     schematic:
       customization:
         extraKernelArgs:
@@ -112,7 +106,7 @@ nodes:
           hardwareAddr: "ec:8e:b5:6f:0d:73"
     disableSearchDomain: true
     nodeLabels:
-      openebs.io/data-plane: "true"
+      openebs.io/engine: mayastor
     installDiskSelector:
       type: ssd
       busPath: /pci0000:00/0000:00:17.0/ata1/host0/target0:0:0/0:0:0:0/
@@ -126,15 +120,9 @@ nodes:
     patches:
       - |-
         - op: add
-          path: /machine/kubelet/extraMounts
+          path: /machine/sysctls
           value:
-            - destination: /var/openebs/local
-              type: bind
-              source: /var/openebs/local
-              options:
-                - bind
-                - rshared
-                - rw
+            vm.nr_hugepages: "1024"
     schematic:
       customization:
         extraKernelArgs:
@@ -150,7 +138,7 @@ nodes:
           hardwareAddr: "ec:8e:b5:6f:0b:df"
     disableSearchDomain: true
     nodeLabels:
-      openebs.io/data-plane: "true"
+      openebs.io/engine: mayastor
     installDiskSelector:
       type: ssd
       busPath: /pci0000:00/0000:00:17.0/ata1/host0/target0:0:0/0:0:0:0/
@@ -164,15 +152,9 @@ nodes:
     patches:
       - |-
         - op: add
-          path: /machine/kubelet/extraMounts
+          path: /machine/sysctls
           value:
-            - destination: /var/openebs/local
-              type: bind
-              source: /var/openebs/local
-              options:
-                - bind
-                - rshared
-                - rw
+            vm.nr_hugepages: "1024"
     schematic:
       customization:
         extraKernelArgs:
@@ -188,7 +170,7 @@ nodes:
           hardwareAddr: "40:b0:34:fa:e0:d3"
     disableSearchDomain: true
     nodeLabels:
-      openebs.io/data-plane: "true"
+      openebs.io/engine: mayastor
     installDiskSelector:
       type: ssd
       busPath: /pci0000:00/0000:00:17.0/ata1/host0/target0:0:0/0:0:0:0/
diff --git a/kubernetes/home/apps/storage/kustomization.yaml b/kubernetes/home/apps/storage/kustomization.yaml
index e6860d28..cc51efc4 100644
--- a/kubernetes/home/apps/storage/kustomization.yaml
+++ b/kubernetes/home/apps/storage/kustomization.yaml
@@ -3,4 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - namespace.yaml
-  - ./openebs-jiva/ks.yaml
+#  - ./openebs-jiva/ks.yaml
+  - ./openebs-mayastor/ks.yaml
diff --git a/kubernetes/home/apps/storage/openebs-mayastor/app/helmrelease.yaml b/kubernetes/home/apps/storage/openebs-mayastor/app/helmrelease.yaml
new file mode 100644
index 00000000..8787b8f1
--- /dev/null
+++ b/kubernetes/home/apps/storage/openebs-mayastor/app/helmrelease.yaml
@@ -0,0 +1,26 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: openebs-mayastor
+  namespace: storage
+spec:
+  chart:
+    spec:
+      chart: mayastor
+      reconcileStrategy: ChartVersion
+      sourceRef:
+        kind: HelmRepository
+        name: openebs-mayastor
+        namespace: flux-system
+      version: 2.6.0
+  interval: 1m0s
+  values:
+    etcd:
+      localpvScConfig:
+        basePath: "/var/openebs/local/localpv-hostpath/etcd"
+    loki-stack:
+      enabled: false
+    obs:
+      callhome:
+        enabled: false
diff --git a/kubernetes/home/apps/storage/openebs-mayastor/app/kustomization.yaml b/kubernetes/home/apps/storage/openebs-mayastor/app/kustomization.yaml
new file mode 100644
index 00000000..dbc604ed
--- /dev/null
+++ b/kubernetes/home/apps/storage/openebs-mayastor/app/kustomization.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - helmrelease.yaml
diff --git a/kubernetes/home/apps/storage/openebs-mayastor/config/diskpool.yaml b/kubernetes/home/apps/storage/openebs-mayastor/config/diskpool.yaml
new file mode 100644
index 00000000..b83ed563
--- /dev/null
+++ b/kubernetes/home/apps/storage/openebs-mayastor/config/diskpool.yaml
@@ -0,0 +1,26 @@
+apiVersion: "openebs.io/v1beta2"
+kind: DiskPool
+metadata:
+  name: pool-jsai
+  namespace: storage
+spec:
+  node: worker-jsai
+  disks: ["/dev/nvme0n1"]
+---
+apiVersion: "openebs.io/v1beta2"
+kind: DiskPool
+metadata:
+  name: pool-dsfg
+  namespace: storage
+spec:
+  node: worker-dsfg
+  disks: ["/dev/nvme0n1"]
+---
+apiVersion: "openebs.io/v1beta2"
+kind: DiskPool
+metadata:
+  name: pool-ajkf
+  namespace: storage
+spec:
+  node: worker-ajkf
+  disks: ["/dev/nvme0n1"]
diff --git a/kubernetes/home/apps/storage/openebs-mayastor/config/kustomization.yaml b/kubernetes/home/apps/storage/openebs-mayastor/config/kustomization.yaml
new file mode 100644
index 00000000..4579fc5b
--- /dev/null
+++ b/kubernetes/home/apps/storage/openebs-mayastor/config/kustomization.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - diskpool.yaml
diff --git a/kubernetes/home/apps/storage/openebs-mayastor/ks.yaml b/kubernetes/home/apps/storage/openebs-mayastor/ks.yaml
new file mode 100644
index 00000000..1c26d894
--- /dev/null
+++ b/kubernetes/home/apps/storage/openebs-mayastor/ks.yaml
@@ -0,0 +1,32 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: openebs-mayastor-app
+  namespace: flux-system
+spec:
+  targetNamespace: storage
+  interval: 10m
+  path: "./kubernetes/home/apps/storage/openebs-mayastor/app"
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  wait: true
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: openebs-mayastor-config
+  namespace: flux-system
+spec:
+  targetNamespace: storage
+  interval: 10m
+  path: "./kubernetes/home/apps/storage/openebs-mayastor/config"
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  wait: true
+  dependsOn:
+    - name: openebs-mayastor-app
diff --git a/kubernetes/home/flux/repositories/helm/kustomization.yaml b/kubernetes/home/flux/repositories/helm/kustomization.yaml
index 02f40b45..edb0fb83 100644
--- a/kubernetes/home/flux/repositories/helm/kustomization.yaml
+++ b/kubernetes/home/flux/repositories/helm/kustomization.yaml
@@ -15,7 +15,7 @@ resources:
   - ./itzg-minecraft.yaml
   - ./jetstack.yaml
   - ./mongodb.yaml
-  - ./openebs-jiva.yaml
+  - ./openebs-mayastor.yaml
   - ./ot-container-kit.yaml
   - ./prometheus-community.yaml
   - ./renovate.yaml
diff --git a/kubernetes/home/flux/repositories/helm/openebs-jiva.yaml b/kubernetes/home/flux/repositories/helm/openebs-mayastor.yaml
similarity index 61%
rename from kubernetes/home/flux/repositories/helm/openebs-jiva.yaml
rename to kubernetes/home/flux/repositories/helm/openebs-mayastor.yaml
index 84f71156..b01a1048 100644
--- a/kubernetes/home/flux/repositories/helm/openebs-jiva.yaml
+++ b/kubernetes/home/flux/repositories/helm/openebs-mayastor.yaml
@@ -2,8 +2,8 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: openebs-jiva
+  name: openebs-mayastor
   namespace: flux-system
 spec:
   interval: 1m0s
-  url: https://openebs.github.io/jiva-operator
+  url: https://openebs.github.io/mayastor-extensions/