diff --git a/charts/kafka-cluster/templates/kafka-nodepool-broker.yaml b/charts/kafka-cluster/templates/kafka-nodepool-broker.yaml
index c6aa690..6a81e37 100644
--- a/charts/kafka-cluster/templates/kafka-nodepool-broker.yaml
+++ b/charts/kafka-cluster/templates/kafka-nodepool-broker.yaml
@@ -16,7 +16,7 @@ spec:
       - id: 0
         type: persistent-claim
         size: {{ .Values.broker.storage.size }}
-        class: {{ .Values.broker.storage.class }}
+        class: {{ .Values.broker.storage.class | quote }}
         kraftMetadata: shared
   {{- if .Values.broker.resources }}
   resources:
diff --git a/charts/kafka-cluster/templates/kafka-nodepool-controller.yaml b/charts/kafka-cluster/templates/kafka-nodepool-controller.yaml
index af09ac7..87b47d3 100644
--- a/charts/kafka-cluster/templates/kafka-nodepool-controller.yaml
+++ b/charts/kafka-cluster/templates/kafka-nodepool-controller.yaml
@@ -17,7 +17,7 @@ spec:
         type: persistent-claim
         size: {{ .Values.controller.storage.size }}
         kraftMetadata: shared
-        class: {{ .Values.controller.storage.class }}
+        class: {{ .Values.controller.storage.class | quote }}
   {{- if .Values.controller.resources }}
   resources:
     {{- if .Values.controller.resources.requests }}