diff --git a/magnum_cluster_api/resources.py b/magnum_cluster_api/resources.py
index 71dc87f3..9061be2e 100644
--- a/magnum_cluster_api/resources.py
+++ b/magnum_cluster_api/resources.py
@@ -338,7 +338,7 @@ def get_object(self) -> dict:
                                 "allowVolumeExpansion": True,
                                 "kind": objects.StorageClass.kind,
                                 "metadata": {
-                                    "name": "share-%s"
+                                    "name": "share-nfs-%s"
                                     % utils.convert_to_rfc1123(st.name),
                                 },
                                 "provisioner": "nfs.manila.csi.openstack.org",
diff --git a/src/addons/cinder_csi.rs b/src/addons/cinder_csi.rs
index 2c120098..37d791f1 100644
--- a/src/addons/cinder_csi.rs
+++ b/src/addons/cinder_csi.rs
@@ -200,8 +200,8 @@ impl ClusterAddon for Addon {
         Self { cluster }
     }
 
-    fn enabled(&self) -> bool {
-        self.cluster.labels.cinder_csi_enabled
+    fn enabled(&self) ->  bool {
+        self.cluster.labels.cinder_csi_enabled.parse::<bool>().expect("failed to fetch cluster label")
     }
 
     fn secret_name(&self) -> Result<String, ClusterError> {
diff --git a/src/addons/manila_csi.rs b/src/addons/manila_csi.rs
index a7728c61..14efe93c 100644
--- a/src/addons/manila_csi.rs
+++ b/src/addons/manila_csi.rs
@@ -128,8 +128,8 @@ impl ClusterAddon for Addon {
         Self { cluster }
     }
 
-    fn enabled(&self) -> bool {
-        self.cluster.labels.manila_csi_enabled
+    fn enabled(&self) ->  bool {
+        self.cluster.labels.manila_csi_enabled.parse::<bool>().expect("failed to fetch cluster label")
     }
 
     fn secret_name(&self) -> Result<String, ClusterError> {
diff --git a/src/magnum.rs b/src/magnum.rs
index 6ebe8f4f..053d83d8 100644
--- a/src/magnum.rs
+++ b/src/magnum.rs
@@ -37,9 +37,9 @@ pub struct ClusterLabels {
     pub cilium_ipv4pool: String,
 
     /// Enable the use of the Cinder CSI driver for the cluster.
-    #[builder(default = true)]
-    #[pyo3(default = true)]
-    pub cinder_csi_enabled: bool,
+    #[builder(default = "true".to_owned())]
+    #[pyo3(default = "true".to_owned())]
+    pub cinder_csi_enabled: String,
 
     /// The tag of the Cinder CSI container image to use for the cluster.
     #[builder(default="v1.32.0".to_owned())]
@@ -47,9 +47,9 @@ pub struct ClusterLabels {
     pub cinder_csi_plugin_tag: String,
 
     /// Enable the use of the Manila CSI driver for the cluster.
-    #[builder(default = true)]
-    #[pyo3(default = true)]
-    pub manila_csi_enabled: bool,
+    #[builder(default = "true".to_owned())]
+    #[pyo3(default = "true".to_owned())]
+    pub manila_csi_enabled: String,
 
     /// The tag of the Manila CSI container image to use for the cluster.
     #[builder(default="v1.32.0".to_owned())]