diff --git a/kafka/values.yaml b/kafka/values.yaml
index 7d6feeb..a5e0d05 100644
--- a/kafka/values.yaml
+++ b/kafka/values.yaml
@@ -895,7 +895,7 @@ controller:
     ## If undefined (the default) or set to null, no storageClassName spec is
     ## set, choosing the default provisioner.
     ##
-    storageClass: ""
+    storageClass: "client3"
     ## @param controller.persistence.accessModes Persistent Volume Access Modes
     ##
     accessModes:
@@ -935,7 +935,7 @@ controller:
     ## If undefined (the default) or set to null, no storageClassName spec is
     ## set, choosing the default provisioner.
     ##
-    storageClass: ""
+    storageClass: "client3"
     ## @param controller.logPersistence.accessModes Persistent Volume Access Modes
     ##
     accessModes:
@@ -1356,7 +1356,7 @@ broker:
     ## If undefined (the default) or set to null, no storageClassName spec is
     ## set, choosing the default provisioner.
     ##
-    storageClass: ""
+    storageClass: "client3"
     ## @param broker.persistence.accessModes Persistent Volume Access Modes
     ##
     accessModes:
@@ -1396,7 +1396,7 @@ broker:
     ## If undefined (the default) or set to null, no storageClassName spec is
     ## set, choosing the default provisioner.
     ##
-    storageClass: ""
+    storageClass: "client3"
     ## @param broker.logPersistence.accessModes Persistent Volume Access Modes
     ##
     accessModes:
@@ -2393,7 +2393,8 @@ provisioning:
       max.message.bytes: 128000
       flush.messages: 10
 
-  nodeSelector: {}
+  nodeSelector:
+    tenant: client3
   ## @param provisioning.tolerations Tolerations for pod assignment
   ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
   ##
@@ -2697,7 +2698,7 @@ zookeeper:
   ##
   persistence:
     enabled: true
-    storageClass: ""
+    storageClass: "client3"
     accessModes:
       - ReadWriteOnce
     size: 8Gi