diff --git a/e2e/config.yaml.sample b/e2e/config.yaml.sample
index f8956a552..c79ac9ad1 100644
--- a/e2e/config.yaml.sample
+++ b/e2e/config.yaml.sample
@@ -16,7 +16,7 @@ pvcspecs:
     storageclassname: rook-ceph-block
     accessmodes: ReadWriteOnce
   - name: cephfs
-    storageclassname: rook-cephfs-test-fs1
+    storageclassname: rook-cephfs-fs1
     accessmodes: ReadWriteMany
 
 # Sample cluster configurations:
diff --git a/test/addons/rook-cephfs/provision-test/kustomization.yaml b/test/addons/rook-cephfs/provision-test/kustomization.yaml
index 9897bbe02..af3a67c3d 100644
--- a/test/addons/rook-cephfs/provision-test/kustomization.yaml
+++ b/test/addons/rook-cephfs/provision-test/kustomization.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ---
-namespace: drenv-addon-test
+namespace: rook-cephfs-test
 
 resources:
 - namespace.yaml
diff --git a/test/addons/rook-cephfs/provision-test/namespace.yaml b/test/addons/rook-cephfs/provision-test/namespace.yaml
index 6a75187c1..8adebbd7b 100644
--- a/test/addons/rook-cephfs/provision-test/namespace.yaml
+++ b/test/addons/rook-cephfs/provision-test/namespace.yaml
@@ -5,4 +5,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: drenv-addon-test
+  name: rook-cephfs-test
diff --git a/test/addons/rook-cephfs/provision-test/pvc.yaml b/test/addons/rook-cephfs/provision-test/pvc.yaml
index cdd8cde32..a6434fee1 100644
--- a/test/addons/rook-cephfs/provision-test/pvc.yaml
+++ b/test/addons/rook-cephfs/provision-test/pvc.yaml
@@ -8,8 +8,8 @@ metadata:
   name: cephfs-pvc
 spec:
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
       storage: 1Gi
-  storageClassName: rook-cephfs-test-fs1
+  storageClassName: rook-cephfs-fs1
diff --git a/test/addons/rook-cephfs/start b/test/addons/rook-cephfs/start
index c060c60dd..c03b3f968 100755
--- a/test/addons/rook-cephfs/start
+++ b/test/addons/rook-cephfs/start
@@ -10,7 +10,7 @@ import drenv
 from drenv import kubectl
 
 STORAGE_CLASS_NAME_PREFIX = "rook-cephfs-"
-FILE_SYSTEMS = ["test-fs1", "test-fs2"]
+FILE_SYSTEMS = ["fs1", "fs2"]
 
 
 def deploy(cluster):
diff --git a/test/addons/rook-cephfs/test b/test/addons/rook-cephfs/test
index f924f71fa..5253c854d 100755
--- a/test/addons/rook-cephfs/test
+++ b/test/addons/rook-cephfs/test
@@ -10,7 +10,7 @@ from drenv import kubectl
 
 PVC_NAME = "cephfs-pvc"
 SNAP_NAME = "cephfs-snap"
-NAMESPACE = "drenv-addon-test"
+NAMESPACE = "rook-cephfs-test"
 
 
 def test_provisioning(cluster):
diff --git a/test/addons/volsync/app/file/kustomization.yaml b/test/addons/volsync/app/file/kustomization.yaml
index ab4e32c7b..1dafba869 100644
--- a/test/addons/volsync/app/file/kustomization.yaml
+++ b/test/addons/volsync/app/file/kustomization.yaml
@@ -14,7 +14,7 @@ patches:
     patch: |-
       - op: replace
         path: /spec/storageClassName
-        value: rook-cephfs-test-fs1
+        value: rook-cephfs-fs1
       - op: replace
         path: /spec/accessModes
         value:
diff --git a/test/addons/volsync/rd/file/kustomization.yaml b/test/addons/volsync/rd/file/kustomization.yaml
index b95e1123b..6b522b6de 100644
--- a/test/addons/volsync/rd/file/kustomization.yaml
+++ b/test/addons/volsync/rd/file/kustomization.yaml
@@ -13,7 +13,7 @@ patches:
     patch: |-
       - op: replace
         path: /spec/storageClassName
-        value: rook-cephfs-test-fs1
+        value: rook-cephfs-fs1
       - op: replace
         path: /spec/accessModes
         value:
@@ -27,7 +27,7 @@ patches:
     patch: |-
       - op: replace
         path: /spec/rsyncTLS/storageClassName
-        value: rook-cephfs-test-fs1
+        value: rook-cephfs-fs1
       - op: replace
         path: /spec/rsyncTLS/volumeSnapshotClassName
         value: csi-cephfsplugin-snapclass