diff --git a/xos-tools/kafkacat/Chart.yaml b/xos-tools/kafkacat/Chart.yaml
new file mode 100644
index 0000000..dadfad4
--- /dev/null
+++ b/xos-tools/kafkacat/Chart.yaml
@@ -0,0 +1,18 @@
+---
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: kafkacat
+description: A Helm chart for kafkacat
+version: 1.0.0-dev
diff --git a/xos-tools/kafkacat/templates/NOTES.txt b/xos-tools/kafkacat/templates/NOTES.txt
new file mode 100644
index 0000000..5b580a1
--- /dev/null
+++ b/xos-tools/kafkacat/templates/NOTES.txt
@@ -0,0 +1,11 @@
+Thank you for installing {{ .Chart.Name }}.
+
+Your release is named {{ .Release.Name }}.
+
+You can use this container to listen to event on Kafka.
+To do that, exec in the pod and run:
+
+kafkacat -C -b <kafka-service> -t <kafka-topic>
+
+
+
diff --git a/xos-tools/kafkacat/templates/deployment.yaml b/xos-tools/kafkacat/templates/deployment.yaml
new file mode 100644
index 0000000..5a16db5
--- /dev/null
+++ b/xos-tools/kafkacat/templates/deployment.yaml
@@ -0,0 +1,42 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: kafkacat
+  labels:
+    app: kafkacat
+    chart: kafkacat
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: kafkacat
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: kafkacat
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: kafkacat
+          image: {{ tpl .Values.kafkacatImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          command: ["/bin/bash", "-c", "sleep 86400"]
diff --git a/xos-tools/kafkacat/values.yaml b/xos-tools/kafkacat/values.yaml
new file mode 100644
index 0000000..ae6d055
--- /dev/null
+++ b/xos-tools/kafkacat/values.yaml
@@ -0,0 +1,29 @@
+---
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Default values for xossh
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+pull_docker_registry:
+
+nameOverride: ""
+fullnameOverride: ""
+
+imagePullPolicy: Always
+
+kafkacatImage: "confluentinc/cp-kafkacat:4.0.2"
diff --git a/xos-tools/xossh/Chart.yaml b/xos-tools/xossh/Chart.yaml
index fe2df9d..22858d3 100644
--- a/xos-tools/xossh/Chart.yaml
+++ b/xos-tools/xossh/Chart.yaml
@@ -15,4 +15,4 @@
 
 name: xossh
 description: A Helm chart for xossh, the XOS command line shell
-version: 2.0.0
+version: 2.1.0-dev
diff --git a/xos-tools/xossh/values.yaml b/xos-tools/xossh/values.yaml
index ff07162..2ae231d 100644
--- a/xos-tools/xossh/values.yaml
+++ b/xos-tools/xossh/values.yaml
@@ -26,7 +26,7 @@
 
 imagePullPolicy: Always
 
-xosshImage: "xosproject/xos-client:{{ .Chart.Version }}"
+xosshImage: "xosproject/xos-client:master"
 
 resources: {}