diff --git a/modules/dynamic-provisioning-available-plugins.adoc b/modules/dynamic-provisioning-available-plugins.adoc
index f7192daf9c41..e5d43e5ae55c 100644
--- a/modules/dynamic-provisioning-available-plugins.adoc
+++ b/modules/dynamic-provisioning-available-plugins.adoc
@@ -20,7 +20,7 @@ configured provider's API to create new storage resources:
 
 ifndef::openshift-dedicated,openshift-rosa[]
 |{rh-openstack-first} Cinder
-|`kubernetes.io/cinder`
+|`cinder.csi.openstack.org`
 |
 
 |{rh-openstack} Manila Container Storage Interface (CSI)
@@ -29,25 +29,25 @@ ifndef::openshift-dedicated,openshift-rosa[]
 endif::openshift-dedicated,openshift-rosa[]
 
 |Amazon Elastic Block Store (Amazon EBS)
-|`kubernetes.io/aws-ebs`
+|`ebs.csi.aws.com`
 |For dynamic provisioning when using multiple clusters in different zones,
 tag each node with `Key=kubernetes.io/cluster/<cluster_name>,Value=<cluster_id>`
 where `<cluster_name>` and `<cluster_id>` are unique per cluster.
 
 ifndef::openshift-dedicated,openshift-rosa[]
 |Azure Disk
-|`kubernetes.io/azure-disk`
+|`disk.csi.azure.com`
 |
 
 |Azure File
-|`kubernetes.io/azure-file`
+|`file.csi.azure.com`
 |The `persistent-volume-binder` service account requires permissions to create
 and get secrets to store the Azure storage account and keys.
 endif::openshift-dedicated,openshift-rosa[]
 
 ifndef::openshift-rosa[]
 |GCE Persistent Disk (gcePD)
-|`kubernetes.io/gce-pd`
+|`pd.csi.storage.gke.io`
 |In multi-zone configurations, it is advisable to run one {product-title}
 cluster per GCE project to avoid PVs from being created in zones where
 no node in the current cluster exists.
@@ -55,6 +55,10 @@ no node in the current cluster exists.
 |{ibm-power-server-name} Block
 |`powervs.csi.ibm.com`
 |After installation, the {ibm-power-server-name} Block CSI Driver Operator and {ibm-power-server-name} Block CSI Driver automatically create the required storage classes for dynamic provisioning.
+
+|IBM VPC Block
+|`vpc.block.csi.ibm.io`
+|
 endif::openshift-rosa[]
 
 //|GlusterFS
@@ -71,7 +75,7 @@ endif::openshift-rosa[]
 
 ifndef::openshift-dedicated,openshift-rosa[]
 |link:https://www.vmware.com/support/vsphere.html[VMware vSphere]
-|`kubernetes.io/vsphere-volume`
+|`csi.vsphere.vmware.com`
 |
 endif::openshift-dedicated,openshift-rosa[]
 
diff --git a/modules/dynamic-provisioning-aws-definition.adoc b/modules/dynamic-provisioning-aws-definition.adoc
index 025245513c64..36b84301d3bb 100644
--- a/modules/dynamic-provisioning-aws-definition.adoc
+++ b/modules/dynamic-provisioning-aws-definition.adoc
@@ -13,7 +13,7 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: <storage-class-name> <1>
-provisioner: kubernetes.io/aws-ebs
+provisioner: ebs.csi.aws.com
 parameters:
   type: io1 <2>
   iopsPerGB: "10" <3>
diff --git a/modules/dynamic-provisioning-azure-disk-definition.adoc b/modules/dynamic-provisioning-azure-disk-definition.adoc
index 6b1fa8306bc4..42ef1e11989a 100644
--- a/modules/dynamic-provisioning-azure-disk-definition.adoc
+++ b/modules/dynamic-provisioning-azure-disk-definition.adoc
@@ -13,7 +13,7 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: <storage-class-name> <1>
-provisioner: kubernetes.io/azure-disk
+provisioner: disk.csi.azure.com
 volumeBindingMode: WaitForFirstConsumer <2>
 allowVolumeExpansion: true
 parameters:
diff --git a/modules/dynamic-provisioning-azure-file-considerations.adoc b/modules/dynamic-provisioning-azure-file-considerations.adoc
index 5a89d1d66e99..3a75c5673064 100644
--- a/modules/dynamic-provisioning-azure-file-considerations.adoc
+++ b/modules/dynamic-provisioning-azure-file-considerations.adoc
@@ -29,7 +29,7 @@ mountOptions:
   - uid=1500 <1>
   - gid=1500 <2>
   - mfsymlinks <3>
-provisioner: kubernetes.io/azure-file
+provisioner: file.csi.azure.com
 parameters:
   location: eastus
   skuName: Standard_LRS
diff --git a/modules/dynamic-provisioning-azure-file-definition.adoc b/modules/dynamic-provisioning-azure-file-definition.adoc
index d32accec4b37..4286056de973 100644
--- a/modules/dynamic-provisioning-azure-file-definition.adoc
+++ b/modules/dynamic-provisioning-azure-file-definition.adoc
@@ -45,7 +45,7 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: <azure-file> <1>
-provisioner: kubernetes.io/azure-file
+provisioner: file.csi.azure.com
 parameters:
   location: eastus <2>
   skuName: Standard_LRS <3>
diff --git a/modules/dynamic-provisioning-change-default-class.adoc b/modules/dynamic-provisioning-change-default-class.adoc
index 4692a88acf0e..b734cc5e6a56 100644
--- a/modules/dynamic-provisioning-change-default-class.adoc
+++ b/modules/dynamic-provisioning-change-default-class.adoc
@@ -31,8 +31,8 @@ $ oc get storageclass
 [source,terminal]
 ----
 NAME                 TYPE
-gp3 (default)        kubernetes.io/aws-ebs <1>
-standard             kubernetes.io/aws-ebs
+gp3 (default)        ebs.csi.aws.com <1>
+standard             ebs.csi.aws.com
 ----
 <1> `(default)` indicates the default storage class.
 
@@ -74,6 +74,6 @@ $ oc get storageclass
 [source,terminal]
 ----
 NAME                 TYPE
-gp3                  kubernetes.io/aws-ebs
-standard (default)   kubernetes.io/aws-ebs
+gp3                  ebs.csi.aws.com
+standard (default)   ebs.csi.aws.com
 ----
diff --git a/modules/dynamic-provisioning-cinder-definition.adoc b/modules/dynamic-provisioning-cinder-definition.adoc
index 1a8e8698bc19..aa0197b7dc81 100644
--- a/modules/dynamic-provisioning-cinder-definition.adoc
+++ b/modules/dynamic-provisioning-cinder-definition.adoc
@@ -13,7 +13,7 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: <storage-class-name> <1>
-provisioner: kubernetes.io/cinder
+provisioner: cinder.csi.openstack.org
 parameters:
   type: fast  <2>
   availability: nova <3>
diff --git a/modules/dynamic-provisioning-gce-definition.adoc b/modules/dynamic-provisioning-gce-definition.adoc
index 1dbe8c21a7cd..3c0a42ba0bb5 100644
--- a/modules/dynamic-provisioning-gce-definition.adoc
+++ b/modules/dynamic-provisioning-gce-definition.adoc
@@ -13,7 +13,7 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: <storage-class-name> <1>
-provisioner: kubernetes.io/gce-pd
+provisioner: pd.csi.storage.gke.io
 parameters:
   type: pd-standard <2>
   replication-type: none
diff --git a/modules/dynamic-provisioning-storage-class-definition.adoc b/modules/dynamic-provisioning-storage-class-definition.adoc
index 5a4508d16e69..2051d831c575 100644
--- a/modules/dynamic-provisioning-storage-class-definition.adoc
+++ b/modules/dynamic-provisioning-storage-class-definition.adoc
@@ -22,7 +22,7 @@ metadata:
   annotations: <4>
     storageclass.kubernetes.io/is-default-class: 'true'
     ...
-provisioner: kubernetes.io/aws-ebs <5>
+provisioner: ebs.csi.aws.com <5>
 parameters: <6>
   type: gp3
 ...
@@ -32,5 +32,4 @@ parameters: <6>
 <3> (required) The name of the storage class.
 <4> (optional) Annotations for the storage class.
 <5> (required) The type of provisioner associated with this storage class.
-<6> (optional) The parameters required for the specific provisioner, this
-will change from plugin to plug-iin.
+<6> (optional) The parameters required for the specific provisioner. This is different for each plugin.