diff --git a/eks-anywhere-baremetal/Testers/Core/snapshot-tester/kustomization.yaml b/eks-anywhere-baremetal/Testers/Core/snapshot-tester/kustomization.yaml
deleted file mode 100644
index fbded3c2..00000000
--- a/eks-anywhere-baremetal/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-baremetal/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml b/eks-anywhere-baremetal/Testers/Core/snapshot-tester/snapshot-restore/claim.yaml
deleted file mode 100644
index 41514329..00000000
--- a/eks-anywhere-baremetal/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-baremetal/Testers/Core/snapshot-tester/snapshot-restore/kustomization.yaml b/eks-anywhere-baremetal/Testers/Core/snapshot-tester/snapshot-restore/kustomization.yaml
deleted file mode 100644
index e42f8ea9..00000000
--- a/eks-anywhere-baremetal/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-baremetal/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml b/eks-anywhere-baremetal/Testers/Core/snapshot-tester/snapshot-restore/snapshot-restore-job.yaml
deleted file mode 100644
index bb7d3458..00000000
--- a/eks-anywhere-baremetal/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-baremetal/Testers/Core/snapshot-tester/snapshot-tester.yaml b/eks-anywhere-baremetal/Testers/Core/snapshot-tester/snapshot-tester.yaml
deleted file mode 100644
index 0663c221..00000000
--- a/eks-anywhere-baremetal/Testers/Core/snapshot-tester/snapshot-tester.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: test-app
-  namespace: flux-system
-spec:
-  path: "./eks-anywhere-baremetal/Testers/Core/snapshot-tester/test-app"
-  sourceRef:
-    kind: GitRepository
-    name: addons
-    namespace: flux-system
-  interval: 5m0s
-  prune: true
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: snapshot
-  namespace: flux-system
-spec:
-  dependsOn:
-    - name: test-app
-  path: "./eks-anywhere-baremetal/Testers/Core/snapshot-tester/snapshot"
-  sourceRef:
-    kind: GitRepository
-    name: addons
-    namespace: flux-system
-  interval: 5m0s
-  prune: true
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: snapshot-restore
-  namespace: flux-system
-spec:
-  dependsOn:
-    - name: snapshot
-  path: "./eks-anywhere-baremetal/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-baremetal/Testers/Core/snapshot-tester/snapshot/kustomization.yaml b/eks-anywhere-baremetal/Testers/Core/snapshot-tester/snapshot/kustomization.yaml
deleted file mode 100644
index 645b614d..00000000
--- a/eks-anywhere-baremetal/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-baremetal/Testers/Core/snapshot-tester/snapshot/snapshot.yaml b/eks-anywhere-baremetal/Testers/Core/snapshot-tester/snapshot/snapshot.yaml
deleted file mode 100644
index f5e2803e..00000000
--- a/eks-anywhere-baremetal/Testers/Core/snapshot-tester/snapshot/snapshot.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: snapshot.storage.k8s.io/v1
-kind: VolumeSnapshot
-metadata:
-  name: openebs-volume-snapshot
-  namespace: default
-spec:
-  volumeSnapshotClassName: csi-cstor-snapshotclass
-  source:
-    persistentVolumeClaimName: openebs-claim
\ No newline at end of file
diff --git a/eks-anywhere-baremetal/Testers/Core/snapshot-tester/test-app/kustomization.yaml b/eks-anywhere-baremetal/Testers/Core/snapshot-tester/test-app/kustomization.yaml
deleted file mode 100644
index 8a2b46d1..00000000
--- a/eks-anywhere-baremetal/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-baremetal/Testers/Core/storage-tester/storage-tester.yaml b/eks-anywhere-baremetal/Testers/Core/storage-tester/storage-tester.yaml
new file mode 100644
index 00000000..d6974eb1
--- /dev/null
+++ b/eks-anywhere-baremetal/Testers/Core/storage-tester/storage-tester.yaml
@@ -0,0 +1,14 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: test-app
+  namespace: flux-system
+spec:
+  path: "./eks-anywhere-baremetal/Testers/Core/storage-tester/test-app"
+  sourceRef:
+    kind: GitRepository
+    name: testers
+    namespace: flux-system
+  interval: 5m0s
+  prune: true
+---
\ No newline at end of file
diff --git a/eks-anywhere-baremetal/Testers/Core/snapshot-tester/test-app/claim.yaml b/eks-anywhere-baremetal/Testers/Core/storage-tester/test-app/claim.yaml
similarity index 80%
rename from eks-anywhere-baremetal/Testers/Core/snapshot-tester/test-app/claim.yaml
rename to eks-anywhere-baremetal/Testers/Core/storage-tester/test-app/claim.yaml
index 35519d72..70749cc2 100644
--- a/eks-anywhere-baremetal/Testers/Core/snapshot-tester/test-app/claim.yaml
+++ b/eks-anywhere-baremetal/Testers/Core/storage-tester/test-app/claim.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: openebs-csi-cstor-sparse
   resources:
     requests:
       storage: 4Gi
\ No newline at end of file
diff --git a/eks-anywhere-baremetal/Testers/Core/snapshot-tester/test-app/test-app-job.yaml b/eks-anywhere-baremetal/Testers/Core/storage-tester/test-app/test-app-job.yaml
similarity index 100%
rename from eks-anywhere-baremetal/Testers/Core/snapshot-tester/test-app/test-app-job.yaml
rename to eks-anywhere-baremetal/Testers/Core/storage-tester/test-app/test-app-job.yaml