diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/csi/nutanix/manifests/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/csi/nutanix/manifests/helm-addon-installation.yaml
index 6dd0cd393..2dd400b50 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/csi/nutanix/manifests/helm-addon-installation.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/csi/nutanix/manifests/helm-addon-installation.yaml
@@ -9,6 +9,6 @@ metadata:
 data:
   values.yaml: |-
     # The Secret containing the credentials will be created by the handler.
-    createSecret: false
-    secretName: nutanix-csi-credentials
+    createPrismCentralSecret: false
+    pcSecretName: nutanix-csi-credentials
 {{- end -}}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/csi/nutanix/manifests/nutanix-storage-csi-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/csi/nutanix/manifests/nutanix-storage-csi-configmap.yaml
deleted file mode 100644
index 8353d3f9a..000000000
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/csi/nutanix/manifests/nutanix-storage-csi-configmap.yaml
+++ /dev/null
@@ -1,543 +0,0 @@
-# Copyright 2023 D2iQ, Inc. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-#=================================================================
-#                 DO NOT EDIT THIS FILE
-#  IT HAS BEEN GENERATED BY /hack/addons/update-nutanix-storage-csi.sh
-#=================================================================
-apiVersion: v1
-data:
-  nutanix-storage-csi.yaml: |
-    apiVersion: v1
-    kind: ServiceAccount
-    metadata:
-      name: nutanix-csi-controller
-      namespace: kube-system
-    ---
-    apiVersion: v1
-    kind: ServiceAccount
-    metadata:
-      name: nutanix-csi-node
-      namespace: kube-system
-    ---
-    apiVersion: rbac.authorization.k8s.io/v1
-    kind: ClusterRole
-    metadata:
-      name: nutanix-csi-controller-role
-      namespace: nutanix-system
-    rules:
-    - apiGroups:
-      - ""
-      resources:
-      - secrets
-      verbs:
-      - get
-      - list
-      - watch
-    - apiGroups:
-      - ""
-      resources:
-      - nodes
-      verbs:
-      - get
-    - apiGroups:
-      - ""
-      resources:
-      - persistentvolumes
-      verbs:
-      - get
-      - list
-      - watch
-      - create
-      - delete
-      - update
-      - patch
-    - apiGroups:
-      - ""
-      resources:
-      - persistentvolumeclaims
-      verbs:
-      - get
-      - list
-      - watch
-      - update
-    - apiGroups:
-      - ""
-      resources:
-      - persistentvolumeclaims/status
-      verbs:
-      - update
-      - patch
-    - apiGroups:
-      - storage.k8s.io
-      resources:
-      - storageclasses
-      verbs:
-      - get
-      - list
-      - watch
-    - apiGroups:
-      - ""
-      resources:
-      - events
-      verbs:
-      - list
-      - watch
-      - create
-      - update
-      - patch
-    - apiGroups:
-      - snapshot.storage.k8s.io
-      resources:
-      - volumesnapshotclasses
-      verbs:
-      - get
-      - list
-      - watch
-    - apiGroups:
-      - snapshot.storage.k8s.io
-      resources:
-      - volumesnapshots
-      verbs:
-      - get
-      - list
-      - watch
-      - update
-    - apiGroups:
-      - snapshot.storage.k8s.io
-      resources:
-      - volumesnapshots/status
-      verbs:
-      - update
-    - 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:
-      - storage.k8s.io
-      resources:
-      - csinodes
-      verbs:
-      - get
-      - list
-      - watch
-    - apiGroups:
-      - coordination.k8s.io
-      resources:
-      - leases
-      verbs:
-      - get
-      - create
-      - delete
-      - update
-      - patch
-    ---
-    apiVersion: rbac.authorization.k8s.io/v1
-    kind: ClusterRole
-    metadata:
-      name: nutanix-csi-node-role
-      namespace: nutanix-system
-    rules:
-    - apiGroups:
-      - ""
-      resources:
-      - secrets
-      verbs:
-      - get
-      - list
-    - apiGroups:
-      - ""
-      resources:
-      - nodes
-      verbs:
-      - get
-      - list
-      - update
-    - apiGroups:
-      - ""
-      resources:
-      - namespaces
-      verbs:
-      - get
-      - list
-    - apiGroups:
-      - ""
-      resources:
-      - persistentvolumes
-      verbs:
-      - get
-      - list
-      - watch
-      - update
-    - apiGroups:
-      - storage.k8s.io
-      resources:
-      - volumeattachments
-      verbs:
-      - get
-      - list
-      - watch
-      - update
-    ---
-    apiVersion: rbac.authorization.k8s.io/v1
-    kind: ClusterRoleBinding
-    metadata:
-      name: nutanix-csi-controller-binding
-      namespace: nutanix-system
-    roleRef:
-      apiGroup: rbac.authorization.k8s.io
-      kind: ClusterRole
-      name: nutanix-csi-controller-role
-    subjects:
-    - kind: ServiceAccount
-      name: nutanix-csi-controller
-      namespace: kube-system
-    ---
-    apiVersion: rbac.authorization.k8s.io/v1
-    kind: ClusterRoleBinding
-    metadata:
-      name: nutanix-csi-node-binding
-      namespace: nutanix-system
-    roleRef:
-      apiGroup: rbac.authorization.k8s.io
-      kind: ClusterRole
-      name: nutanix-csi-node-role
-    subjects:
-    - kind: ServiceAccount
-      name: nutanix-csi-node
-      namespace: kube-system
-    ---
-    apiVersion: v1
-    kind: Service
-    metadata:
-      labels:
-        app: nutanix-csi-metrics
-      name: nutanix-csi-metrics
-      namespace: kube-system
-    spec:
-      ports:
-      - name: provisioner
-        port: 9809
-        protocol: TCP
-        targetPort: 9809
-      - name: resizer
-        port: 9810
-        protocol: TCP
-        targetPort: 9810
-      selector:
-        app: nutanix-csi-controller
-      type: ClusterIP
-    ---
-    apiVersion: apps/v1
-    kind: Deployment
-    metadata:
-      name: nutanix-csi-controller
-      namespace: kube-system
-    spec:
-      replicas: 2
-      selector:
-        matchLabels:
-          app: nutanix-csi-controller
-      strategy:
-        rollingUpdate:
-          maxSurge: 0
-          maxUnavailable: 1
-        type: RollingUpdate
-      template:
-        metadata:
-          labels:
-            app: nutanix-csi-controller
-        spec:
-          affinity:
-            podAntiAffinity:
-              preferredDuringSchedulingIgnoredDuringExecution:
-              - podAffinityTerm:
-                  labelSelector:
-                    matchLabels:
-                      app: nutanix-csi-controller
-                  topologyKey: kubernetes.io/hostname
-                weight: 100
-          containers:
-          - args:
-            - --csi-address=$(ADDRESS)
-            - --timeout=60s
-            - --worker-threads=16
-            - --extra-create-metadata=true
-            - --default-fstype=ext4
-            - --http-endpoint=:9809
-            - --v=2
-            - --leader-election=true
-            env:
-            - name: ADDRESS
-              value: /var/lib/csi/sockets/pluginproxy/csi.sock
-            image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2
-            imagePullPolicy: IfNotPresent
-            name: csi-provisioner
-            resources:
-              requests:
-                cpu: 100m
-                memory: 200Mi
-            volumeMounts:
-            - mountPath: /var/lib/csi/sockets/pluginproxy/
-              name: socket-dir
-          - args:
-            - --v=2
-            - --csi-address=$(ADDRESS)
-            - --timeout=60s
-            - --leader-election=true
-            - --handle-volume-inuse-error=false
-            - --http-endpoint=:9810
-            env:
-            - name: ADDRESS
-              value: /var/lib/csi/sockets/pluginproxy/csi.sock
-            image: registry.k8s.io/sig-storage/csi-resizer:v1.9.2
-            imagePullPolicy: IfNotPresent
-            name: csi-resizer
-            resources:
-              requests:
-                cpu: 5m
-                memory: 30Mi
-            volumeMounts:
-            - mountPath: /var/lib/csi/sockets/pluginproxy/
-              name: socket-dir
-          - args:
-            - --csi-address=$(ADDRESS)
-            - --leader-election=true
-            - --logtostderr=true
-            - --timeout=300s
-            env:
-            - name: ADDRESS
-              value: /csi/csi.sock
-            image: registry.k8s.io/sig-storage/csi-snapshotter:v3.0.3
-            imagePullPolicy: IfNotPresent
-            name: csi-snapshotter
-            resources:
-              requests:
-                cpu: 5m
-                memory: 30Mi
-            volumeMounts:
-            - mountPath: /csi
-              name: socket-dir
-          - args:
-            - --endpoint=$(CSI_ENDPOINT)
-            - --nodeid=$(NODE_ID)
-            - --drivername=csi.nutanix.com
-            env:
-            - name: CSI_ENDPOINT
-              value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
-            - name: NODE_ID
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-            image: quay.io/karbon/ntnx-csi:v2.6.6
-            imagePullPolicy: IfNotPresent
-            livenessProbe:
-              failureThreshold: 3
-              httpGet:
-                path: /healthz
-                port: http-endpoint
-              initialDelaySeconds: 10
-              periodSeconds: 2
-              timeoutSeconds: 3
-            name: nutanix-csi-plugin
-            ports:
-            - containerPort: 9807
-              name: http-endpoint
-              protocol: TCP
-            resources:
-              requests:
-                cpu: 100m
-                memory: 200Mi
-            securityContext:
-              allowPrivilegeEscalation: true
-              privileged: true
-            volumeMounts:
-            - mountPath: /var/lib/csi/sockets/pluginproxy/
-              name: socket-dir
-            - mountPath: /host
-              name: root-dir
-          - args:
-            - --csi-address=/csi/csi.sock
-            - --http-endpoint=:9807
-            image: registry.k8s.io/sig-storage/livenessprobe:v2.11.0
-            imagePullPolicy: IfNotPresent
-            name: liveness-probe
-            resources:
-              requests:
-                cpu: 5m
-                memory: 20Mi
-            volumeMounts:
-            - mountPath: /csi
-              name: socket-dir
-          hostNetwork: true
-          priorityClassName: system-cluster-critical
-          serviceAccount: nutanix-csi-controller
-          volumes:
-          - emptyDir: {}
-            name: socket-dir
-          - hostPath:
-              path: /
-              type: Directory
-            name: root-dir
-    ---
-    apiVersion: apps/v1
-    kind: DaemonSet
-    metadata:
-      name: nutanix-csi-node
-      namespace: kube-system
-    spec:
-      selector:
-        matchLabels:
-          app: nutanix-csi-node
-      template:
-        metadata:
-          labels:
-            app: nutanix-csi-node
-        spec:
-          containers:
-          - args:
-            - --v=2
-            - --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.nutanix.com/csi.sock
-            - name: KUBE_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-            image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1
-            imagePullPolicy: IfNotPresent
-            name: driver-registrar
-            resources:
-              requests:
-                cpu: 100m
-                memory: 20Mi
-            volumeMounts:
-            - mountPath: /csi/
-              name: plugin-dir
-            - mountPath: /registration
-              name: registration-dir
-          - args:
-            - --endpoint=$(CSI_ENDPOINT)
-            - --nodeid=$(NODE_ID)
-            - --drivername=csi.nutanix.com
-            env:
-            - name: CSI_ENDPOINT
-              value: unix:///csi/csi.sock
-            - name: NODE_ID
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-            - name: NODE_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.hostIP
-            image: quay.io/karbon/ntnx-csi:v2.6.6
-            imagePullPolicy: IfNotPresent
-            livenessProbe:
-              failureThreshold: 3
-              httpGet:
-                path: /healthz
-                port: http-endpoint
-              initialDelaySeconds: 10
-              periodSeconds: 2
-              timeoutSeconds: 3
-            name: nutanix-csi-node
-            ports:
-            - containerPort: 9808
-              name: http-endpoint
-              protocol: TCP
-            resources:
-              requests:
-                cpu: 100m
-                memory: 200Mi
-            securityContext:
-              allowPrivilegeEscalation: true
-              privileged: true
-            volumeMounts:
-            - mountPath: /csi
-              name: plugin-dir
-            - mountPath: /var/lib/kubelet
-              mountPropagation: Bidirectional
-              name: pods-mount-dir
-            - mountPath: /dev
-              name: device-dir
-            - mountPath: /etc/iscsi
-              name: iscsi-dir
-            - mountPath: /host
-              mountPropagation: Bidirectional
-              name: root-dir
-          - args:
-            - --csi-address=/csi/csi.sock
-            - --http-endpoint=:9808
-            image: registry.k8s.io/sig-storage/livenessprobe:v2.11.0
-            imagePullPolicy: IfNotPresent
-            name: liveness-probe
-            resources:
-              requests:
-                cpu: 5m
-                memory: 20Mi
-            volumeMounts:
-            - mountPath: /csi
-              name: plugin-dir
-          hostNetwork: true
-          priorityClassName: system-cluster-critical
-          serviceAccount: nutanix-csi-node
-          volumes:
-          - hostPath:
-              path: /var/lib/kubelet/plugins_registry/
-              type: Directory
-            name: registration-dir
-          - hostPath:
-              path: /var/lib/kubelet/plugins/csi.nutanix.com/
-              type: DirectoryOrCreate
-            name: plugin-dir
-          - hostPath:
-              path: /var/lib/kubelet
-              type: Directory
-            name: pods-mount-dir
-          - hostPath:
-              path: /dev
-            name: device-dir
-          - hostPath:
-              path: /etc/iscsi
-              type: Directory
-            name: iscsi-dir
-          - hostPath:
-              path: /
-              type: Directory
-            name: root-dir
-      updateStrategy:
-        rollingUpdate:
-          maxUnavailable: 10%
-        type: RollingUpdate
-    ---
-    apiVersion: storage.k8s.io/v1
-    kind: CSIDriver
-    metadata:
-      name: csi.nutanix.com
-    spec:
-      attachRequired: false
-      podInfoOnMount: true
-kind: ConfigMap
-metadata:
-  creationTimestamp: null
-  name: nutanix-storage-csi
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml
index 4dc513cd4..84a4292e6 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml
@@ -29,8 +29,8 @@ data:
     RepositoryURL: https://nutanix.github.io/helm/
   nutanix-storage-csi: |
     ChartName: nutanix-csi-storage
