diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md b/eks-anywhere-vsphere/Addons/Core/storage-driver/README.md
similarity index 97%
rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md
rename to eks-anywhere-vsphere/Addons/Core/storage-driver/README.md
index 33388666..9f447eaa 100644
--- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/README.md
+++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/README.md
@@ -4,7 +4,7 @@ In order to sucessfully install the VMware CSI Driver, the following items must
 1. Creation of the `ClusterSecretStore` Kubernetes resource detailed in the eks-anywhere-addons/README.md file 
 
 2. Creation of config secrets in AWS Secrets Manager that External secrets will reference in the 
-vsphere-csi-externalsecrets.yaml file.
+vsphere-external-secrets.yaml file.
 
 # Creation of the Config Secrets 
 
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml
deleted file mode 100644
index 62f97ebf..00000000
--- a/eks-anywhere-vsphere/Addons/Core/storage-driver/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - storage-driver.yaml
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/storage-driver.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/storage-driver.yaml
deleted file mode 100644
index df0cd243..00000000
--- a/eks-anywhere-vsphere/Addons/Core/storage-driver/storage-driver.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: vmware-csi
-  namespace: flux-system
-spec:
-  path: "./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi"
-  sourceRef:
-    kind: GitRepository
-    name: addons
-    namespace: flux-system
-  interval: 5m0s
-  prune: true
----
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml
new file mode 100644
index 00000000..bab7dbdb
--- /dev/null
+++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi-kustomization.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: vmware-csi-kustomization
+  namespace: flux-system
+  labels:
+    app: vmware-csi-driver
+spec:
+  interval: 1m0s
+  path: ./eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: addons
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/kustomization.yaml
deleted file mode 100644
index c9bbb152..00000000
--- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/kustomization.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - namespace.yaml
-  - vsphere-cloud-controller-manager.yaml
-  - vsphere-csi-externalsecrets.yaml
-  - vsphere-csi-driver.yaml
-  - vmware-sc.yaml
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml
index 22880a6e..d15fd705 100644
--- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml
+++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-cloud-controller-manager.yaml
@@ -145,6 +145,7 @@ metadata:
   labels:
     component: cloud-controller-manager
     tier: control-plane
+    kustomize.toolkit.fluxcd.io/force: enabled
   namespace: kube-system
 spec:
   selector:
@@ -204,4 +205,4 @@ spec:
                     operator: Exists
               - matchExpressions:
                   - key: node-role.kubernetes.io/master
-                    operator: Exists
+                    operator: Exists
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml
index 44df9661..8459c7e5 100644
--- a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml
+++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-driver.yaml
@@ -411,7 +411,7 @@ spec:
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
-      volumes:
+      volumes:  
         - name: vsphere-config-volume
           secret:
             secretName: vsphere-config-secret
diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-externalsecrets.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-external-secrets.yaml
similarity index 100%
rename from eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-csi-externalsecrets.yaml
rename to eks-anywhere-vsphere/Addons/Core/storage-driver/vmware-csi/vsphere-external-secrets.yaml
diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/kustomization.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/kustomization.yaml
deleted file mode 100644
index fbded3c2..00000000
--- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - snapshot-tester.yaml
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml
deleted file mode 100644
index 41514329..00000000
--- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: openebs-snapshot-restored-claim
-  namespace: default
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: openebs-csi-cstor-sparse
-  resources:
-    requests:
-      storage: 4Gi
-  dataSource:
-    name: openebs-volume-snapshot
-    kind: VolumeSnapshot
-    apiGroup: snapshot.storage.k8s.io
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/kustomization.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/kustomization.yaml
deleted file mode 100644
index e42f8ea9..00000000
--- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - claim.yaml
-  - snapshot-restore-job.yaml
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml
deleted file mode 100644
index bb7d3458..00000000
--- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: app-restore
-  namespace: default
-spec:
-  backoffLimit: 3
-  template:
-    spec:
-      containers:
-      - name: app
-        image: centos
-        imagePullPolicy: IfNotPresent
-        command: ["/bin/sh"]
-        args: ["-c", "while true; do echo $(date -u) >> /data/out.txt; sleep 5; done"]
-        volumeMounts:
-        - name: persistent-storage
-          mountPath: /data
-      restartPolicy: OnFailure
-      volumes:
-      - name: persistent-storage
-        persistentVolumeClaim:
-          claimName: openebs-snapshot-restored-claim
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester-kustomization.yaml
similarity index 51%
rename from eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml
rename to eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester-kustomization.yaml
index afb02eed..a67ba6cc 100644
--- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester.yaml
+++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-tester-kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: test-app
@@ -9,10 +9,10 @@ spec:
     kind: GitRepository
     name: addons
     namespace: flux-system
-  interval: 5m0s
+  interval: 1m0s
   prune: true
 ---
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: snapshot
@@ -25,22 +25,5 @@ spec:
     kind: GitRepository
     name: addons
     namespace: flux-system
-  interval: 5m0s
+  interval: 1m0s
   prune: true
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: snapshot-restore
-  namespace: flux-system
-spec:
-  dependsOn:
-    - name: snapshot
-  path: "./eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot-restore"
-  sourceRef:
-    kind: GitRepository
-    name: addons
-    namespace: flux-system
-  interval: 5m0s
-  prune: true
----
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/kustomization.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/kustomization.yaml
deleted file mode 100644
index 645b614d..00000000
--- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - snapshot.yaml
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot-class.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot-class.yaml
new file mode 100644
index 00000000..bcc707b3
--- /dev/null
+++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot-class.yaml
@@ -0,0 +1,6 @@
+apiVersion: snapshot.storage.k8s.io/v1
+kind: VolumeSnapshotClass
+metadata:
+  name: vmware-csi-snapshotclass
+driver: csi.vsphere.vmware.com
+deletionPolicy: Delete
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml
index f5e2803e..d047efd7 100644
--- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml
+++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/snapshot/snapshot.yaml
@@ -1,9 +1,9 @@
 apiVersion: snapshot.storage.k8s.io/v1
 kind: VolumeSnapshot
 metadata:
-  name: openebs-volume-snapshot
+  name: vmware-csi-volume-snapshot
   namespace: default
 spec:
-  volumeSnapshotClassName: csi-cstor-snapshotclass
+  volumeSnapshotClassName: vmware-csi-snapshotclass
   source:
-    persistentVolumeClaimName: openebs-claim
\ No newline at end of file
+    persistentVolumeClaimName: vmware-csi-claim
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/claim.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/claim.yaml
index 35519d72..ce6ee679 100644
--- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/claim.yaml
+++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/claim.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: openebs-claim
+  name: vmware-csi-claim
   namespace: default
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: openebs-csi-cstor-sparse
+  storageClassName: vmware-sc
   resources:
     requests:
       storage: 4Gi
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/kustomization.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/kustomization.yaml
deleted file mode 100644
index 8a2b46d1..00000000
--- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - claim.yaml
-  - test-app-job.yaml
\ No newline at end of file
diff --git a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/test-app-job.yaml b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/test-app-job.yaml
index 12276cab..dff2c324 100644
--- a/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/test-app-job.yaml
+++ b/eks-anywhere-vsphere/Testers/Core/snapshot-tester/test-app/test-app-job.yaml
@@ -21,4 +21,4 @@ spec:
       volumes:
       - name: persistent-storage
         persistentVolumeClaim:
-          claimName: openebs-claim
\ No newline at end of file
+          claimName: vmware-csi-claim
\ No newline at end of file