diff --git a/assets/rancher-vsphere-csi/rancher-vsphere-csi-104.0.0+up3.1.2-rancher4.tgz b/assets/rancher-vsphere-csi/rancher-vsphere-csi-104.0.0+up3.1.2-rancher4.tgz
new file mode 100644
index 0000000000..a04175be3c
Binary files /dev/null and b/assets/rancher-vsphere-csi/rancher-vsphere-csi-104.0.0+up3.1.2-rancher4.tgz differ
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/Chart.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/Chart.yaml
new file mode 100644
index 0000000000..46b4d749d9
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/Chart.yaml
@@ -0,0 +1,24 @@
+annotations:
+  catalog.cattle.io/certified: rancher
+  catalog.cattle.io/display-name: vSphere CSI
+  catalog.cattle.io/kube-version: '>= 1.20.0-0 < 1.29.0-0'
+  catalog.cattle.io/namespace: kube-system
+  catalog.cattle.io/os: linux,windows
+  catalog.cattle.io/permits-os: linux,windows
+  catalog.cattle.io/rancher-version: '>= 2.9.0-0 < 2.10.0-0'
+  catalog.cattle.io/release-name: vsphere-csi
+apiVersion: v1
+appVersion: 3.1.2-rancher4
+description: vSphere Cloud Storage Interface (CSI)
+icon: https://charts.rancher.io/assets/logos/vsphere-csi.svg
+keywords:
+- infrastructure
+maintainers:
+- email: jiaqi.luo@suse.com
+  name: Jiaqi Luo
+- email: brad.davidson@suse.com
+  name: Brad Davidson
+name: rancher-vsphere-csi
+sources:
+- https://github.com/kubernetes-sigs/vsphere-csi-driver
+version: 104.0.0+up3.1.2-rancher4
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/README.md b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/README.md
new file mode 100644
index 0000000000..4cb94f45f2
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/README.md
@@ -0,0 +1,84 @@
+# vSphere Container Storage Interface (CSI)
+
+[vSphere Container Storage Interface (CSI)](https://github.com/kubernetes-sigs/vsphere-csi-driver/tree/release-2.1/manifests/v2.1.0/vsphere-7.0u1/) is a specification designed to enable persistent storage volume management on Container Orchestrators (COs) such as Kubernetes. The specification allows storage systems to integrate with containerized workloads running on Kubernetes. Using CSI, storage providers, such as VMware, can write and deploy plugins for storage systems in Kubernetes without a need to modify any core Kubernetes code.
+
+CSI allows volume plugins to be installed on Kubernetes clusters as extensions. Once a CSI compatible volume driver is deployed on a Kubernetes cluster, users can use the CSI to provision, attach, mount, and format the volumes exposed by the CSI driver.
+
+The CSI driver for vSphere is `csi.vsphere.vmware.com`.
+
+## Prerequisites
+
+- vSphere 6.7 U3+
+- Kubernetes v1.20+
+- Out-of-tree vSphere Cloud Provider Interface (CPI)
+- A Secret on your Kubernetes cluster that contains vSphere CSI configuration and credentials
+
+## Installation
+
+This chart requires a Secret in your Kubernetes cluster that contains the CSI configuration and credentials to connect to the vCenter. You can have the chart generate it for you, or create it yourself and provide the name of the Secret during installation.
+
+<span style="color:orange">Warning</span>: When the option to generate the Secret is enabled, the credentials are visible in the API to authorized users. If you create the Secret yourself they will not be visible.
+
+You can create a Secret in one of the following ways:
+
+### <B>Option 1</b>: Create a Secret using the Rancher UI
+
+Go to your cluster's project (Same project you will be installing the chart) > Resources > Secrets > Add Secret.
+```yaml
+# Example of data required in the Secret
+# The csi-vsphere.conf key name is required, otherwise the installation will fail
+csi-vsphere.conf: |
+  [Global]
+  cluster-id = "<cluster-id>"
+  user = "<username>"
+  password = "<password>"
+  port = "<port>"
+  insecure-flag = "<insecure-flag>"
+
+  [VirtualCenter "<host>"]
+  datacenters = "<dc-1>, <dc-2>, ..."
+```
+More information on CSI vSphere configuration [here](https://vsphere-csi-driver.sigs.k8s.io/driver-deployment/installation.html#create_k8s_secret).
+
+### <B>Option 2</b>: Create a Secret using kubectl
+
+Replace placeholders with actual values, and execute the following:
+```bash
+# The csi-vsphere.conf key name is required, otherwise the installation will fail
+cat <<EOF | kubectl apply -f -
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: <secret-name>
+  namespace: <charts-namespace>
+stringData:
+  csi-vsphere.conf: |
+    [Global]
+    cluster-id = "<cluster-id>"
+    user = "<username>"
+    password = "<password>"
+    port = "<port>"
+    insecure-flag = "<insecure-flag>"
+
+    [VirtualCenter "<host>"]
+    datacenters = "<dc-1>, <dc-2>, ..."
+EOF
+```
+
+More information on managing Secrets using kubectl [here](https://kubernetes.io/docs/tasks/configmap-secret/managing-secret-using-kubectl/).
+
+## Migration
+
+The CSI migration feature is only available for vSphere 7.0 U1.
+
+## vSphere CSI with Topology
+
+When deploying to a vSphere environment using zoning, the topology plugin can be enabled for the CSI to make intelligent volume provisioning decisions. More information on vSphere zoning and prerequisites for the CSI toplogy plugin can be found [here](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/2.0/vmware-vsphere-csp-getting-started/GUID-162E7582-723B-4A0F-A937-3ACE82EAFD31.html#guidelines-and-best-practices-for-deployment-with-topology-0).
+
+To enable the topology plugin, adjust the values for the chart as follows:
+
+```yaml
+topology:
+  enabled: true
+```
\ No newline at end of file
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/app-readme.md b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/app-readme.md
new file mode 100644
index 0000000000..bae1876f09
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/app-readme.md
@@ -0,0 +1,14 @@
+# vSphere Container Storage Interface (CSI)
+
+[vSphere Container Storage Interface (CSI)](https://github.com/kubernetes-sigs/vsphere-csi-driver) is a specification designed to enable persistent storage volume management on Container Orchestrators (COs) such as Kubernetes. The specification allows storage systems to integrate with containerized workloads running on Kubernetes. Using CSI, storage providers, such as VMware, can write and deploy plugins for storage systems in Kubernetes without a need to modify any core Kubernetes code.
+
+CSI allows volume plugins to be installed on Kubernetes clusters as extensions. Once a CSI compatible volume driver is deployed on a Kubernetes cluster, users can use the CSI to provision, attach, mount, and format the volumes exposed by the CSI driver.
+
+The CSI driver for vSphere is `csi.vsphere.vmware.com`.
+
+## Prerequisites
+
+- vSphere 6.7 U3+
+- Kubernetes v1.14+
+- Out-of-tree vSphere Cloud Provider Interface (CPI)
+- A Secret on your Kubernetes cluster that contains vSphere CSI configuration and credentials (Refer to `README` or `Detailed Descriptions`)
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/questions.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/questions.yaml
new file mode 100644
index 0000000000..328381aeff
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/questions.yaml
@@ -0,0 +1,162 @@
+questions:
+  - variable: vCenter.configSecret.generate
+    label: Generate CSI vSphere Config Secret
+    description: Generates a Secret that contains a CSI vSphere config and credentials (If the option to generate it is enabled, credentials will be visible in the API to authorized users)
+    type: boolean
+    default: true
+    required: true
+    group: vCenter Configuration
+    show_subquestion_if: true
+    subquestions:
+      - variable: vCenter.host
+        label: vCenter Host
+        description: IP address or FQDN of the vCenter
+        type: string
+
+      - variable: vCenter.datacenters
+        description: Comma-separated list of paths to data centers. E.g "<dc1-path>, <dc2-path>, ..."
+        label: Data Centers
+        type: string
+
+      - variable: vCenter.username
+        label: Username
+        description: Username for vCenter
+        type: string
+
+      - variable: vCenter.password
+        label: Password
+        description: Password for vCenter
+        type: password
+
+  - variable: vCenter.configSecret.name
+    label: CSI vSphere Config Secret Name
+    description: Name of the Secret that contains a CSI vSphere config and credentials (Will not be visible in the API. More info in the README)
+    type: string
+    group: vCenter Configuration
+    show_if: "vCenter.configSecret.generate=false"
+
+  - variable: csiMigration.enabled
+    label: Enable CSI Migration
+    description: Enable migration of volumes provisioned by in-tree vSphere provider to CSI (Available for vSphere 7.0 U1+ only)
+    type: boolean
+    default: false
+    group: Driver Configuration
+
+  - variable: csiAuthCheck.enabled
+    label: Enable authorization checks on operations involving datastores
+    type: boolean
+    default: true
+    group: Driver Configuration
+
+  - variable: onlineVolumeExtend.enabled
+    label: Enable Online Volume Extend
+    description: Enable expansion of PVCs that are in use by a Pod or mounted in a Node (Available for vSphere 7.0 U2+ only)
+    type: boolean
+    default: false
+    group: Driver Configuration
+
+  - variable: triggerCsiFullsync.enabled
+    label: Enable CSI Full Sync
+    description: Keeps CNS up to date with Kubernetes volume metadata information (such as PVs, PVCs, pods, and so on)
+    type: boolean
+    default: false
+    group: Driver Configuration
+
+  - variable: asyncQueryVolume.enabled
+    label: Enable Async Query Volume
+    description: Improves retrieval of volume information
+    type: boolean
+    default: false
+    group: Driver Configuration
+
+  - variable: improvedCsiIdempotency.enabled
+    label: Enable Improved CSI Idempotency
+    description: Enhances driver to ensure volume operations are idempotent
+    type: boolean
+    default: false
+    group: Driver Configuration
+
+  - variable: improvedVolumeTopology.enabled
+    label: Enable Improved Volume Topology
+    description: Allows using the topology feature without the need to mount vSphere credentials in the CSI node daemonset
+    type: boolean
+    default: false
+    group: Driver Configuration
+
+  - variable: multiVcenterCsiTopology.enabled
+    label: Enable Multi vCenter CSI Topology
+    description: Enables the vSphere CSI Driver to operate on a topology-aware Kubernetes Cluster (Generally this should always be enabled for CSI Plugin v3.1.0 and up)
+    type: boolean
+    default: true
+    group: Driver Configuration
+
+  - variable: csiWindowsSupport.enabled
+    label: Enable CSI Windows Support
+    description: Enables Windows support.
+    type: boolean
+    default: false
+    group: Driver Configuration
+
+  - variable: topology.enabled
+    label: Enable CSI Topology Plugin
+    description: Enables the CSI Topology Plugin
+    type: boolean
+    default: false
+    group: Driver Configuration
+
+  - variable: csiController.csiResizer.enabled
+    label: Enable CSI Volume Resizer
+    description: This feature is available for vSphere 7.0 U1+ only
+    type: boolean
+    default: false
+    group: Storage
+
+  - variable: storageClass.enabled
+    default: true
+    label: Create Storage Class
+    description: Create a storageClass with the vSphere CSI provisioner
+    type: boolean
+    required: true
+    show_subquestion_if: true
+    group: Storage
+    subquestions:
+      - variable: storageClass.name
+        label: Storage Class Name
+        default: "vsphere-csi-sc"
+        type: string
+
+      - variable: storageClass.isDefault
+        label: Default Storage Class
+        description: Set the Storage Class as the default
+        default: true
+        type: boolean
+
+      - variable: storageClass.allowVolumeExpansion
+        label: Allow Volume Expansion
+        description: Allows resizing the volume by editing the corresponding PVC object (Available for vSphere 7.0+ only)
+        default: false
+        type: boolean
+
+      - variable: storageClass.storagePolicyName
+        label: Storage Policy Name
+        description: Name of the Storage Policy created in vCenter
+        type: string
+
+      - variable: storageClass.datastoreURL
+        label: Data Store URL
+        description: URL of the data store to use for new volumes (If unspecified, any data store that matches the request will be selected).
+        type: string
+
+  - variable: csiNode.prefixPath
+    label: Prefix Path for `/var/lib/kubelet`
+    description: For some operating systems including RancherOS, RKE prefixes `/var/lib/kubelet` with `/opt/rke`.  Add the prefix path of the location of /var/lib/kubelet
+    type: string
+    default: ""
+    group: Node Configuration
+
+  - variable: csiNode.prefixPathWindows
+    label: Prefix Path for `/var/lib/kubelet`
+    description: For some operating systems including RancherOS, RKE prefixes `/var/lib/kubelet` with `/opt/rke`. For Windows, this will likely be the default value, which is 'C:'
+    type: string
+    default: ""
+    group: Node Configuration
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/_helpers.tpl b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/_helpers.tpl
new file mode 100644
index 0000000000..77fc1c47eb
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/_helpers.tpl
@@ -0,0 +1,48 @@
+{{- define "system_default_registry" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "applyVersionOverrides" -}}
+{{- $overrides := dict -}}
+{{- range $override := .Values.versionOverrides -}}
+{{- if semverCompare $override.constraint $.Capabilities.KubeVersion.Version -}}
+{{- $_ := mergeOverwrite $overrides $override.values -}}
+{{- end -}}
+{{- end -}}
+{{- $_ := mergeOverwrite .Values $overrides -}}
+{{- end -}}
+
+{{/*
+Windows cluster will add default taint for linux nodes,
+add below linux tolerations to workloads could be scheduled to those linux nodes
+*/}}
+{{- define "linux-node-tolerations" -}}
+- key: "cattle.io/os"
+  value: "linux"
+  effect: "NoSchedule"
+  operator: "Equal"
+{{- end -}}
+
+{{- define "linux-node-selector" -}}
+kubernetes.io/os: linux
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "chartName" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Labels that should be added on each resource
+*/}}
+{{- define "labels" -}}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+helm.sh/chart: {{ include "chartName" . }}
+{{- end -}}
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/configmap.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/configmap.yaml
new file mode 100644
index 0000000000..09a8846733
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/configmap.yaml
@@ -0,0 +1,23 @@
+# Source: https://github.com/kubernetes-sigs/vsphere-csi-driver
+apiVersion: v1
+data:
+  "csi-migration": {{ .Values.csiMigration.enabled | quote }}
+  "csi-auth-check": {{ .Values.csiAuthCheck.enabled | quote }}
+  "online-volume-extend": {{ .Values.onlineVolumeExtend.enabled | quote }}
+  "trigger-csi-fullsync": {{ .Values.triggerCsiFullsync.enabled | quote }}
+  "async-query-volume": {{ .Values.asyncQueryVolume.enabled | quote }}
+  "improved-csi-idempotency": {{ .Values.improvedCsiIdempotency.enabled | quote }}
+  "improved-volume-topology": {{ .Values.improvedVolumeTopology.enabled | quote }}
+  "block-volume-snapshot": {{ .Values.blockVolumeSnapshot.enabled | quote }}
+  "csi-windows-support": {{ .Values.csiWindowsSupport.enabled | quote }}
+  "use-csinode-id": {{ .Values.useCsinodeId.enabled | quote }}
+  "list-volumes": {{ .Values.listVolumes.enabled | quote }}
+  "pv-to-backingdiskobjectid-mapping": {{ .Values.pvToBackingdiskobjectidMapping.enabled | quote }}
+  "cnsmgr-suspend-create-volume": {{ .Values.cnsmgrSuspendCreateVolume.enabled | quote }}
+  "topology-preferential-datastores": {{ .Values.topologyPreferentialDatastores.enabled | quote }}
+  "max-pvscsi-targets-per-vm": {{ .Values.maxPvscsiTargetsPerVm.enabled | quote }}
+  "multi-vcenter-csi-topology": {{ .Values.multiVcenterCsiTopology.enabled | quote }}
+kind: ConfigMap
+metadata:
+  name: internal-feature-states.csi.vsphere.vmware.com
+  namespace: {{ .Release.Namespace }}
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/deployment.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/deployment.yaml
new file mode 100644
index 0000000000..99d39ac14c
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/deployment.yaml
@@ -0,0 +1,254 @@
+{{- template "applyVersionOverrides" . -}}
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: vsphere-csi-controller
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "labels" . | nindent 4 }}
+spec:
+  replicas: 3
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+      maxSurge: 0
+  selector:
+    matchLabels:
+      app: vsphere-csi-controller
+  template:
+    metadata:
+      labels:
+        app: vsphere-csi-controller
+        role: vsphere-csi
+        {{- include "labels" . | nindent 8 }}
+      {{- with .Values.csiController.podLabels }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      serviceAccountName: vsphere-csi-controller
+      {{- if .Values.csiController.nodeSelector }}
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+      {{- with .Values.csiController.nodeSelector }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- else }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              # RKE node selector label
+              - key: node-role.kubernetes.io/controlplane
+                operator: In
+                values:
+                - "true"
+              # Rancher node selector label
+              - key: kubernetes.io/os
+                operator: NotIn
+                values:
+                - "windows"
+            - matchExpressions:
+              # RKE2 node selector label
+              - key: node-role.kubernetes.io/control-plane
+                operator: In
+                values:
+                - "true"
+              # Rancher node selector label
+              - key: kubernetes.io/os
+                operator: NotIn
+                values:
+                - "windows"
+      {{- end }}
+      {{- if .Values.csiController.tolerations }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
+      {{- with .Values.csiController.tolerations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- else }}
+      tolerations:
+        - key: node-role.kubernetes.io/master
+          operator: Exists
+          effect: NoSchedule
+        # Rancher specific change: These tolerations are added to account for RKE1 and RKE2 taints
+        - key: node-role.kubernetes.io/controlplane
+          effect: NoSchedule
+          value: "true"
+        - key: node-role.kubernetes.io/control-plane
+          effect: NoSchedule
+          operator: Exists
+        - key: node-role.kubernetes.io/etcd
+          effect: NoExecute
+          operator: Exists
+      {{- end }}
+      dnsPolicy: "Default"
+      containers:
+        - name: csi-attacher
+          image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.csiAttacher.repository }}:{{ .Values.csiController.image.csiAttacher.tag }}"
+          args:
+            - "--v=4"
+            - "--timeout=300s"
+            - "--csi-address=$(ADDRESS)"
+            - "--leader-election"
+            - "--kube-api-qps=100"
+            - "--kube-api-burst=100"
+          env:
+            - name: ADDRESS
+              value: /csi/csi.sock
+          volumeMounts:
+            - mountPath: /csi
+              name: socket-dir
+{{- if .Values.csiController.csiResizer.enabled }}
+        - name: csi-resizer
+          image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.csiResizer.repository }}:{{ .Values.csiController.image.csiResizer.tag }}"
+          args:
+            - "--v=4"
+            - "--timeout=300s"
+            - "--handle-volume-inuse-error=false"
+            - "--csi-address=$(ADDRESS)"
+            - "--kube-api-qps=100"
+            - "--kube-api-burst=100"
+            - "--leader-election"
+          env:
+            - name: ADDRESS
+              value: /csi/csi.sock
+          volumeMounts:
+            - mountPath: /csi
+              name: socket-dir
+{{- end }}
+{{- if .Values.blockVolumeSnapshot.enabled }}
+        - name: csi-snapshotter
+          image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.csiSnapshotter.repository }}:{{ .Values.csiController.image.csiSnapshotter.tag }}"
+          args:
+            - "--v=4"
+            - "--kube-api-qps=100"
+            - "--kube-api-burst=100"
+            - "--timeout=300s"
+            - "--csi-address=$(ADDRESS)"
+            - "--leader-election"
+            - "--leader-election-lease-duration=120s"
+            - "--leader-election-renew-deadline=60s"
+            - "--leader-election-retry-period=30s"
+          env:
+            - name: ADDRESS
+              value: /csi/csi.sock
+          volumeMounts:
+            - mountPath: /csi
+              name: socket-dir
+{{- end }}
+        - name: vsphere-csi-controller
+          image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.repository }}:{{ .Values.csiController.image.tag }}"
+          args:
+            - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
+            - "--fss-namespace=$(CSI_NAMESPACE)"
+            {{- if semverCompare "< 1.24" $.Capabilities.KubeVersion.Version }}
+            - "--use-gocsi=false"
+            {{- end }}
+          imagePullPolicy: "Always"
+          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" # Options: DEVELOPMENT, PRODUCTION
+            - name: INCLUSTER_CLIENT_QPS
+              value: "100"
+            - name: INCLUSTER_CLIENT_BURST
+              value: "100"
+            - name: CSI_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          volumeMounts:
+            - mountPath: /etc/cloud
+              name: vsphere-config-volume
+              readOnly: true
+            - mountPath: /csi
+              name: socket-dir
+          ports:
+            - name: healthz
+              containerPort: 9808
+              protocol: TCP
+            - name: prometheus
+              containerPort: 2112
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: 10
+            timeoutSeconds: 3
+            periodSeconds: 5
+            failureThreshold: 3
+        - name: liveness-probe
+          image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.livenessProbe.repository }}:{{ .Values.csiController.image.livenessProbe.tag }}"
+          args:
+            - "--v=4"
+            - "--csi-address=/csi/csi.sock"
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+        - name: vsphere-syncer
+          image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.vsphereSyncer.repository }}:{{ .Values.csiController.image.vsphereSyncer.tag }}"
+          args:
+            - "--leader-election"
+            - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
+            - "--fss-namespace=$(CSI_NAMESPACE)"
+          imagePullPolicy: "Always"
+          ports:
+            - containerPort: 2113
+              name: prometheus
+              protocol: TCP
+          env:
+            - name: FULL_SYNC_INTERVAL_MINUTES
+              value: "30"
+            - name: VSPHERE_CSI_CONFIG
+              value: "/etc/cloud/csi-vsphere.conf"
+            - name: LOGGER_LEVEL
+              value: "PRODUCTION" # Options: DEVELOPMENT, PRODUCTION
+            - name: INCLUSTER_CLIENT_QPS
+              value: "100"
+            - name: INCLUSTER_CLIENT_BURST
+              value: "100"
+            - name: CSI_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          volumeMounts:
+            - mountPath: /etc/cloud
+              name: vsphere-config-volume
+              readOnly: true
+        - name: csi-provisioner
+          image: "{{ template "system_default_registry" . }}{{ .Values.csiController.image.csiProvisioner.repository }}:{{ .Values.csiController.image.csiProvisioner.tag }}"
+          args:
+            - "--v=4"
+            - "--timeout=300s"
+            - "--csi-address=$(ADDRESS)"
+            - "--kube-api-qps=100"
+            - "--kube-api-burst=100"
+            - "--leader-election"
+            - "--default-fstype=ext4"
+            {{- if .Values.topology.enabled }}
+            # needed only for topology aware setup
+            - "--feature-gates=Topology=true"
+            - "--strict-topology"
+            {{- end }}
+          env:
+            - name: ADDRESS
+              value: /csi/csi.sock
+          volumeMounts:
+            - mountPath: /csi
+              name: socket-dir
+      volumes:
+      - name: vsphere-config-volume
+        secret:
+          secretName: {{ .Values.vCenter.configSecret.name }}
+      - name: socket-dir
+        emptyDir: {}
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/role-binding.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/role-binding.yaml
new file mode 100644
index 0000000000..6e2e836190
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/role-binding.yaml
@@ -0,0 +1,14 @@
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: vsphere-csi-controller-binding
+  labels:
+    {{- include "labels" . | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: vsphere-csi-controller
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: vsphere-csi-controller-role
+  apiGroup: rbac.authorization.k8s.io
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/role.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/role.yaml
new file mode 100644
index 0000000000..b6cd1c0ab2
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/role.yaml
@@ -0,0 +1,61 @@
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: vsphere-csi-controller-role
+  labels:
+    {{- include "labels" . | nindent 4 }}
+rules:
+  - apiGroups: [""]
+    resources: ["nodes", "pods", "configmaps"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims"]
+    verbs: ["get", "list", "watch", "update"]
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims/status"]
+    verbs: ["patch"]
+  - apiGroups: [""]
+    resources: ["persistentvolumes"]
+    verbs: ["get", "list", "watch", "create", "update", "delete", "patch"]
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["get", "list", "watch", "create", "update", "patch"]
+  - apiGroups: ["coordination.k8s.io"]
+    resources: ["leases"]
+    verbs: ["get", "watch", "list", "delete", "update", "create"]
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["storageclasses", "csinodes"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["volumeattachments"]
+    verbs: ["get", "list", "watch", "patch"]
+  - apiGroups: ["cns.vmware.com"]
+    resources: ["triggercsifullsyncs"]
+    verbs: ["create", "get", "update", "watch", "list"]
+  - apiGroups: ["cns.vmware.com"]
+    resources: ["cnsvspherevolumemigrations"]
+    verbs: ["create", "get", "list", "watch", "update", "delete"]
+  - apiGroups: ["apiextensions.k8s.io"]
+    resources: ["customresourcedefinitions"]
+    verbs: ["get", "create", "update"]
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["volumeattachments/status"]
+    verbs: ["patch"]
+  - apiGroups: ["cns.vmware.com"]
+    resources: ["cnsvolumeoperationrequests"]
+    verbs: ["create", "get", "list", "update", "delete"]
+  - apiGroups: [ "snapshot.storage.k8s.io" ]
+    resources: [ "volumesnapshots" ]
+    verbs: [ "get", "list" ]
+  - apiGroups: [ "snapshot.storage.k8s.io" ]
+    resources: [ "volumesnapshotclasses" ]
+    verbs: [ "watch", "get", "list" ]
+  - apiGroups: [ "snapshot.storage.k8s.io" ]
+    resources: [ "volumesnapshotcontents" ]
+    verbs: [ "create", "get", "list", "watch", "update", "delete", "patch"]
+  - apiGroups: [ "snapshot.storage.k8s.io" ]
+    resources: [ "volumesnapshotcontents/status" ]
+    verbs: [ "update", "patch" ]
+  - apiGroups: [ "cns.vmware.com" ]
+    resources: [ "csinodetopologies" ]
+    verbs: ["get", "update", "watch", "list"]
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/service-account.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/service-account.yaml
new file mode 100644
index 0000000000..332a814df3
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/service-account.yaml
@@ -0,0 +1,7 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: vsphere-csi-controller
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "labels" . | nindent 4 }}
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/service.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/service.yaml
new file mode 100644
index 0000000000..ae0f17f44b
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/controller/service.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: vsphere-csi-controller
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: vsphere-csi-controller
+    {{- include "labels" . | nindent 4 }}
+spec:
+  ports:
+    - name: ctlr
+      port: 2112
+      targetPort: 2112
+      protocol: TCP
+    - name: syncer
+      port: 2113
+      targetPort: 2113
+      protocol: TCP
+  selector:
+    app: vsphere-csi-controller
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/csi-driver.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/csi-driver.yaml
new file mode 100644
index 0000000000..9b6909e6ac
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/csi-driver.yaml
@@ -0,0 +1,8 @@
+# Source: https://github.com/kubernetes-sigs/vsphere-csi-driver
+apiVersion: storage.k8s.io/v1 # For k8s 1.17 use storage.k8s.io/v1beta1
+kind: CSIDriver
+metadata:
+  name: csi.vsphere.vmware.com
+spec:
+  attachRequired: true
+  podInfoOnMount: false
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/daemonset.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/daemonset.yaml
new file mode 100644
index 0000000000..892e44fc39
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/daemonset.yaml
@@ -0,0 +1,186 @@
+{{- template "applyVersionOverrides" . -}}
+kind: DaemonSet
+apiVersion: apps/v1
+metadata:
+  name: vsphere-csi-node
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app: vsphere-csi-node
+  updateStrategy:
+    type: "RollingUpdate"
+    rollingUpdate:
+      maxUnavailable: 1
+  template:
+    metadata:
+      labels:
+        app: vsphere-csi-node
+        role: vsphere-csi
+        {{- include "labels" . | nindent 8 }}
+      {{- with .Values.csiNode.podLabels }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      {{- if .Values.csiNode.nodeSelector }}
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+      {{- with .Values.csiNode.nodeSelector }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- else }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              # Rancher node selector label
+              - key: kubernetes.io/os
+                operator: NotIn
+                values:
+                - "windows"
+      {{- end }}
+      {{- if .Values.csiNode.tolerations }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
+      {{- with .Values.csiNode.tolerations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- else }}
+      tolerations:
+        - key: node-role.kubernetes.io/master
+          operator: Exists
+          effect: NoSchedule
+        # Rancher specific change: These tolerations are added to account for RKE1 and RKE2 taints
+        - key: node-role.kubernetes.io/controlplane
+          effect: NoSchedule
+          value: "true"
+        - key: node-role.kubernetes.io/control-plane
+          effect: NoSchedule
+          operator: Exists
+        - key: node-role.kubernetes.io/etcd
+          effect: NoExecute
+          operator: Exists
+      {{- end }}
+      serviceAccountName: vsphere-csi-node
+      hostNetwork: true
+      dnsPolicy: "ClusterFirstWithHostNet"
+      containers:
+        - name: node-driver-registrar
+          image: "{{ template "system_default_registry" . }}{{ .Values.csiNode.image.nodeDriverRegistrar.repository }}:{{ .Values.csiNode.image.nodeDriverRegistrar.tag }}"
+          args:
+            - "--v=5"
+            - "--csi-address=$(ADDRESS)"
+            - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
+          env:
+            - name: ADDRESS
+              value: /csi/csi.sock
+            - name: DRIVER_REG_SOCK_PATH
+              value: {{ .Values.csiNode.prefixPath }}/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: "{{ template "system_default_registry" . }}{{ .Values.csiNode.image.repository }}:{{ .Values.csiNode.image.tag }}"
+          args:
+            - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
+            - "--fss-namespace=$(CSI_NAMESPACE)"
+            {{- if semverCompare "< 1.24" $.Capabilities.KubeVersion.Version }}
+            - "--use-gocsi=false"
+            {{- end }}
+          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" # Maximum number of volumes that controller can publish to the node. If value is not set or zero Kubernetes decide how many volumes can be published by the controller to the node.
+            - 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: "PRODUCTION" # 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: {{ .Values.csiNode.prefixPath }}/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: "{{ template "system_default_registry" . }}{{ .Values.csiNode.image.livenessProbe.repository }}:{{ .Values.csiNode.image.livenessProbe.tag }}"
+          args:
+            - "--v=4"
+            - "--csi-address=/csi/csi.sock"
+          volumeMounts:
+            - name: plugin-dir
+              mountPath: /csi
+      volumes:
+        - name: registration-dir
+          hostPath:
+            path: {{ .Values.csiNode.prefixPath }}/var/lib/kubelet/plugins_registry
+            type: Directory
+        - name: plugin-dir
+          hostPath:
+            path: {{ .Values.csiNode.prefixPath }}/var/lib/kubelet/plugins/csi.vsphere.vmware.com
+            type: DirectoryOrCreate
+        - name: pods-mount-dir
+          hostPath:
+            path: {{ .Values.csiNode.prefixPath }}/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
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/role-binding.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/role-binding.yaml
new file mode 100644
index 0000000000..8424efe294
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/role-binding.yaml
@@ -0,0 +1,32 @@
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: vsphere-csi-node-binding
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "labels" . | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: vsphere-csi-node
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: Role
+  name: vsphere-csi-node-role
+  apiGroup: rbac.authorization.k8s.io
+
+---
+
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: vsphere-csi-node-cluster-role-binding
+  labels:
+    {{- include "labels" . | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: vsphere-csi-node
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: vsphere-csi-node-cluster-role
+  apiGroup: rbac.authorization.k8s.io
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/role.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/role.yaml
new file mode 100644
index 0000000000..00d6fe3d60
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/role.yaml
@@ -0,0 +1,29 @@
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: vsphere-csi-node-role
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "labels" . | nindent 4 }}
+rules:
+  - apiGroups: [""]
+    resources: ["configmaps"]
+    verbs: ["get", "list", "watch"]
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: vsphere-csi-node-cluster-role
+  labels:
+    {{- include "labels" . | nindent 4 }}
+rules:
+  - apiGroups: ["cns.vmware.com"]
+    resources: ["csinodetopologies"]
+{{- if semverCompare ">= 1.21" $.Capabilities.KubeVersion.Version }}
+    verbs: ["create", "watch", "get", "patch"]
+{{- else }}
+    verbs: ["create", "watch"]
+{{- end }}
+  - apiGroups: [""]
+    resources: ["nodes"]
+    verbs: ["get"]
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/service-account.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/service-account.yaml
new file mode 100644
index 0000000000..88f1f63c05
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/service-account.yaml
@@ -0,0 +1,7 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: vsphere-csi-node
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "labels" . | nindent 4 }}
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/windows-daemonset.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/windows-daemonset.yaml
new file mode 100644
index 0000000000..a3b62be48d
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/node/windows-daemonset.yaml
@@ -0,0 +1,167 @@
+{{- if .Values.csiWindowsSupport.enabled }}
+{{- template "applyVersionOverrides" . -}}
+kind: DaemonSet
+apiVersion: apps/v1
+metadata:
+  name: vsphere-csi-node-windows
+  namespace: {{ .Release.Namespace }}
+spec:
+  selector:
+    matchLabels:
+      app: vsphere-csi-node-windows
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+  template:
+    metadata:
+      labels:
+        app: vsphere-csi-node-windows
+        role: vsphere-csi-windows
+    spec:
+      nodeSelector:
+        kubernetes.io/os: windows
+      {{- if .Values.csiNode.tolerations }}
+      tolerations:
+      {{- with .Values.csiNode.tolerations }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- else }}
+      tolerations:
+        - key: node-role.kubernetes.io/master
+          operator: Exists
+          effect: NoSchedule
+          # Rancher specific change: These tolerations are added to account for RKE1 and RKE2 taints
+        - key: node-role.kubernetes.io/controlplane
+          effect: NoSchedule
+          value: "true"
+        - key: node-role.kubernetes.io/control-plane
+          effect: NoSchedule
+          operator: Exists
+        - key: node-role.kubernetes.io/etcd
+          effect: NoExecute
+          operator: Exists
+      {{- end }}
+      serviceAccountName: vsphere-csi-node
+      containers:
+        - name: node-driver-registrar
+          image: "{{ template "system_default_registry" . }}{{ .Values.csiNode.image.nodeDriverRegistrar.repository }}:{{ .Values.csiNode.image.nodeDriverRegistrar.tag }}"
+          args:
+            - "--v=5"
+            - "--csi-address=$(ADDRESS)"
+            - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
+            {{- if semverCompare "< 1.24" $.Capabilities.KubeVersion.Version }}
+            - "--health-port=9809"
+            {{- end }}
+          env:
+            - name: ADDRESS
+              value: 'unix://C:\\csi\\csi.sock'
+            - name: DRIVER_REG_SOCK_PATH
+              value: '{{ .Values.csiNode.prefixPathWindows | default "C:" }}\\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.exe
+                - --kubelet-registration-path=C:\\var\\lib\\kubelet\\plugins\\csi.vsphere.vmware.com\\csi.sock
+                - --mode=kubelet-registration-probe
+            initialDelaySeconds: 3
+        - name: vsphere-csi-node
+          image: "{{ template "system_default_registry" . }}{{ .Values.csiNode.image.repository }}:{{ .Values.csiNode.image.tag }}"
+          args:
+            - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
+            - "--fss-namespace=$(CSI_NAMESPACE)"
+          imagePullPolicy: "Always"
+          env:
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: spec.nodeName
+            - name: CSI_ENDPOINT
+              value: 'unix://C:\\csi\\csi.sock'
+            - name: MAX_VOLUMES_PER_NODE
+              value: "0" # Maximum number of volumes that controller can publish to the node. If value is not set or zero Kubernetes decide how many volumes can be published by the controller to the node.
+            - 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: "PRODUCTION" # Options: DEVELOPMENT, PRODUCTION
+            - name: X_CSI_LOG_LEVEL
+              value: DEBUG
+            - name: CSI_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
+              value: "1"
+          volumeMounts:
+            - name: plugin-dir
+              mountPath: 'C:\csi'
+            - name: pods-mount-dir
+              mountPath: 'C:\var\lib\kubelet'
+            - name: csi-proxy-volume-v1
+              mountPath: \\.\pipe\csi-proxy-volume-v1
+            - name: csi-proxy-filesystem-v1
+              mountPath: \\.\pipe\csi-proxy-filesystem-v1
+            - name: csi-proxy-disk-v1
+              mountPath: \\.\pipe\csi-proxy-disk-v1
+            - name: csi-proxy-system-v1alpha1
+              mountPath: \\.\pipe\csi-proxy-system-v1alpha1
+          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: "{{ template "system_default_registry" . }}{{ .Values.csiNode.image.livenessProbe.repository }}:{{ .Values.csiNode.image.livenessProbe.tag }}"
+          args:
+            - "--v=4"
+            - "--csi-address=/csi/csi.sock"
+          volumeMounts:
+            - name: plugin-dir
+              mountPath: /csi
+      volumes:
+        - name: registration-dir
+          hostPath:
+            path: 'C:\var\lib\kubelet\plugins_registry\'
+            type: Directory
+        - name: plugin-dir
+          hostPath:
+            path: 'C:\var\lib\kubelet\plugins\csi.vsphere.vmware.com\'
+            type: DirectoryOrCreate
+        - name: pods-mount-dir
+          hostPath:
+            path: \var\lib\kubelet
+            type: Directory
+        - name: csi-proxy-disk-v1
+          hostPath:
+            path: \\.\pipe\csi-proxy-disk-v1
+            type: ''
+        - name: csi-proxy-volume-v1
+          hostPath:
+            path: \\.\pipe\csi-proxy-volume-v1
+            type: ''
+        - name: csi-proxy-filesystem-v1
+          hostPath:
+            path: \\.\pipe\csi-proxy-filesystem-v1
+            type: ''
+        - name: csi-proxy-system-v1alpha1
+          hostPath:
+            path: \\.\pipe\csi-proxy-system-v1alpha1
+            type: ''
+{{ end }}
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/secret.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/secret.yaml
new file mode 100644
index 0000000000..2a8c530257
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/secret.yaml
@@ -0,0 +1,9 @@
+{{- if .Values.vCenter.configSecret.generate -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.vCenter.configSecret.name }}
+  namespace: {{ .Release.Namespace }}
+data:
+  csi-vsphere.conf: {{ tpl .Values.vCenter.configSecret.configTemplate . | b64enc | quote }}
+{{- end -}}
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/storageclass.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/storageclass.yaml
new file mode 100644
index 0000000000..30dfbd46a9
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/templates/storageclass.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.storageClass.enabled -}}
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+ name: {{ .Values.storageClass.name | quote }}
+ annotations:
+  storageclass.kubernetes.io/is-default-class: {{ .Values.storageClass.isDefault | quote }}
+provisioner: csi.vsphere.vmware.com
+allowVolumeExpansion: {{ .Values.storageClass.allowVolumeExpansion }}
+parameters:
+  {{- if .Values.storageClass.datastoreURL  }}
+  datastoreURL: {{ .Values.storageClass.datastoreURL | quote }}
+  {{- end }}
+  {{- if .Values.storageClass.storagePolicyName }}
+  storagepolicyname: {{ .Values.storageClass.storagePolicyName | quote }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/values.yaml b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/values.yaml
new file mode 100644
index 0000000000..a46f4cd83e
--- /dev/null
+++ b/charts/rancher-vsphere-csi/104.0.0+up3.1.2-rancher4/values.yaml
@@ -0,0 +1,349 @@
+vCenter:
+  host: ""
+  port: 443
+  insecureFlag: "1"
+  clusterId: ""
+  datacenters: ""
+  username: ""
+  password: ""
+  configSecret:
+    name: "vsphere-config-secret"
+    generate: true
+    configTemplate: |
+      [Global]
+      cluster-id = {{ required ".Values.vCenter.clusterId must be provided" (default .Values.vCenter.clusterId .Values.global.cattle.clusterId) | quote }}
+      user = {{ .Values.vCenter.username | quote }}
+      password = {{ .Values.vCenter.password | quote }}
+      port = {{ .Values.vCenter.port | quote }}
+      insecure-flag = {{ .Values.vCenter.insecureFlag | quote }}
+
+      [VirtualCenter {{ .Values.vCenter.host | quote }}]
+      datacenters = {{ .Values.vCenter.datacenters | quote }}
+
+csiController:
+  csiResizer:
+    enabled: false
+  image:
+    repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+    tag: latest
+    csiAttacher:
+      repository: rancher/mirrored-sig-storage-csi-attacher
+      tag: latest
+    csiResizer:
+      repository: rancher/mirrored-sig-storage-csi-resizer
+      tag: latest
+    livenessProbe:
+      repository: rancher/mirrored-sig-storage-livenessprobe
+      tag: latest
+    vsphereSyncer:
+      repository: rancher/mirrored-cloud-provider-vsphere-csi-release-syncer
+      tag: latest
+    csiProvisioner:
+      repository: rancher/mirrored-sig-storage-csi-provisioner
+      tag: latest
+    csiSnapshotter:
+      repository: rancher/mirrored-sig-storage-csi-snapshotter
+      tag: latest
+  ## Node labels for pod assignment
+  ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: {}
+  # Uncomment below toleration if you need an aggressive pod eviction in case when
+  # node becomes not-ready or unreachable. Default is 300 seconds if not specified.
+  tolerations: []
+  # - key: node.kubernetes.io/not-ready
+  #   operator: Exists
+  #   effect: NoExecute
+  #   tolerationSeconds: 30
+  # - key: node.kubernetes.io/unreachable
+  #   operator: Exists
+  #   effect: NoExecute
+  #   tolerationSeconds: 30
+  ##
+  ## Optional additional labels to add to pods
+  podLabels: {}
+
+# Internal features
+csiMigration:
+  enabled: false
+csiAuthCheck:
+  enabled: true
+onlineVolumeExtend:
+  enabled: false
+triggerCsiFullsync:
+  enabled: false
+asyncQueryVolume:
+  enabled: false
+improvedCsiIdempotency:
+  enabled: false
+improvedVolumeTopology:
+  enabled: false
+blockVolumeSnapshot:
+  enabled: false
+csiWindowsSupport:
+  enabled: false
+useCsinodeId:
+  enabled: true
+listVolumes:
+  enabled: false
+pvToBackingdiskobjectidMapping:
+  enabled: false
+cnsmgrSuspendCreateVolume:
+  enabled: false
+topology:
+  enabled: false
+topologyPreferentialDatastores:
+  enabled: false
+maxPvscsiTargetsPerVm:
+  enabled: false
+multiVcenterCsiTopology:
+  enabled: true
+
+csiNode:
+  ## Node labels for pod assignment
+  ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: {}
+  ## List of node taints to tolerate (requires Kubernetes >= 1.6)
+  tolerations: []
+  ## Optional additional labels to add to pods
+  podLabels: {}
+  prefixPath: ""
+  prefixPathWindows: ""
+  image:
+    repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+    tag: latest
+    nodeDriverRegistrar:
+      repository: rancher/mirrored-sig-storage-csi-node-driver-registrar
+      tag: latest
+    livenessProbe:
+      repository: rancher/mirrored-sig-storage-livenessprobe
+      tag: latest
+
+storageClass:
+  enabled: true
+  allowVolumeExpansion: false
+  name: "vsphere-csi-sc"
+  isDefault: true
+  storagePolicyName: ""
+  datastoreURL: ""
+
+global:
+  cattle:
+    systemDefaultRegistry: ""
+
+# A list of Semver constraint strings (defined by https://github.com/Masterminds/semver) and values.yaml overrides.
+#
+# For each key in versionOverrides, this chart will check to see if the current Kubernetes cluster's version matches
+# any of the semver constraints provided as keys on the map.
+#
+# On seeing a match, the default value for each values.yaml field overridden will be updated with the new value.
+#
+# If multiple matches are encountered (due to overlapping semver ranges), the matches will be applied in order.
+#
+# Notes:
+# - On running a helm template, Helm uses the `.Capabilities.APIVersion` of whatever
+#   Kubernetes release that version of Helm was built against.
+# - On running a helm install --dry-run, the correct kubeVersion should be chosen.
+#
+# Supported versions can be found at:
+# https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-D4AAD99E-9128-40CE-B89C-AD451DA8379D.html#kubernetes-versions-compatible-with-vsphere-container-storage-plugin-1
+versionOverrides:
+  # Versions from https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/v3.1.2/manifests/vanilla/vsphere-csi-driver.yaml
+  - constraint: ">= 1.26 < 1.29"
+    values:
+      csiController:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v3.1.2
+          csiAttacher:
+            repository: rancher/mirrored-sig-storage-csi-attacher
+            tag: v4.3.0
+          csiResizer:
+            repository: rancher/mirrored-sig-storage-csi-resizer
+            tag: v1.8.0
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.10.0
+          vsphereSyncer:
+            repository: rancher/mirrored-cloud-provider-vsphere-csi-release-syncer
+            tag: v3.1.2
+          csiProvisioner:
+            repository: rancher/mirrored-sig-storage-csi-provisioner
+            tag: v3.5.0
+          csiSnapshotter:
+            repository: rancher/mirrored-sig-storage-csi-snapshotter
+            tag: v6.2.2
+      csiNode:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v3.1.2
+          nodeDriverRegistrar:
+            repository: rancher/mirrored-sig-storage-csi-node-driver-registrar
+            tag: v2.8.0
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.10.0
+  # Versions from https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/release-3.0/manifests/vanilla/vsphere-csi-driver.yaml
+  - constraint: ">= 1.24 < 1.26"
+    values:
+      csiController:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v3.0.2
+          csiAttacher:
+            repository: rancher/mirrored-sig-storage-csi-attacher
+            tag: v4.2.0
+          csiResizer:
+            repository: rancher/mirrored-sig-storage-csi-resizer
+            tag: v1.7.0
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.9.0
+          vsphereSyncer:
+            repository: rancher/mirrored-cloud-provider-vsphere-csi-release-syncer
+            tag: v3.0.2
+          csiProvisioner:
+            repository: rancher/mirrored-sig-storage-csi-provisioner
+            tag: v3.4.0
+          csiSnapshotter:
+            repository: rancher/mirrored-sig-storage-csi-snapshotter
+            tag: v6.2.1
+      csiNode:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v3.0.2
+          nodeDriverRegistrar:
+            repository: rancher/mirrored-sig-storage-csi-node-driver-registrar
+            tag: v2.7.0
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.9.0
+  # Versions from https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/release-2.7/manifests/vanilla/vsphere-csi-driver.yaml
+  - constraint: "~ 1.23"
+    values:
+      csiController:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v2.7.2
+          csiAttacher:
+            repository: rancher/mirrored-sig-storage-csi-attacher
+            tag: v3.5.0
+          csiResizer:
+            repository: rancher/mirrored-sig-storage-csi-resizer
+            tag: v1.6.0
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.8.0
+          vsphereSyncer:
+            repository: rancher/mirrored-cloud-provider-vsphere-csi-release-syncer
+            tag: v2.7.2
+          csiProvisioner:
+            repository: rancher/mirrored-sig-storage-csi-provisioner
+            tag: v3.3.0
+      csiNode:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v2.7.2
+          nodeDriverRegistrar:
+            repository: rancher/mirrored-sig-storage-csi-node-driver-registrar
+            tag: v2.6.2
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.8.0
+  # Versions from https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/release-2.6/manifests/vanilla/vsphere-csi-driver.yaml
+  - constraint: "~ 1.22"
+    values:
+      csiController:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v2.6.3
+          csiAttacher:
+            repository: rancher/mirrored-sig-storage-csi-attacher
+            tag: v3.4.0
+          csiResizer:
+            repository: rancher/mirrored-sig-storage-csi-resizer
+            tag: v1.4.0
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.7.0
+          vsphereSyncer:
+            repository: rancher/mirrored-cloud-provider-vsphere-csi-release-syncer
+            tag: v2.6.3
+          csiProvisioner:
+            repository: rancher/mirrored-sig-storage-csi-provisioner
+            tag: v3.2.1
+      csiNode:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v2.6.3
+          nodeDriverRegistrar:
+            repository: rancher/mirrored-sig-storage-csi-node-driver-registrar
+            tag: v2.5.1
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.7.0
+  # Versions from https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/release-2.5/manifests/vanilla/vsphere-csi-driver.yaml
+  - constraint: "~ 1.21"
+    values:
+      csiController:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v2.5.4
+          csiAttacher:
+            repository: rancher/mirrored-sig-storage-csi-attacher
+            tag: v3.4.0
+          csiResizer:
+            repository: rancher/mirrored-sig-storage-csi-resizer
+            tag: v1.4.0
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.6.0
+          vsphereSyncer:
+            repository: rancher/mirrored-cloud-provider-vsphere-csi-release-syncer
+            tag: v2.5.4
+          csiProvisioner:
+            repository: rancher/mirrored-sig-storage-csi-provisioner
+            tag: v3.1.0
+      csiNode:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v2.5.4
+          nodeDriverRegistrar:
+            repository: rancher/mirrored-sig-storage-csi-node-driver-registrar
+            tag: v2.5.0
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.6.0
+  # Versions from https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/release-2.4/manifests/vanilla/vsphere-csi-driver.yaml
+  - constraint: "~ 1.20"
+    values:
+      csiController:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v2.4.3
+          csiAttacher:
+            repository: rancher/mirrored-sig-storage-csi-attacher
+            tag: v3.3.0
+          csiResizer:
+            repository: rancher/mirrored-sig-storage-csi-resizer
+            tag: v1.3.0
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.4.0
+          vsphereSyncer:
+            repository: rancher/mirrored-cloud-provider-vsphere-csi-release-syncer
+            tag: v2.4.3
+          csiProvisioner:
+            repository: rancher/mirrored-sig-storage-csi-provisioner
+            tag: v3.0.0
+      csiNode:
+        image:
+          repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
+          tag: v2.4.3
+          nodeDriverRegistrar:
+            repository: rancher/mirrored-sig-storage-csi-node-driver-registrar
+            tag: v2.3.0
+          livenessProbe:
+            repository: rancher/mirrored-sig-storage-livenessprobe
+            tag: v2.4.0
diff --git a/index.yaml b/index.yaml
index 1a25fa6789..ced243496d 100755
--- a/index.yaml
+++ b/index.yaml
@@ -18976,6 +18976,34 @@ entries:
     - assets/rancher-vsphere-cpi/rancher-vsphere-cpi-1.0.000.tgz
     version: 1.0.000
   rancher-vsphere-csi:
+  - annotations:
+      catalog.cattle.io/certified: rancher
+      catalog.cattle.io/display-name: vSphere CSI
+      catalog.cattle.io/kube-version: '>= 1.20.0-0 < 1.29.0-0'
+      catalog.cattle.io/namespace: kube-system
+      catalog.cattle.io/os: linux,windows
+      catalog.cattle.io/permits-os: linux,windows
+      catalog.cattle.io/rancher-version: '>= 2.9.0-0 < 2.10.0-0'
+      catalog.cattle.io/release-name: vsphere-csi
+    apiVersion: v1
+    appVersion: 3.1.2-rancher4
+    created: "2024-04-18T14:35:31.512175-04:00"
+    description: vSphere Cloud Storage Interface (CSI)
+    digest: 31c68a9ea15d111b51875b5b810216e83ed0648ae281225dd745e0d813c00e73
+    icon: https://charts.rancher.io/assets/logos/vsphere-csi.svg
+    keywords:
+    - infrastructure
+    maintainers:
+    - email: jiaqi.luo@suse.com
+      name: Jiaqi Luo
+    - email: brad.davidson@suse.com
+      name: Brad Davidson
+    name: rancher-vsphere-csi
+    sources:
+    - https://github.com/kubernetes-sigs/vsphere-csi-driver
+    urls:
+    - assets/rancher-vsphere-csi/rancher-vsphere-csi-104.0.0+up3.1.2-rancher4.tgz
+    version: 104.0.0+up3.1.2-rancher4
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/display-name: vSphere CSI