diff --git a/samples/storage_csm_powerflex_v2110.yaml b/samples/storage_csm_powerflex_v2110.yaml
index febaaab1..7c81d92d 100644
--- a/samples/storage_csm_powerflex_v2110.yaml
+++ b/samples/storage_csm_powerflex_v2110.yaml
@@ -47,8 +47,8 @@ spec:
       # 'k8s' represents a string prepended to each volume created by the CSI driver
       - name: provisioner
         image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
-        # Default volume-name-prefix: k8s
-        args: ["--volume-name-prefix=k8s"]
+        # Default volume-name-prefix: csivol
+        args: ["--volume-name-prefix=csivol"]
       - name: attacher
         image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
       - name: registrar
diff --git a/samples/storage_csm_powerflex_v2120.yaml b/samples/storage_csm_powerflex_v2120.yaml
index e48af8cf..aa49bda5 100644
--- a/samples/storage_csm_powerflex_v2120.yaml
+++ b/samples/storage_csm_powerflex_v2120.yaml
@@ -54,8 +54,8 @@ spec:
       # 'k8s' represents a string prepended to each volume created by the CSI driver
       - name: provisioner
         image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
-        # Default volume-name-prefix: k8s
-        args: ["--volume-name-prefix=k8s"]
+        # Default volume-name-prefix: csivol
+        args: ["--volume-name-prefix=csivol"]
       - name: attacher
         image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
       - name: registrar
diff --git a/samples/storage_csm_powerflex_v2130.yaml b/samples/storage_csm_powerflex_v2130.yaml
index 6ba9b4bd..562ed2b8 100644
--- a/samples/storage_csm_powerflex_v2130.yaml
+++ b/samples/storage_csm_powerflex_v2130.yaml
@@ -51,7 +51,7 @@ spec:
       # 'k8s' represents a string prepended to each volume created by the CSI driver
       - name: provisioner
         image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
-        args: ["--volume-name-prefix=k8s"]
+        args: ["--volume-name-prefix=csivol"]
       - name: attacher
         image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
       - name: registrar
diff --git a/samples/storage_csm_powermax_v2110.yaml b/samples/storage_csm_powermax_v2110.yaml
index e9a55a2f..a3ef0414 100644
--- a/samples/storage_csm_powermax_v2110.yaml
+++ b/samples/storage_csm_powermax_v2110.yaml
@@ -233,8 +233,8 @@ spec:
       # 'pmax' represents a string prepended to each volume created by the CSI driver
       - name: provisioner
         image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
-        # Default volume-name-prefix: pmax
-        args: ["--volume-name-prefix=pmax"]
+        # Default volume-name-prefix: csivol
+        args: ["--volume-name-prefix=csivol"]
       - name: attacher
         image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
       - name: registrar
diff --git a/samples/storage_csm_powermax_v2120.yaml b/samples/storage_csm_powermax_v2120.yaml
index e4812748..d5ace926 100644
--- a/samples/storage_csm_powermax_v2120.yaml
+++ b/samples/storage_csm_powermax_v2120.yaml
@@ -202,8 +202,8 @@ spec:
       # 'pmax' represents a string prepended to each volume created by the CSI driver
       - name: provisioner
         image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
-        # Default volume-name-prefix: pmax
-        args: ["--volume-name-prefix=pmax"]
+        # Default volume-name-prefix: csivol
+        args: ["--volume-name-prefix=csivol"]
       - name: attacher
         image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
       - name: registrar
diff --git a/samples/storage_csm_powermax_v2130.yaml b/samples/storage_csm_powermax_v2130.yaml
index df05e63c..4e32a098 100644
--- a/samples/storage_csm_powermax_v2130.yaml
+++ b/samples/storage_csm_powermax_v2130.yaml
@@ -202,7 +202,7 @@ spec:
       # 'pmax' represents a string prepended to each volume created by the CSI driver
       - name: provisioner
         image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
-        args: ["--volume-name-prefix=pmax"]
+        args: ["--volume-name-prefix=csivol"]
       - name: attacher
         image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
       - name: registrar
diff --git a/samples/storage_csm_powerscale_v2110.yaml b/samples/storage_csm_powerscale_v2110.yaml
index a9b27b9a..3966bd03 100644
--- a/samples/storage_csm_powerscale_v2110.yaml
+++ b/samples/storage_csm_powerscale_v2110.yaml
@@ -236,8 +236,8 @@ spec:
     sideCars:
       - name: provisioner
         image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
-        # Default volume-name-prefix: k8s
-        args: ["--volume-name-prefix=csipscale"]
+        # Default volume-name-prefix: csivol
+        args: ["--volume-name-prefix=csivol"]
       - name: attacher
         image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
       - name: registrar
diff --git a/samples/storage_csm_powerscale_v2120.yaml b/samples/storage_csm_powerscale_v2120.yaml
index 755890f9..c785a101 100644
--- a/samples/storage_csm_powerscale_v2120.yaml
+++ b/samples/storage_csm_powerscale_v2120.yaml
@@ -236,8 +236,8 @@ spec:
     sideCars:
       - name: provisioner
         image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
-        # Default volume-name-prefix: k8s
-        args: ["--volume-name-prefix=csipscale"]
+        # Default volume-name-prefix: csivol
+        args: ["--volume-name-prefix=csivol"]
       - name: attacher
         image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
       - name: registrar
diff --git a/samples/storage_csm_powerscale_v2130.yaml b/samples/storage_csm_powerscale_v2130.yaml
index f870fc03..4502dbfb 100644
--- a/samples/storage_csm_powerscale_v2130.yaml
+++ b/samples/storage_csm_powerscale_v2130.yaml
@@ -236,7 +236,7 @@ spec:
     sideCars:
       - name: provisioner
         image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
-        args: ["--volume-name-prefix=csipscale"]
+        args: ["--volume-name-prefix=csivol"]
       - name: attacher
         image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
       - name: registrar