-    ChartVersion: v2.6.6
-    RepositoryURL: https://nutanix.github.io/helm/
+    ChartVersion: v3.0.0-beta.1912
+    RepositoryURL: https://nutanix.github.io/helm-releases/
   tigera-operator: |
     ChartName: tigera-operator
     ChartVersion: v3.26.4
diff --git a/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml b/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml
index d4d079fa4..e16c167b1 100644
--- a/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml
+++ b/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml
@@ -14,9 +14,9 @@ kind: Secret
 metadata:
   labels:
     cluster.x-k8s.io/provider: nutanix
-  name: ${CLUSTER_NAME}-pe-creds-for-csi
+  name: ${CLUSTER_NAME}-pc-creds-for-csi
 stringData:
-  key: ${NUTANIX_PRISM_ELEMENT_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
+  key: ${NUTANIX_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
 ---
 apiVersion: v1
 kind: Secret
@@ -77,7 +77,7 @@ spec:
               storageClassConfigName: nutanix-volume
             providers:
             - credentials:
-                name: ${CLUSTER_NAME}-pe-creds-for-csi
+                name: ${CLUSTER_NAME}-pc-creds-for-csi
               name: nutanix
               storageClassConfig:
               - name: nutanix-volume
diff --git a/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml b/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml
index df6a394af..fe6c69dbc 100644
--- a/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml
+++ b/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml
@@ -14,9 +14,9 @@ kind: Secret
 metadata:
   labels:
     cluster.x-k8s.io/provider: nutanix
-  name: ${CLUSTER_NAME}-pe-creds-for-csi
+  name: ${CLUSTER_NAME}-pc-creds-for-csi
 stringData:
-  key: ${NUTANIX_PRISM_ELEMENT_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
+  key: ${NUTANIX_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
 ---
 apiVersion: v1
 kind: Secret
@@ -77,7 +77,7 @@ spec:
               storageClassConfigName: nutanix-volume
             providers:
             - credentials:
-                name: ${CLUSTER_NAME}-pe-creds-for-csi
+                name: ${CLUSTER_NAME}-pc-creds-for-csi
               name: nutanix
               storageClassConfig:
               - name: nutanix-volume
diff --git a/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml b/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml
index 3786a5537..1cc60ccf6 100644
--- a/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml
+++ b/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml
@@ -14,9 +14,9 @@ kind: Secret
 metadata:
   labels:
     cluster.x-k8s.io/provider: nutanix
-  name: ${CLUSTER_NAME}-pe-creds-for-csi
+  name: ${CLUSTER_NAME}-pc-creds-for-csi
 stringData:
-  key: ${NUTANIX_PRISM_ELEMENT_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
+  key: ${NUTANIX_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
 ---
 apiVersion: v1
 kind: Secret
@@ -77,7 +77,7 @@ spec:
               storageClassConfigName: nutanix-volume
             providers:
             - credentials:
-                name: ${CLUSTER_NAME}-pe-creds-for-csi
+                name: ${CLUSTER_NAME}-pc-creds-for-csi
               name: nutanix
               storageClassConfig:
               - name: nutanix-volume
diff --git a/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml b/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml
index 335a1760f..d111adffa 100644
--- a/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml
+++ b/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml
@@ -14,9 +14,9 @@ kind: Secret
 metadata:
   labels:
     cluster.x-k8s.io/provider: nutanix
-  name: ${CLUSTER_NAME}-pe-creds-for-csi
+  name: ${CLUSTER_NAME}-pc-creds-for-csi
 stringData:
-  key: ${NUTANIX_PRISM_ELEMENT_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
+  key: ${NUTANIX_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}
 ---
 apiVersion: v1
 kind: Secret
@@ -77,7 +77,7 @@ spec:
               storageClassConfigName: nutanix-volume
             providers:
             - credentials:
-                name: ${CLUSTER_NAME}-pe-creds-for-csi
+                name: ${CLUSTER_NAME}-pc-creds-for-csi
               name: nutanix
               storageClassConfig:
               - name: nutanix-volume
diff --git a/hack/addons/kustomize/nutanix-storage-csi/helm-values.yaml b/hack/addons/kustomize/nutanix-storage-csi/helm-values.yaml
deleted file mode 100644
index eebd55d74..000000000
--- a/hack/addons/kustomize/nutanix-storage-csi/helm-values.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2023 D2iQ, Inc. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-createSecret: false
diff --git a/hack/addons/kustomize/nutanix-storage-csi/kustomization.yaml.tmpl b/hack/addons/kustomize/nutanix-storage-csi/kustomization.yaml.tmpl
index 2e67558f4..2ecd5aeff 100644
--- a/hack/addons/kustomize/nutanix-storage-csi/kustomization.yaml.tmpl
+++ b/hack/addons/kustomize/nutanix-storage-csi/kustomization.yaml.tmpl
@@ -11,7 +11,7 @@ namespace: kube-system
 
 helmCharts:
 - name: nutanix-csi-storage
-  repo: https://nutanix.github.io/helm/
+  repo: https://nutanix.github.io/helm-releases/
   releaseName: nutanix-csi-storage
   version: ${NUTANIX_STORAGE_CSI_CHART_VERSION}
   valuesFile: helm-values.yaml
diff --git a/hack/addons/update-nutanix-csi.sh b/hack/addons/update-nutanix-csi.sh
deleted file mode 100755
index c6a488d7e..000000000
--- a/hack/addons/update-nutanix-csi.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly SCRIPT_DIR
-
-# shellcheck source=hack/common.sh
-source "${SCRIPT_DIR}/../common.sh"
-
-if [ -z "${NUTANIX_STORAGE_CSI_CHART_VERSION:-}" ]; then
-  echo "Missing environment variable: NUTANIX_STORAGE_CSI_CHART_VERSION"
-  exit 1
-fi
-
-ASSETS_DIR="$(mktemp -d -p "${TMPDIR:-/tmp}")"
-readonly ASSETS_DIR
-trap_add "rm -rf ${ASSETS_DIR}" EXIT
-
-readonly FILE_NAME="nutanix-storage-csi.yaml"
-
-readonly KUSTOMIZE_BASE_DIR="${SCRIPT_DIR}/kustomize/nutanix-storage-csi"
-mkdir -p "${ASSETS_DIR}/nutanix-storage-csi"
-envsubst -no-unset <"${KUSTOMIZE_BASE_DIR}/kustomization.yaml.tmpl" >"${ASSETS_DIR}/nutanix-storage-csi/kustomization.yaml"
-cp -r "${KUSTOMIZE_BASE_DIR}"/*.yaml "${ASSETS_DIR}/nutanix-storage-csi/"
-
-kustomize build --enable-helm "${ASSETS_DIR}/nutanix-storage-csi/" >"${ASSETS_DIR}/${FILE_NAME}"
-
-kubectl create configmap nutanix-storage-csi --dry-run=client --output yaml \
-  --from-file "${ASSETS_DIR}/${FILE_NAME}" \
-  >"${ASSETS_DIR}/nutanix-storage-csi-configmap.yaml"
-
-# add warning not to edit file directly
-cat <<EOF >"${GIT_REPO_ROOT}/charts/cluster-api-runtime-extensions-nutanix/templates/csi/nutanix/manifests/nutanix-storage-csi-configmap.yaml"
-$(cat "${GIT_REPO_ROOT}/hack/license-header.yaml.txt")
-
-#=================================================================
-#                 DO NOT EDIT THIS FILE
-#  IT HAS BEEN GENERATED BY /hack/addons/update-nutanix-storage-csi.sh
-#=================================================================
-$(cat "${ASSETS_DIR}/nutanix-storage-csi-configmap.yaml")
-EOF
diff --git a/hack/examples/additional-resources/nutanix/csi-secret.yaml b/hack/examples/additional-resources/nutanix/csi-secret.yaml
index 0011bfbe1..fae3afa98 100644
--- a/hack/examples/additional-resources/nutanix/csi-secret.yaml
+++ b/hack/examples/additional-resources/nutanix/csi-secret.yaml
@@ -5,6 +5,6 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ${CLUSTER_NAME}-pe-creds-for-csi
+  name: ${CLUSTER_NAME}-pc-creds-for-csi
 stringData:
-  key: "${NUTANIX_PRISM_ELEMENT_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}"
+  key: "${NUTANIX_ENDPOINT}:${NUTANIX_PORT}:${NUTANIX_USER}:${NUTANIX_PASSWORD}"
diff --git a/hack/examples/patches/nutanix/csi.yaml b/hack/examples/patches/nutanix/csi.yaml
index fffac03ef..f80bb5525 100644
--- a/hack/examples/patches/nutanix/csi.yaml
+++ b/hack/examples/patches/nutanix/csi.yaml
@@ -15,4 +15,4 @@
             storageContainer: ${NUTANIX_STORAGE_CONTAINER_NAME}
         strategy: HelmAddon
         credentials:
-          name: ${CLUSTER_NAME}-pe-creds-for-csi
+          name: ${CLUSTER_NAME}-pc-creds-for-csi
diff --git a/make/addons.mk b/make/addons.mk
index 36ae1b33e..1fa50d21d 100644
--- a/make/addons.mk
+++ b/make/addons.mk
@@ -7,7 +7,7 @@ export NODE_FEATURE_DISCOVERY_VERSION := 0.15.2
 export CLUSTER_AUTOSCALER_VERSION := 9.35.0
 export AWS_CSI_SNAPSHOT_CONTROLLER_VERSION := v6.3.3
 export AWS_EBS_CSI_CHART_VERSION := v2.28.1
-export NUTANIX_STORAGE_CSI_CHART_VERSION := v2.6.6
+export NUTANIX_STORAGE_CSI_CHART_VERSION := v3.0.0-beta.1912
 export NUTANIX_SNAPSHOT_CSI_CHART_VERSION := v6.3.2
 # a map of AWS CCM versions
 export AWS_CCM_VERSION_127 := v1.27.1
@@ -18,7 +18,7 @@ export AWS_CCM_CHART_VERSION_128 := 0.0.8
 export NUTANIX_CCM_CHART_VERSION := 0.3.3
 
 .PHONY: addons.sync
-addons.sync: $(addprefix update-addon.,calico cilium nfd cluster-autoscaler aws-ebs-csi aws-ccm.127 nutanix-storage-csi aws-ccm.128)
+addons.sync: $(addprefix update-addon.,calico cilium nfd cluster-autoscaler aws-ebs-csi aws-ccm.127 aws-ccm.128)
 
 .PHONY: update-addon.calico
 update-addon.calico: ; $(info $(M) updating calico manifests)
@@ -44,10 +44,6 @@ update-addon.aws-ebs-csi: ; $(info $(M) updating aws ebs csi manifests)
 update-addon.aws-ccm.%: ; $(info $(M) updating aws ccm $* manifests)
 	./hack/addons/update-aws-ccm.sh $(AWS_CCM_VERSION_$*) $(AWS_CCM_CHART_VERSION_$*)
 
-.PHONY: update-addon.nutanix-storage-csi
-update-addon.nutanix-storage-csi: ; $(info $(M) updating nutanix-storage csi manifests)
-	./hack/addons/update-nutanix-csi.sh
-
 .PHONY: generate-helm-configmap
 generate-helm-configmap:
 	go run hack/tools/helm-cm/main.go -kustomize-directory="./hack/addons/kustomize" -output-file="./charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml"