diff --git a/class/defaults.yml b/class/defaults.yml
index 08338e48..65a21a6b 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -263,7 +263,8 @@ parameters:
         enableGrpcMetrics: true
         enableLiveness: true
         cephcsi:
-          image: ${rook_ceph:images:cephcsi:registry}/${rook_ceph:images:cephcsi:image}:${rook_ceph:images:cephcsi:tag}
+          repository: ${rook_ceph:images:cephcsi:registry}/${rook_ceph:images:cephcsi:image}
+          tag: ${rook_ceph:images:cephcsi:tag}
       pspEnable: false
 
     toolbox:
diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc
index 87fef245..3d6ad07d 100644
--- a/docs/modules/ROOT/pages/references/parameters.adoc
+++ b/docs/modules/ROOT/pages/references/parameters.adoc
@@ -490,7 +490,7 @@ The Helm values to use when rendering the rook-ceph operator Helm chart.
 
 A few Helm values are configured based on other component parameters by default:
 
-* The data in parameter `images` is used to set the `image.repository`, `image.tag`, and `csi.cephcsi.image` Helm values
+* The data in parameter `images` is used to set the `image.repository`, `image.tag`, `csi.cephcsi.repository`, and `csi.cephcsi.tag` Helm values
 * The value of `node_selector` is used to set Helm value `nodeSelector`
 * The value of `tolerations` is used to set Helm value `tolerations`
 * The component ensures that `hostpathRequiresPrivileged` is enabled on OpenShift 4 regardless of the contents of the Helm value.