diff --git a/roles/kubernetes-apps/persistent_volumes/cinder-csi/templates/cinder-csi-storage-class.yml.j2 b/roles/kubernetes-apps/persistent_volumes/cinder-csi/templates/cinder-csi-storage-class.yml.j2
index 5f1f625da..8a66443ee 100644
--- a/roles/kubernetes-apps/persistent_volumes/cinder-csi/templates/cinder-csi-storage-class.yml.j2
+++ b/roles/kubernetes-apps/persistent_volumes/cinder-csi/templates/cinder-csi-storage-class.yml.j2
@@ -5,8 +5,9 @@ apiVersion: storage.k8s.io/v1
 metadata:
   name: "{{ class.name }}"
   annotations:
-    storageclass.kubernetes.io/is-default-class: "{{ class.is_default | default(false) }}"
+    storageclass.kubernetes.io/is-default-class: "{{ class.is_default | default(false) | ternary("true","false") }}"
 provisioner: cinder.csi.openstack.org
+volumeBindingMode: WaitForFirstConsumer
 parameters:
 {% for key, value in (class.parameters | default({})).items() %}
   "{{ key }}": "{{ value }}"