diff --git a/README.md b/README.md
index eebf6ba..f779142 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@ This Helm chart deploys a Kubernetes cluster on vSphere using Cluster API with K
 
 ## Table of Contents
 
-- [Architecture Overview](#architecture-overview)
 - [Key Features](#key-features)
   - [Automatic Rolling Updates](#automatic-rolling-updates)
   - [Split Infrastructure Controller Deployment](#split-infrastructure-controller-deployment)
@@ -23,16 +22,6 @@ This Helm chart deploys a Kubernetes cluster on vSphere using Cluster API with K
 - [Configuration](#configuration)
 - [License](#license)
 
-## Architecture Overview
-
-The chart implements a **Split Architecture** where:
-
-1. The Kubernetes control plane runs as containers on the management cluster (Kamaji)
-2. The Cloud Controller Manager (CPI) and CSI Storage Controller run on the management cluster
-3. Worker nodes run CSI Node drivers on the workload cluster
-4. Communication between components happens via the Kubernetes API server
-
-This approach provides security benefits by isolating vSphere credentials from tenant users while maintaining full Cluster API integration.
 
 ## Key Features
 
@@ -58,11 +47,7 @@ The implementation uses hash-suffixed templates, `VSphereMachineTemplate` and `K
 
 ### Split Infrastructure Controller Deployment
 
-The chart deploys vSphere infrastructure controllers on the management cluster instead of the workload cluster:
-
-- **Cloud Controller Manager (CPI)**: Runs on the management cluster with access to the hosted tenant's API server
-- **vSphere CSI Controller**: Runs on the management cluster
-- **CSI Node Drivers**: Deployed on workload cluster nodes via `ClusterResourceSet`
+The chart deploys vSphere controllers on the management cluster instead of the workload cluster.
 
 This architecture enables:
 - Tenant isolation from vSphere credentials
@@ -179,29 +164,6 @@ stringData:
 EOF
 ```
 
-```yaml
-# Create the csi-config-secret for Storage Controller
-cat <<EOF | kubectl apply -f -
-apiVersion: v1
-kind: Secret
-metadata:
-  name: csi-config-secret
-  namespace: my-cluster
-  labels:
-    cluster.x-k8s.io/cluster-name: "my-cluster"
-stringData:
-  csi-vsphere.conf: |
-    [Global]
-    cluster-id = "namespace/my-cluster"
-    thumbprint = "YOUR_VCENTER_THUMBPRINT"
-    insecure-flag = false
-    [VirtualCenter "vcenter.example.com"]
-    user        = "administrator@vsphere.local"
-    password    = "YOUR_PASSWORD"
-    datacenters = "YOUR_DATACENTER"
-EOF
-```
-
 ### Credentials through VSphereClusterIdentity
 The chart can also be configured to use `VSphereClusterIdentity` for managing vSphere credentials. This allows multiple clusters to share the same credentials.
 
@@ -239,7 +201,6 @@ spec:
       matchLabels: {} # allow all namespaces
 ```
 
-> **Note**: The CSI secret and the Cloud Controller Manager secret must still be created separately.
 
 ```yaml
 # Create the vsphere-config-secret for Cloud Controller Manager
@@ -267,29 +228,6 @@ stringData:
 EOF
 ```
 
-```yaml
-# Create the csi-config-secret for Storage Controller
-cat <<EOF | kubectl apply -f -
-apiVersion: v1
-kind: Secret
-metadata:
-  name: csi-config-secret
-  namespace: my-cluster
-  labels:
-    cluster.x-k8s.io/cluster-name: "my-cluster"
-stringData:
-  csi-vsphere.conf: |
-    [Global]
-    cluster-id = "namespace/my-cluster"
-    thumbprint = "YOUR_VCENTER_THUMBPRINT"
-    insecure-flag = false
-    [VirtualCenter "vcenter.example.com"]
-    user        = "administrator@vsphere.local"
-    password    = "YOUR_PASSWORD"
-    datacenters = "YOUR_DATACENTER"
-EOF
-```
-
 ## Usage
 
 ### Creating a cluster
@@ -366,13 +304,6 @@ If nodes taints are not removed:
 kubectl logs -l component=cloud-controller-manager
 ```
 
-If volume provisioning fails:
-
-```bash
-# Check CSI Controller logs
-kubectl logs -l component=csi-controller-manager
-```
-
 ## Configuration
 
 See the values you can override [here](charts/capi-kamaji-vsphere/README.md).
diff --git a/charts/capi-kamaji-vsphere/Chart.yaml b/charts/capi-kamaji-vsphere/Chart.yaml
index 9da8e94..509b212 100644
--- a/charts/capi-kamaji-vsphere/Chart.yaml
+++ b/charts/capi-kamaji-vsphere/Chart.yaml
@@ -1,5 +1,5 @@
 name: capi-kamaji-vsphere
-version: 0.1.4
+version: 0.2.0
 appVersion: 1.32.0
 description: A Helm chart for deploying a Kamaji Tenant Cluster on vSphere using Cluster API
   and Kamaji.
diff --git a/charts/capi-kamaji-vsphere/README.md b/charts/capi-kamaji-vsphere/README.md
index 018a6f2..e19918f 100644
--- a/charts/capi-kamaji-vsphere/README.md
+++ b/charts/capi-kamaji-vsphere/README.md
@@ -1,6 +1,6 @@
 # capi-kamaji-vsphere
 
-![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.32.0](https://img.shields.io/badge/AppVersion-1.32.0-informational?style=flat-square)
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.32.0](https://img.shields.io/badge/AppVersion-1.32.0-informational?style=flat-square)
 
 A Helm chart for deploying a Kamaji Tenant Cluster on vSphere using Cluster API and Kamaji.
 
@@ -78,17 +78,6 @@ A Helm chart for deploying a Kamaji Tenant Cluster on vSphere using Cluster API
 | vSphereCloudControllerManager.enabled | bool | `true` | Installs vsphere-cloud-controller-manager on the management cluster |
 | vSphereCloudControllerManager.secret.name | string | `"vsphere-config-secret"` | The name of an existing Secret for vSphere.  |
 | vSphereCloudControllerManager.version | string | `"v1.32.0"` | Version of the vsphere-cloud-controller-manager to install. The major and minor versions of releases should be equivalent to the compatible upstream Kubernetes release. |
-| vSphereStorageControllerManager.enabled | bool | `false` | Installs vsphere-storage-controller-manager on the management cluster. NB: CSI node drivers are always installed on the workload cluster. |
-| vSphereStorageControllerManager.logLevel | string | `"PRODUCTION"` | log level for the CSI components |
-| vSphereStorageControllerManager.namespace | string | `"kube-system"` | Target namespace for the vSphere CSI node drivers on the workload cluster |
-| vSphereStorageControllerManager.secret.name | string | `"csi-config-secret"` | The name of an existing Secret for vSphere.  |
-| vSphereStorageControllerManager.storageClass.allowVolumeExpansion | bool | `true` | Allow volume expansion |
-| vSphereStorageControllerManager.storageClass.default | bool | `true` | Configure as the default storage class |
-| vSphereStorageControllerManager.storageClass.enabled | bool | `false` | StorageClass enablement |
-| vSphereStorageControllerManager.storageClass.name | string | `"vsphere-csi"` | Name of the storage class |
-| vSphereStorageControllerManager.storageClass.parameters | object | `{}` | Optional storage class parameters |
-| vSphereStorageControllerManager.storageClass.reclaimPolicy | string | `"Delete"` | Reclaim policy |
-| vSphereStorageControllerManager.storageClass.volumeBindingMode | string | `"WaitForFirstConsumer"` | Volume binding mode |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/capi-kamaji-vsphere/templates/csi-controller-manifests.yaml b/charts/capi-kamaji-vsphere/templates/csi-controller-manifests.yaml
deleted file mode 100644
index c51646c..0000000
--- a/charts/capi-kamaji-vsphere/templates/csi-controller-manifests.yaml
+++ /dev/null
@@ -1,267 +0,0 @@
-{{- if .Values.vSphereStorageControllerManager.enabled }}
----
-apiVersion: storage.k8s.io/v1
-kind: CSIDriver
-metadata:
-  labels:
-    component: csi-controller-manager
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi.vsphere.vmware.com
-spec:
-  attachRequired: true
-  podInfoOnMount: false
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    component: csi-controller-manager
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-vsphere-csi-controller
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    component: csi-controller-manager
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-vsphere-csi-controller
-  namespace: {{ .Release.Namespace }}
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-vsphere-csi-controller
-  strategy:
-    rollingUpdate:
-      maxSurge: 0
-      maxUnavailable: 1
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        component: csi-controller-manager
-        app: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-vsphere-csi-controller
-        role: vsphere-csi
-    spec:
-      containers:
-      - args:
-        - --kubeconfig=/kubeconfig/config/admin.svc
-        - --timeout=300s
-        - --csi-address=$(ADDRESS)
-        - --leader-election
-        - --leader-election-namespace=$(CSI_NAMESPACE)
-        - --leader-election-lease-duration=120s
-        - --leader-election-renew-deadline=60s
-        - --leader-election-retry-period=30s
-        - --kube-api-qps=100
-        - --kube-api-burst=100
-        - --worker-threads=100
-        env:
-        - name: ADDRESS
-          value: /csi/csi.sock
-        - name: CSI_NAMESPACE
-          value: {{ .Values.vSphereStorageControllerManager.namespace }}
-        image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
-        name: csi-attacher
-        resources: null
-        volumeMounts:
-        - mountPath: /csi
-          name: socket-dir
-        - mountPath: /kubeconfig/config/admin.svc
-          name: kubeconfig
-          readOnly: true
-          subPath: admin.svc
-      - args:
-        - --kubeconfig=/kubeconfig/config/admin.svc
-        - --timeout=300s
-        - --handle-volume-inuse-error=false
-        - --csi-address=$(ADDRESS)
-        - --kube-api-qps=100
-        - --kube-api-burst=100
-        - --leader-election
-        - --leader-election-namespace=$(CSI_NAMESPACE)
-        - --leader-election-lease-duration=120s
-        - --leader-election-renew-deadline=60s
-        - --leader-election-retry-period=30s
-        env:
-        - name: ADDRESS
-          value: /csi/csi.sock
-        - name: CSI_NAMESPACE
-          value: {{ .Values.vSphereStorageControllerManager.namespace }}
-        image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
-        name: csi-resizer
-        volumeMounts:
-        - mountPath: /csi
-          name: socket-dir
-        - mountPath: /kubeconfig/config/admin.svc
-          name: kubeconfig
-          readOnly: true
-          subPath: admin.svc
-      - args:
-        - --kubeconfig=/kubeconfig/config/admin.svc
-        - --fss-name=internal-feature-states.csi.vsphere.vmware.com
-        - --fss-namespace=$(CSI_NAMESPACE)
-        env:
-        - name: CSI_ENDPOINT
-          value: unix:///csi/csi.sock
-        - name: X_CSI_MODE
-          value: controller
-        - name: X_CSI_SPEC_DISABLE_LEN_CHECK
-          value: "true"
-        - name: X_CSI_SERIAL_VOL_ACCESS_TIMEOUT
-          value: 3m
-        - name: VSPHERE_CSI_CONFIG
-          value: /etc/cloud/csi-vsphere.conf
-        - name: LOGGER_LEVEL
-          value: PRODUCTION
-        - name: INCLUSTER_CLIENT_QPS
-          value: "100"
-        - name: INCLUSTER_CLIENT_BURST
-          value: "100"
-        - name: CSI_NAMESPACE
-          value: {{ .Values.vSphereStorageControllerManager.namespace }}
-        image: us-central1-docker.pkg.dev/k8s-staging-images/csi-vsphere/driver:latest
-        imagePullPolicy: Always
-        livenessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /healthz
-            port: healthz
-          initialDelaySeconds: 30
-          periodSeconds: 180
-          timeoutSeconds: 10
-        name: vsphere-csi-controller
-        ports:
-        - containerPort: 9808
-          name: healthz
-          protocol: TCP
-        - containerPort: 2112
-          name: prometheus
-          protocol: TCP
-        securityContext:
-          runAsGroup: 65532
-          runAsNonRoot: true
-          runAsUser: 65532
-        volumeMounts:
-        - mountPath: /etc/cloud
-          name: vsphere-config-volume
-          readOnly: true
-        - mountPath: /csi
-          name: socket-dir
-        - mountPath: /kubeconfig/config/admin.svc
-          name: kubeconfig
-          readOnly: true
-          subPath: admin.svc
-      - args:
-        - --csi-address=/csi/csi.sock
-        image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
-        name: liveness-probe
-        volumeMounts:
-        - mountPath: /csi
-          name: socket-dir
-      - args:
-        - --kubeconfig=/kubeconfig/config/admin.svc
-        - --leader-election
-        - --leader-election-namespace=$(CSI_NAMESPACE)
-        - --leader-election-lease-duration=30s
-        - --leader-election-renew-deadline=20s
-        - --leader-election-retry-period=10s
-        - --fss-name=internal-feature-states.csi.vsphere.vmware.com
-        - --fss-namespace=$(CSI_NAMESPACE)
-        env:
-        - name: FULL_SYNC_INTERVAL_MINUTES
-          value: "30"
-        - name: VSPHERE_CSI_CONFIG
-          value: /etc/cloud/csi-vsphere.conf
-        - name: LOGGER_LEVEL
-          value: PRODUCTION
-        - name: INCLUSTER_CLIENT_QPS
-          value: "100"
-        - name: INCLUSTER_CLIENT_BURST
-          value: "100"
-        - name: CSI_NAMESPACE
-          value: {{ .Values.vSphereStorageControllerManager.namespace }}
-        image: us-central1-docker.pkg.dev/k8s-staging-images/csi-vsphere/syncer:latest
-        imagePullPolicy: Always
-        name: vsphere-syncer
-        ports:
-        - containerPort: 2113
-          name: prometheus
-          protocol: TCP
-        securityContext:
-          runAsGroup: 65532
-          runAsNonRoot: true
-          runAsUser: 65532
-        volumeMounts:
-        - mountPath: /etc/cloud
-          name: vsphere-config-volume
-          readOnly: true
-        - mountPath: /kubeconfig/config/admin.svc
-          name: kubeconfig
-          readOnly: true
-          subPath: admin.svc
-      - args:
-        - --kubeconfig=/kubeconfig/config/admin.svc
-        - --timeout=300s
-        - --csi-address=$(ADDRESS)
-        - --kube-api-qps=100
-        - --kube-api-burst=100
-        - --leader-election
-        - --leader-election-namespace=$(CSI_NAMESPACE)
-        - --leader-election-lease-duration=120s
-        - --leader-election-renew-deadline=60s
-        - --leader-election-retry-period=30s
-        - --default-fstype=ext4
-        env:
-        - name: ADDRESS
-          value: /csi/csi.sock
-        - name: CSI_NAMESPACE
-          value: {{ .Values.vSphereStorageControllerManager.namespace }}
-        image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.1
-        name: csi-provisioner
-        volumeMounts:
-        - mountPath: /csi
-          name: socket-dir
-        - mountPath: /kubeconfig/config/admin.svc
-          name: kubeconfig
-          readOnly: true
-          subPath: admin.svc
-      - args:
-        - --kubeconfig=/kubeconfig/config/admin.svc
-        - --kube-api-qps=100
-        - --kube-api-burst=100
-        - --timeout=300s
-        - --csi-address=$(ADDRESS)
-        - --leader-election
-        - --leader-election-namespace=$(CSI_NAMESPACE)
-        - --leader-election-lease-duration=120s
-        - --leader-election-renew-deadline=60s
-        - --leader-election-retry-period=30s
-        env:
-        - name: ADDRESS
-          value: /csi/csi.sock
-        - name: CSI_NAMESPACE
-          value: {{ .Values.vSphereStorageControllerManager.namespace }}
-        image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
-        name: csi-snapshotter
-        volumeMounts:
-        - mountPath: /csi
-          name: socket-dir
-        - mountPath: /kubeconfig/config/admin.svc
-          name: kubeconfig
-          readOnly: true
-          subPath: admin.svc
-      dnsPolicy: ClusterFirst
-      serviceAccountName: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-vsphere-csi-controller
-      volumes:
-      - emptyDir: {}
-        name: socket-dir
-      - name: vsphere-config-volume
-        secret:
-          secretName: {{ include "cluster-api-kamaji-vsphere.csi-config-secret-name" . }}
-      - name: kubeconfig
-        secret:
-          secretName: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-admin-kubeconfig
-{{- end }}
diff --git a/charts/capi-kamaji-vsphere/templates/csi-node-driver.manifests.yaml b/charts/capi-kamaji-vsphere/templates/csi-node-driver.manifests.yaml
deleted file mode 100644
index a1070f3..0000000
--- a/charts/capi-kamaji-vsphere/templates/csi-node-driver.manifests.yaml
+++ /dev/null
@@ -1,331 +0,0 @@
-{{- if .Values.vSphereStorageControllerManager.enabled }}
----
-
-apiVersion: config.projectsveltos.io/v1beta1
-kind: Profile
-metadata:
-  labels:
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-sveltos-profile
-  namespace: {{ .Release.Namespace }}
-spec:
-  clusterSelector:
-    matchLabels:
-      cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  syncMode: ContinuousWithDriftDetection
-  stopMatchingBehavior: LeavePolicies
-  maxConsecutiveFailures: 5
-  policyRefs:
-  - kind: ConfigMap
-    name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-namespace
-  - kind: ConfigMap
-    name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-serviceaccount-node
-  - kind: ConfigMap
-    name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-clusterrole-node
-  - kind: ConfigMap
-    name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-clusterrolebinding-node
-  - kind: ConfigMap
-    name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-role-node
-  - kind: ConfigMap
-    name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-rolebinding-node
-  - kind: ConfigMap
-    name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-configmap-featurestates
-  - kind: ConfigMap
-    name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-daemonset-node
-  - kind: ConfigMap
-    name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-storageclass
----
-apiVersion: v1
-data:
-  data: |-
-    apiVersion: v1
-    kind: Namespace
-    metadata:
-      name: {{ .Values.vSphereStorageControllerManager.namespace }}
-kind: ConfigMap
-metadata:
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-namespace
-  labels:
-    component: csi-node-driver
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: v1
-data:
-  data: |-
-    apiVersion: v1
-    kind: ServiceAccount
-    metadata:
-      name: vsphere-csi-node
-      namespace: {{ .Values.vSphereStorageControllerManager.namespace }}
-kind: ConfigMap
-metadata:
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-serviceaccount-node
-  labels:
-    component: csi-node-driver
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: v1
-data:
-  data: |-
-    kind: ClusterRole
-    apiVersion: rbac.authorization.k8s.io/v1
-    metadata:
-      name: vsphere-csi-node-cluster-role
-    rules:
-      - apiGroups: ["cns.vmware.com"]
-        resources: ["csinodetopologies"]
-        verbs: ["create", "watch", "get", "patch"]
-      - apiGroups: [""]
-        resources: ["nodes"]
-        verbs: ["get"]
-kind: ConfigMap
-metadata:
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-clusterrole-node
-  labels:
-    component: csi-node-driver
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: v1
-data:
-  data: |-
-    apiVersion: rbac.authorization.k8s.io/v1
-    kind: ClusterRoleBinding
-    metadata:
-      name: vsphere-csi-node-cluster-role-binding
-    roleRef:
-      apiGroup: rbac.authorization.k8s.io
-      kind: ClusterRole
-      name: vsphere-csi-node-cluster-role
-    subjects:
-    - kind: ServiceAccount
-      name: vsphere-csi-node
-      namespace: {{ .Values.vSphereStorageControllerManager.namespace }}
-kind: ConfigMap
-metadata:
-  labels:
-    component: csi-node-driver
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-clusterrolebinding-node
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: v1
-data:
-  data: |-
-    kind: Role
-    apiVersion: rbac.authorization.k8s.io/v1
-    metadata:
-      name: vsphere-csi-node-role
-      namespace: {{ .Values.vSphereStorageControllerManager.namespace }}
-    rules:
-      - apiGroups: [""]
-        resources: ["configmaps"]
-        verbs: ["get", "list", "watch"]
-kind: ConfigMap
-metadata:
-  labels:
-    component: csi-node-driver
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-role-node
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: v1
-data:
-  data: |-
-    apiVersion: rbac.authorization.k8s.io/v1
-    kind: RoleBinding
-    metadata:
-      name: vsphere-csi-node-binding
-      namespace: {{ .Values.vSphereStorageControllerManager.namespace }}
-    roleRef:
-      apiGroup: rbac.authorization.k8s.io
-      kind: Role
-      name: vsphere-csi-node-role
-    subjects:
-    - kind: ServiceAccount
-      name: vsphere-csi-node
-      namespace: {{ .Values.vSphereStorageControllerManager.namespace }}
-kind: ConfigMap
-metadata:
-  labels:
-    component: csi-node-driver
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-rolebinding-node
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    component: csi-node-driver
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-configmap-featurestates
-  namespace: {{ .Release.Namespace }}
-data:
-  data: |-
-    apiVersion: v1
-    data:
-      pv-to-backingdiskobjectid-mapping: "false"
-      trigger-csi-fullsync: "false"
-    kind: ConfigMap
-    metadata:
-      name: internal-feature-states.csi.vsphere.vmware.com
-      namespace: {{ .Values.vSphereStorageControllerManager.namespace }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    component: csi-node-driver
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-daemonset-node
-  namespace: {{ .Release.Namespace }}
-data:
-  data: |-
-    apiVersion: apps/v1
-    kind: DaemonSet
-    metadata:
-      name: vsphere-csi-node
-      namespace: {{ .Values.vSphereStorageControllerManager.namespace }}
-    spec:
-      selector:
-        matchLabels:
-          app: vsphere-csi-node
-      updateStrategy:
-        type: "RollingUpdate"
-        rollingUpdate:
-          maxUnavailable: 1
-      template:
-        metadata:
-          labels:
-            app: vsphere-csi-node
-            role: vsphere-csi
-        spec:
-          priorityClassName: system-node-critical
-          nodeSelector:
-            kubernetes.io/os: linux
-          serviceAccountName: vsphere-csi-node
-          hostNetwork: true
-          dnsPolicy: "ClusterFirstWithHostNet"
-          containers:
-            - name: node-driver-registrar
-              image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
-              args:
-                - "--csi-address=$(ADDRESS)"
-                - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
-              env:
-                - name: ADDRESS
-                  value: /csi/csi.sock
-                - name: DRIVER_REG_SOCK_PATH
-                  value: /var/lib/kubelet/plugins/csi.vsphere.vmware.com/csi.sock
-              volumeMounts:
-                - name: plugin-dir
-                  mountPath: /csi
-                - name: registration-dir
-                  mountPath: /registration
-              livenessProbe:
-                exec:
-                  command:
-                  - /csi-node-driver-registrar
-                  - --kubelet-registration-path=/var/lib/kubelet/plugins/csi.vsphere.vmware.com/csi.sock
-                  - --mode=kubelet-registration-probe
-                initialDelaySeconds: 3
-            - name: vsphere-csi-node
-              image: us-central1-docker.pkg.dev/k8s-staging-images/csi-vsphere/driver:latest
-              args:
-                - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
-                - "--fss-namespace=$(CSI_NAMESPACE)"
-              imagePullPolicy: "Always"
-              env:
-                - name: NODE_NAME
-                  valueFrom:
-                    fieldRef:
-                      fieldPath: spec.nodeName
-                - name: CSI_ENDPOINT
-                  value: unix:///csi/csi.sock
-                - name: MAX_VOLUMES_PER_NODE
-                  value: "59"
-                - name: X_CSI_MODE
-                  value: "node"
-                - name: X_CSI_SPEC_REQ_VALIDATION
-                  value: "false"
-                - name: X_CSI_SPEC_DISABLE_LEN_CHECK
-                  value: "true"
-                - name: LOGGER_LEVEL
-                  value: "${CSI_LOG_LEVEL}" # Options: DEVELOPMENT, PRODUCTION
-                - name: CSI_NAMESPACE
-                  valueFrom:
-                    fieldRef:
-                      fieldPath: metadata.namespace
-                - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
-                  value: "1"
-              securityContext:
-                privileged: true
-                capabilities:
-                  add: ["SYS_ADMIN"]
-                allowPrivilegeEscalation: true
-              volumeMounts:
-                - name: plugin-dir
-                  mountPath: /csi
-                - name: pods-mount-dir
-                  mountPath: /var/lib/kubelet
-                  # needed so that any mounts setup inside this container are
-                  # propagated back to the host machine.
-                  mountPropagation: "Bidirectional"
-                - name: device-dir
-                  mountPath: /dev
-                - name: blocks-dir
-                  mountPath: /sys/block
-                - name: sys-devices-dir
-                  mountPath: /sys/devices
-              ports:
-                - name: healthz
-                  containerPort: 9808
-                  protocol: TCP
-              livenessProbe:
-                httpGet:
-                  path: /healthz
-                  port: healthz
-                initialDelaySeconds: 10
-                timeoutSeconds: 5
-                periodSeconds: 5
-                failureThreshold: 3
-            - name: liveness-probe
-              image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
-              args:
-                - "--csi-address=/csi/csi.sock"
-              volumeMounts:
-                - name: plugin-dir
-                  mountPath: /csi
-          volumes:
-            - name: registration-dir
-              hostPath:
-                path: /var/lib/kubelet/plugins_registry
-                type: Directory
-            - name: plugin-dir
-              hostPath:
-                path: /var/lib/kubelet/plugins/csi.vsphere.vmware.com
-                type: DirectoryOrCreate
-            - name: pods-mount-dir
-              hostPath:
-                path: /var/lib/kubelet
-                type: Directory
-            - name: device-dir
-              hostPath:
-                path: /dev
-            - name: blocks-dir
-              hostPath:
-                path: /sys/block
-                type: Directory
-            - name: sys-devices-dir
-              hostPath:
-                path: /sys/devices
-                type: Directory
-          tolerations:
-            - effect: NoExecute
-              operator: Exists
-            - effect: NoSchedule
-              operator: Exists
-{{- end }}
\ No newline at end of file
diff --git a/charts/capi-kamaji-vsphere/templates/csi-storage-class.yaml b/charts/capi-kamaji-vsphere/templates/csi-storage-class.yaml
deleted file mode 100644
index 206af1b..0000000
--- a/charts/capi-kamaji-vsphere/templates/csi-storage-class.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-{{- if and .Values.vSphereStorageControllerManager.enabled .Values.vSphereStorageControllerManager.storageClass.enabled }}
----
-apiVersion: v1
-data:
-  data: |-
-    apiVersion: storage.k8s.io/v1
-    kind: StorageClass
-    metadata:
-      name: {{ .Values.vSphereStorageControllerManager.storageClass.name | quote }}
-      annotations:
-        storageclass.kubernetes.io/is-default-class: "{{ .Values.vSphereStorageControllerManager.storageClass.default }}"
-    provisioner: csi.vsphere.vmware.com
-    allowVolumeExpansion: {{ .Values.vSphereStorageControllerManager.storageClass.allowVolumeExpansion }}
-    reclaimPolicy: {{ .Values.vSphereStorageControllerManager.storageClass.reclaimPolicy }}
-    parameters: {{ .Values.vSphereStorageControllerManager.storageClass.parameters | toYaml | nindent 6 }}
-    volumeBindingMode: {{ .Values.vSphereStorageControllerManager.storageClass.volumeBindingMode }}
-kind: ConfigMap
-metadata:
-  labels:
-    component: csi-storage-class
-    cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . | quote }}
-  name: {{ include "cluster-api-kamaji-vsphere.cluster-name" . }}-csi-storageclass
-  namespace: {{ .Release.Namespace }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/capi-kamaji-vsphere/values.yaml b/charts/capi-kamaji-vsphere/values.yaml
index 00e74d9..4acd4ac 100644
--- a/charts/capi-kamaji-vsphere/values.yaml
+++ b/charts/capi-kamaji-vsphere/values.yaml
@@ -166,30 +166,3 @@ vSphereCloudControllerManager:
     name: vsphere-config-secret
   # -- Version of the vsphere-cloud-controller-manager to install. The major and minor versions of releases should be equivalent to the compatible upstream Kubernetes release.
   version: v1.32.0
-
-vSphereStorageControllerManager:
-  # -- Installs vsphere-storage-controller-manager on the management cluster. NB: CSI node drivers are always installed on the workload cluster.
-  enabled: false
-  # -- log level for the CSI components
-  logLevel: "PRODUCTION" # PRODUCTION, DEVELOPMENT
-  secret:
-    # -- The name of an existing Secret for vSphere. 
-    name: csi-config-secret
-  # -- Target namespace for the vSphere CSI node drivers on the workload cluster
-  namespace: "kube-system"
-  storageClass:
-    # -- StorageClass enablement
-    enabled: false
-    # -- Name of the storage class
-    name: "vsphere-csi"
-    # -- Allow volume expansion
-    allowVolumeExpansion: true
-    # -- Reclaim policy
-    reclaimPolicy: Delete
-    # -- Volume binding mode
-    volumeBindingMode: WaitForFirstConsumer
-    # -- Optional storage class parameters
-    parameters: {}
-    #  storagepolicyname: DATASTORE_POLICY_NAME
-    # -- Configure as the default storage class
-    default: true