diff --git a/deploy/charts/observability-app/Chart.yaml b/deploy/charts/observability-app/Chart.yaml
index cf72c29..1c89122 100644
--- a/deploy/charts/observability-app/Chart.yaml
+++ b/deploy/charts/observability-app/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: dataops-observability-app
 type: application
 appVersion: "2.x.x"
-version: "2.2.2"
+version: "2.2.3"
 
 description: DataOps Observability
 home: https://datakitchen.io
diff --git a/deploy/charts/observability-app/templates/observability-ui.yaml b/deploy/charts/observability-app/templates/observability-ui.yaml
index c379885..4684ac0 100644
--- a/deploy/charts/observability-app/templates/observability-ui.yaml
+++ b/deploy/charts/observability-app/templates/observability-ui.yaml
@@ -66,7 +66,7 @@ spec:
             - name: OBSERVABILITY_CSP_EXTRA
               value: {{ tpl .Values.observability_ui.csp_extra . | quote }}
             {{- end }}
-          {{- if or .Values.observability_ui.environmentJson .Values.observability_ui.manifestJson }}
+          {{- if or .Values.observability_ui.environmentJson .Values.observability_ui.manifestJson .Values.extraVolumeMounts }}
           volumeMounts:
             {{- if .Values.observability_ui.environmentJson }}
             - mountPath: /observability_ui/shell/environments/environment.json
@@ -80,7 +80,14 @@ spec:
               readOnly: true
               subPath: module-federation.manifest.json
             {{- end }}
+            {{- with .Values.extraVolumeMounts }}
+            {{ toYaml . | nindent 12 }}
+            {{- end }}
           {{- end }}
+      {{- with .Values.extraVolumes }}
+      volumes:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.observability_ui.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/scheduler/agent_check.py b/scheduler/agent_check.py
index e257d6e..5ba0b5c 100644
--- a/scheduler/agent_check.py
+++ b/scheduler/agent_check.py
@@ -90,5 +90,4 @@ def _send_agent_status_change_event(self, agent: Agent, new_status: AgentStatus)
             latest_event_timestamp=agent.latest_event_timestamp,
         )
 
-        with self.event_producer as producer:
-            producer.produce(self.kafka_topic, event)
+        self.event_producer.produce(self.kafka_topic, event)