diff --git a/e2e/config.yaml b/e2e/config.yaml
index d078d7734..f44ed19c3 100644
--- a/e2e/config.yaml
+++ b/e2e/config.yaml
@@ -3,7 +3,9 @@ channelname: "ramen-gitops"
 channelnamespace: "ramen-samples"
 giturl: "https://github.com/RamenDR/ocm-ramen-samples.git"
 pvcspecs:
-  - storageclassname: rook-cephfs
-    accessmodes: ReadWriteMany
-  - storageclassname: rook-ceph-block
+  - name: rbd
+    storageclassname: rook-ceph-block
     accessmodes: ReadWriteOnce
+  - name: cephfs
+    storageclassname: rook-cephfs
+    accessmodes: ReadWriteMany
diff --git a/e2e/exhaustive_suite_test.go b/e2e/exhaustive_suite_test.go
index 64029f425..38583b638 100644
--- a/e2e/exhaustive_suite_test.go
+++ b/e2e/exhaustive_suite_test.go
@@ -5,7 +5,6 @@ package e2e_test
 
 import (
 	"fmt"
-	"strings"
 	"testing"
 
 	"github.com/ramendr/ramen/e2e/deployers"
@@ -33,30 +32,15 @@ var (
 	Deployers      = []types.Deployer{subscription, appset, discoveredApps}
 )
 
-func generateSuffix(storageClassName string) string {
-	suffix := storageClassName
-
-	if strings.ToLower(storageClassName) == "rook-ceph-block" {
-		suffix = "rbd"
-	}
-
-	if strings.ToLower(storageClassName) == "rook-cephfs" {
-		suffix = "cephfs"
-	}
-
-	return suffix
-}
-
 func generateWorkloads([]types.Workload) {
 	pvcSpecs := util.GetPVCSpecs()
 	for _, pvcSpec := range pvcSpecs {
 		// add storageclass name to deployment name
-		suffix := generateSuffix(pvcSpec.StorageClassName)
 		deployment := &workloads.Deployment{
 			Path:     GITPATH,
 			Revision: GITREVISION,
 			AppName:  APPNAME,
-			Name:     fmt.Sprintf("Deploy-%s", suffix),
+			Name:     fmt.Sprintf("Deploy-%s", pvcSpec.Name),
 			PVCSpec:  pvcSpec,
 		}
 		Workloads = append(Workloads, deployment)
diff --git a/e2e/util/config.go b/e2e/util/config.go
index b1219832b..230a1e51f 100644
--- a/e2e/util/config.go
+++ b/e2e/util/config.go
@@ -11,6 +11,7 @@ import (
 )
 
 type PVCSpec struct {
+	Name             string
 	StorageClassName string
 	AccessModes      string
 }