diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml
index e6509676c6..ebb6f1ab47 100644
--- a/tools/deployment/armada/manifests/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -101,6 +101,9 @@ data:
       rbd_provisioner: false
       cephfs_provisioner: false
       client_secrets: true
+    storageclass:
+      cephfs:
+        provision_storage_class: False
     bootstrap:
       enabled: false
   source:
diff --git a/tools/deployment/multinode/030-ceph.sh b/tools/deployment/multinode/030-ceph.sh
index 24bb17202d..cbf09c10fc 100755
--- a/tools/deployment/multinode/030-ceph.sh
+++ b/tools/deployment/multinode/030-ceph.sh
@@ -41,7 +41,7 @@ deployment:
   storage_secrets: true
   ceph: true
   rbd_provisioner: true
-  cephfs_provisioner: true
+  cephfs_provisioner: false
   client_secrets: false
 bootstrap:
   enabled: true
@@ -63,7 +63,12 @@ conf:
         journal:
           type: directory
           location: /var/lib/openstack-helm/ceph/osd/journal-one
-
+storageclass:
+  cephfs:
+    provision_storage_class: false
+manifests:
+  deployment_cephfs_provisioner: false
+  job_cephfs_client_key: false
 EOF
 
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
diff --git a/tools/deployment/multinode/040-ceph-ns-activate.sh b/tools/deployment/multinode/040-ceph-ns-activate.sh
index d19cca7809..ad98b400bf 100755
--- a/tools/deployment/multinode/040-ceph-ns-activate.sh
+++ b/tools/deployment/multinode/040-ceph-ns-activate.sh
@@ -33,6 +33,9 @@ deployment:
   client_secrets: true
 bootstrap:
   enabled: false
+storageclass:
+  cephfs:
+    provision_storage_class: false
 EOF
 
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}