diff --git a/charts/ctrlplane/Chart.yaml b/charts/ctrlplane/Chart.yaml
index d81f778..cad7ab8 100644
--- a/charts/ctrlplane/Chart.yaml
+++ b/charts/ctrlplane/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: ctrlplane
 description: Ctrlplane Helm chart for Kubernetes
 type: application
-version: 0.9.3
+version: 0.10.0
 appVersion: "1.0.0"
 
 maintainers:
diff --git a/charts/ctrlplane/charts/workspace-engine/templates/statefulset.yaml b/charts/ctrlplane/charts/workspace-engine/templates/statefulset.yaml
index acecd77..6b3b8b6 100644
--- a/charts/ctrlplane/charts/workspace-engine/templates/statefulset.yaml
+++ b/charts/ctrlplane/charts/workspace-engine/templates/statefulset.yaml
@@ -44,7 +44,11 @@ spec:
               protocol: TCP
           env:
             - name: KAFKA_BROKERS
-              value: {{ .Values.global.kafkaBrokers | quote }}
+              value: {{ .Values.global.kafka.brokers | quote }}
+            - name: KAFKA_GROUP_ID
+              value: {{ .Values.global.kafka.groupId | quote }}
+            - name: KAFKA_TOPIC
+              value: {{ .Values.global.kafka.topic | quote }}
 
             - name: POD_NAME
               valueFrom:
diff --git a/charts/ctrlplane/templates/NOTES.txt b/charts/ctrlplane/templates/NOTES.txt
index 2c525a2..2b484c3 100644
--- a/charts/ctrlplane/templates/NOTES.txt
+++ b/charts/ctrlplane/templates/NOTES.txt
@@ -48,11 +48,13 @@
 {{- else if ne .Values.global.integrations.github.bot.clientSecret "" }}
    ⚠ GitHub bot configured directly in values
 {{- end }}
+{{- if .Values.global.integrations.azure }}
 {{- if include "ctrlplane.isValueFrom" .Values.global.integrations.azure.appClientSecret }}
    ✓ Azure app configured via secret reference
 {{- else if ne .Values.global.integrations.azure.appClientSecret "" }}
    ⚠ Azure app configured directly in values
 {{- end }}
+{{- end }}
 
 3. Using valueFrom pattern for secrets:
    
diff --git a/charts/ctrlplane/values.yaml b/charts/ctrlplane/values.yaml
index 8b0a65e..e812b67 100644
--- a/charts/ctrlplane/values.yaml
+++ b/charts/ctrlplane/values.yaml
@@ -59,7 +59,10 @@ global:
     port: "5432"
     database: "ctrlplane"
 
-  kafkaBrokers: localhost:9092
+  kafka:
+    brokers: localhost:9092
+    groupId: workspace-engine
+    topic: workspace-events
 
   integrations:
     github: