diff --git a/doc/source/specs/tenant-ceph.rst b/doc/source/specs/tenant-ceph.rst
index 9e95740212..083e9df0b2 100644
--- a/doc/source/specs/tenant-ceph.rst
+++ b/doc/source/specs/tenant-ceph.rst
@@ -122,14 +122,17 @@ Execute script.
 
 Script to update and execute: ``030-ceph.sh``
 
-Update script with following overrides.
+Update script with following overrides. Note: The original RBD provisioner
+is now deprecated. The CSI RBD provisioner is selected here. If you prefer
+the original non-CSI RBD provisioner, then set rbd_provisioner to true instead.
 
 .. code-block:: yaml
 
   deployment:
     storage_secrets: true
     ceph: true
-    rbd_provisioner: true
+    rbd_provisioner: false
+    csi_rbd_provisioner: true
     cephfs_provisioner: false
     client_secrets: false
   endpoints:
@@ -529,6 +532,7 @@ Update script's override section with following:
     storage_secrets: true
     ceph: true
     rbd_provisioner: false
+    csi_rbd_provisioner: false
     cephfs_provisioner: false
     client_secrets: false
   labels:
@@ -635,6 +639,7 @@ Update script as following:
     storage_secrets: false
     ceph: false
     rbd_provisioner: false
+    csi_rbd_provisioner: false
     cephfs_provisioner: false
     client_secrets: true
   bootstrap:
@@ -698,6 +703,7 @@ Update script with following overrides:
     storage_secrets: false
     ceph: true
     rbd_provisioner: false
+    csi_rbd_provisioner: false
     cephfs_provisioner: false
     client_secrets: false
   bootstrap:
diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml
index 6c86256a46..453db1d6b3 100644
--- a/tools/deployment/armada/manifests/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -99,6 +99,7 @@ data:
     deployment:
       ceph: false
       rbd_provisioner: false
+      csi_rbd_provisioner: false
       cephfs_provisioner: false
       client_secrets: true
     storageclass:
@@ -415,6 +416,7 @@ data:
     deployment:
       ceph: True
       rbd_provisioner: False
+      csi_rbd_provisioner: False
       cephfs_provisioner: False
       client_secrets: False
   source:
diff --git a/tools/deployment/component/ceph/ceph-ns-activate.sh b/tools/deployment/component/ceph/ceph-ns-activate.sh
index d588615d28..09640b612b 100755
--- a/tools/deployment/component/ceph/ceph-ns-activate.sh
+++ b/tools/deployment/component/ceph/ceph-ns-activate.sh
@@ -32,6 +32,7 @@ network:
 deployment:
   ceph: false
   rbd_provisioner: false
+  csi_rbd_provisioner: false
   cephfs_provisioner: false
   client_secrets: true
 bootstrap:
diff --git a/tools/deployment/component/ceph/ceph.sh b/tools/deployment/component/ceph/ceph.sh
index 5e92480b75..ea97da6029 100755
--- a/tools/deployment/component/ceph/ceph.sh
+++ b/tools/deployment/component/ceph/ceph.sh
@@ -53,8 +53,13 @@ deployment:
   storage_secrets: true
   ceph: true
   rbd_provisioner: true
+  csi_rbd_provisioner: true
   cephfs_provisioner: true
   client_secrets: false
+manifests:
+  deployment_rbd_provisioner: true
+  deployment_csi_rbd_provisioner: true
+  deployment_cephfs_provisioner: true
 bootstrap:
   enabled: true
 conf:
diff --git a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
index 2b4e6f88de..402ae007bb 100755
--- a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
+++ b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
@@ -34,6 +34,7 @@ deployment:
   ceph: false
   rbd_provisioner: false
   cephfs_provisioner: false
+  csi_rbd_provisioner: false
   client_secrets: true
 bootstrap:
   enabled: false
diff --git a/tools/deployment/multinode/030-ceph.sh b/tools/deployment/multinode/030-ceph.sh
index c6abd46e87..b3fa8db2d0 100755
--- a/tools/deployment/multinode/030-ceph.sh
+++ b/tools/deployment/multinode/030-ceph.sh
@@ -39,6 +39,7 @@ deployment:
   storage_secrets: true
   ceph: true
   rbd_provisioner: true
+  csi_rbd_provisioner: true
   cephfs_provisioner: false
   client_secrets: false
 bootstrap:
diff --git a/tools/deployment/multinode/040-ceph-ns-activate.sh b/tools/deployment/multinode/040-ceph-ns-activate.sh
index c9923afb07..ad47e9df9f 100755
--- a/tools/deployment/multinode/040-ceph-ns-activate.sh
+++ b/tools/deployment/multinode/040-ceph-ns-activate.sh
@@ -27,6 +27,7 @@ network:
 deployment:
   ceph: false
   rbd_provisioner: false
+  csi_rbd_provisioner: false
   cephfs_provisioner: false
   client_secrets: true
 bootstrap: