diff --git a/roles/rke2/templates/manifests/deploy-ceph-csi-driver.j2 b/roles/rke2/templates/manifests/deploy-ceph-csi-driver.j2
deleted file mode 100644
index 8b5cb1d88029daf190cf45627cda5ec902eae511..0000000000000000000000000000000000000000
--- a/roles/rke2/templates/manifests/deploy-ceph-csi-driver.j2
+++ /dev/null
@@ -1,86 +0,0 @@
----
-
-kind: Namespace
-apiVersion: v1
-metadata:
-  name: ceph-csi-cephfs
-
----
-
-apiVersion: helm.cattle.io/v1
-kind: HelmChart
-metadata:
-  name: ceph-csi
-  namespace: kube-system
-spec:
-  repo: {{ item.value.repo | default("https://ceph.github.io/csi-charts") }}
-  chart: ceph-csi-cephfs
-  version: {{ item.value.version | default("3-canary") }}
-  targetNamespace: ceph-csi-cephfs
-  valuesContent: |-
-    csiConfig: 
-       - clusterID: "{{ item.value.clusterId  }}", monitors:
-{% for mon in item.value.cephMonitors %}
-         - {{ mon }}
-{% endfor %}
-    storageClass:
-      name: csi-cephfs-sc-delete
-      create: true
-      clusterID: "{{ item.value.clusterId }}"
-      fsName: adls
-      mounter: kernel
-      provisionerSecretNamespace: ceph-csi-cephfs
-      controllerExpandSecretNamespace: ceph-csi-cephfs
-      nodeStageSecretNamespace: ceph-csi-cephfs
-      reclaimPolicy: Delete
-      allowVolumeExpansion: true
-    secret:
-      create: true
-      adminID:  {{ item.value.cephAdminUser }} 
-      adminKey: {{ item.value.cephAdminKey }}
-
-
----
-
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: csi-cephfs-sc-retain
-provisioner: cephfs.csi.ceph.com
-parameters:
-  clusterID: "{{ item.value.clusterId }}"
-  fsName: adls
-  mounter: kernel
-  csi.storage.k8s.io/provisioner-secret-name: csi-cephfs-secret
-  csi.storage.k8s.io/provisioner-secret-namespace: ceph-csi-cephfs
-  csi.storage.k8s.io/controller-expand-secret-name: csi-cephfs-secret
-  csi.storage.k8s.io/controller-expand-secret-namespace: ceph-csi-cephfs
-  csi.storage.k8s.io/node-stage-secret-name: csi-cephfs-secret
-  csi.storage.k8s.io/node-stage-secret-namespace: ceph-csi-cephfs
-reclaimPolicy: Retain
-allowVolumeExpansion: true
-
-
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: ceph-csi-config-2
-  namespace: ceph-csi-cephfs
-data:
-  config.json: |-
-    [
-      {
-        "clusterID": "{{ item.value.clusterId }}",
-        "monitors": [
-          "10.0.2.1:6789",
-          "10.0.2.2:6789",
-          "10.0.2.3:6789",
-          "10.0.2.4:6789",
-          "10.0.2.5:6789"
-        ]
-      }
-    ]
-
-
diff --git a/roles/rke2/templates/manifests/deploy-cephfs.j2 b/roles/rke2/templates/manifests/deploy-cephfs.j2
index f3a40af42b305499c4250a19258e884e5b100cbe..da3e2bc62e92cbdcadc79fd31cd4e3237318e652 100644
--- a/roles/rke2/templates/manifests/deploy-cephfs.j2
+++ b/roles/rke2/templates/manifests/deploy-cephfs.j2
@@ -1,16 +1,22 @@
+---
+
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: ceph-csi-cephfs
+
+---
+
 apiVersion: helm.cattle.io/v1
 kind: HelmChart
 metadata:
-  name: cephfs-csi
+  name: ceph-csi
   namespace: kube-system
 spec:
-  repo: https://ceph.github.io/csi-charts
+  repo: {{ item.value.repo | default("https://ceph.github.io/csi-charts") }}
   chart: ceph-csi-cephfs
-  version: 3.3.1
-  valuesContent: |-
-    csiConfig:
-     - clusterID: "{{ ceph_cluster_id }}"
-       monitors:
-{% for mon in ceph_monitors %}
-         - {{ mon }}
-{% endfor %}
\ No newline at end of file
+  version: {{ item.value.version | default("3-canary") }}
+  targetNamespace: ceph-csi-cephfs
+
+
+
diff --git a/roles/rke2/templates/manifests/deploy-openstack-manila.j2 b/roles/rke2/templates/manifests/deploy-openstack-manila.j2
new file mode 100644
index 0000000000000000000000000000000000000000..318e418747216a6d5c127f5e9157f39003d0efc3
--- /dev/null
+++ b/roles/rke2/templates/manifests/deploy-openstack-manila.j2
@@ -0,0 +1,57 @@
+---
+
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: openstack-system
+
+---
+
+apiVersion: helm.cattle.io/v1
+kind: HelmChart
+metadata:
+  name: manila-csi
+  namespace: kube-system
+spec:
+  repo: {{ item.value.repo | default("https://kubernetes.github.io/cloud-provider-openstack") }}
+  chart: openstack-manila-csi
+  version: {{ item.value.version | default("1.4.0") }}
+  targetNamespace: openstack-system
+
+
+
+---
+
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: csi-manila-sc-delete
+provisioner: nfs.manila.csi.openstack.org
+parameters:
+  type: default
+  cephfs-mounter: kernel
+  csi.storage.k8s.io/provisioner-secret-name: csi-manila-secrets
+  csi.storage.k8s.io/provisioner-secret-namespace: openstack-system
+  csi.storage.k8s.io/controller-expand-secret-name: csi-manila-secrets
+  csi.storage.k8s.io/controller-expand-secret-namespace: openstack-system
+  csi.storage.k8s.io/node-stage-secret-name: csi-manila-secrets
+  csi.storage.k8s.io/node-stage-secret-namespace: openstack-system
+  csi.storage.k8s.io/node-publish-secret-name: csi-manila-secrets
+  csi.storage.k8s.io/node-publish-secret-namespace: openstack-system
+reclaimPolicy: Delete
+allowVolumeExpansion: true
+
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: csi-manila-secrets
+  namespace: openstack-system
+stringData:
+  # Mandatory
+  os-authURL: {{ openstack_auth.auth_url }}
+  os-region:  {{ openstack_region_name }}
+  os-userName: {{ openstack_auth.application_credential_id }}
+  os-password: {{ openstack_auth.application_credential_secret }}
+  os-projectName: {{ openstack_auth.project_name }}
+  os-domainID: {{ openstack_auth.domain_id }}