diff --git a/examples/xossh-candidate.yaml b/examples/xossh-candidate.yaml
index a3446b1..af038da 100644
--- a/examples/xossh-candidate.yaml
+++ b/examples/xossh-candidate.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Use locally created xos-client container with xos-tools/xossh chart
+# Use locally created xos-client container with tools/xossh chart
 image:
   tag: 'candidate'
   pullPolicy: 'IfNotPresent'
diff --git a/xos-tools/kafkacat/Chart.yaml b/tools/kafkacat/Chart.yaml
similarity index 97%
rename from xos-tools/kafkacat/Chart.yaml
rename to tools/kafkacat/Chart.yaml
index 39e9fb5..a3b3a02 100644
--- a/xos-tools/kafkacat/Chart.yaml
+++ b/tools/kafkacat/Chart.yaml
@@ -17,7 +17,7 @@
 description: A Helm chart for kafkacat
 icon: https://kafka.apache.org/images/logo.png
 
-version: 1.0.0
+version: 1.0.1
 
 # version of confluentinc/cp-kafkacat container
 appVersion: 4.1.2
diff --git a/xos-tools/kafkacat/templates/NOTES.txt b/tools/kafkacat/templates/NOTES.txt
similarity index 100%
rename from xos-tools/kafkacat/templates/NOTES.txt
rename to tools/kafkacat/templates/NOTES.txt
diff --git a/xos-tools/kafkacat/templates/deployment.yaml b/tools/kafkacat/templates/deployment.yaml
similarity index 100%
rename from xos-tools/kafkacat/templates/deployment.yaml
rename to tools/kafkacat/templates/deployment.yaml
diff --git a/xos-tools/kafkacat/values.yaml b/tools/kafkacat/values.yaml
similarity index 100%
rename from xos-tools/kafkacat/values.yaml
rename to tools/kafkacat/values.yaml
diff --git a/xos-tools/kafkacat/Chart.yaml b/tools/voltha-kafka-dump/Chart.yaml
similarity index 82%
copy from xos-tools/kafkacat/Chart.yaml
copy to tools/voltha-kafka-dump/Chart.yaml
index 39e9fb5..0ae3423 100644
--- a/xos-tools/kafkacat/Chart.yaml
+++ b/tools/voltha-kafka-dump/Chart.yaml
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: kafkacat
-description: A Helm chart for kafkacat
+name: voltha-kafka-dump
+description: A Helm chart for voltha-kafka-dump
 icon: https://kafka.apache.org/images/logo.png
 
 version: 1.0.0
 
-# version of confluentinc/cp-kafkacat container
-appVersion: 4.1.2
+# version of voltha/voltha-kafka-dump container
+appVersion: 6.1.1
diff --git a/tools/voltha-kafka-dump/templates/NOTES.txt b/tools/voltha-kafka-dump/templates/NOTES.txt
new file mode 100644
index 0000000..d346417
--- /dev/null
+++ b/tools/voltha-kafka-dump/templates/NOTES.txt
@@ -0,0 +1,9 @@
+Thank you for installing {{ .Chart.Name }}.
+
+To dump events in human-readable format:
+
+kubectl exec -it <pod-name> ./voltha-dump-events.sh
+
+To dump events in binary format:
+
+kubectl exec -it <pod-name> ./voltha-dump-events.sh -- --binary
diff --git a/tools/voltha-kafka-dump/templates/deployment.yaml b/tools/voltha-kafka-dump/templates/deployment.yaml
new file mode 100644
index 0000000..dd47799
--- /dev/null
+++ b/tools/voltha-kafka-dump/templates/deployment.yaml
@@ -0,0 +1,41 @@
+---
+# 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: voltha-kafka-dump
+  labels:
+    app: voltha-kafka-dump
+    chart: voltha-kafka-dump
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: voltha-kafka-dump
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: voltha-kafka-dump
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: voltha-kafka-dump
+          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command: ["/bin/bash", "-c", "sleep 86400"]
diff --git a/xos-tools/xossh/Chart.yaml b/tools/voltha-kafka-dump/values.yaml
similarity index 64%
copy from xos-tools/xossh/Chart.yaml
copy to tools/voltha-kafka-dump/values.yaml
index e9b9631..bce8935 100644
--- a/xos-tools/xossh/Chart.yaml
+++ b/tools/voltha-kafka-dump/values.yaml
@@ -13,10 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: xossh
-description: A Helm chart for xossh, the XOS command line shell
-icon: https://guide.opencord.org/logos/xos.svg
-version: 3.0.0
+# Default values for xossh
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
 
-# Runs the xosproject/xos-client container
-appVersion: 3.2.3
+replicaCount: 1
+
+nameOverride: ""
+fullnameOverride: ""
+
+imagePullPolicy: Always
+
+image:
+  repository: 'opencord/voltha-kafka-dump'
+  tag: '{{ .Chart.AppVersion }}'
+  pullPolicy: 'Always'
+
+global:
+  registry: ''
+
diff --git a/xos-tools/xos-tester/Chart.yaml b/tools/xos-tester/Chart.yaml
similarity index 97%
rename from xos-tools/xos-tester/Chart.yaml
rename to tools/xos-tester/Chart.yaml
index fda91d7..1e059eb 100644
--- a/xos-tools/xos-tester/Chart.yaml
+++ b/tools/xos-tester/Chart.yaml
@@ -17,7 +17,7 @@
 description: A Helm chart to run tests against an XOS deployment
 icon: https://guide.opencord.org/logos/xos.svg
 
-version: 1.0.0
+version: 1.0.1
 
 # version of xosproject/xos-api-tester container
 appVersion: latest
diff --git a/xos-tools/xos-tester/templates/NOTES.txt b/tools/xos-tester/templates/NOTES.txt
similarity index 100%
rename from xos-tools/xos-tester/templates/NOTES.txt
rename to tools/xos-tester/templates/NOTES.txt
diff --git a/xos-tools/xos-tester/templates/_helpers.tpl b/tools/xos-tester/templates/_helpers.tpl
similarity index 100%
rename from xos-tools/xos-tester/templates/_helpers.tpl
rename to tools/xos-tester/templates/_helpers.tpl
diff --git a/xos-tools/xos-tester/templates/configmap.yaml b/tools/xos-tester/templates/configmap.yaml
similarity index 100%
rename from xos-tools/xos-tester/templates/configmap.yaml
rename to tools/xos-tester/templates/configmap.yaml
diff --git a/xos-tools/xos-tester/templates/job.yaml b/tools/xos-tester/templates/job.yaml
similarity index 100%
rename from xos-tools/xos-tester/templates/job.yaml
rename to tools/xos-tester/templates/job.yaml
diff --git a/xos-tools/xos-tester/values.yaml b/tools/xos-tester/values.yaml
similarity index 100%
rename from xos-tools/xos-tester/values.yaml
rename to tools/xos-tester/values.yaml
diff --git a/xos-tools/xossh/Chart.yaml b/tools/xossh/Chart.yaml
similarity index 97%
rename from xos-tools/xossh/Chart.yaml
rename to tools/xossh/Chart.yaml
index e9b9631..0a5cd70 100644
--- a/xos-tools/xossh/Chart.yaml
+++ b/tools/xossh/Chart.yaml
@@ -16,7 +16,7 @@
 name: xossh
 description: A Helm chart for xossh, the XOS command line shell
 icon: https://guide.opencord.org/logos/xos.svg
-version: 3.0.0
+version: 3.0.1
 
 # Runs the xosproject/xos-client container
 appVersion: 3.2.3
diff --git a/xos-tools/xossh/README.md b/tools/xossh/README.md
similarity index 66%
rename from xos-tools/xossh/README.md
rename to tools/xossh/README.md
index 9d08a67..e36e1ab 100644
--- a/xos-tools/xossh/README.md
+++ b/tools/xossh/README.md
@@ -2,14 +2,14 @@
 
 ```
 # start the xossh container
-helm install xos-tools/xossh -n xossh
+helm install tools/xossh -n xossh
 
 # wait a few seconds for the container to start, then run the following
-xos-tools/xossh/xossh-attach.sh
+tools/xossh/xossh-attach.sh
 ```
 
 To deploy a development version of `xossh` tagged with the `candidate` tag, you can do:
 
 ```
-helm install xos-tools/xossh/ -n xossh -f examples/xossh-candidate.yaml
+helm install tools/xossh/ -n xossh -f examples/xossh-candidate.yaml
 ```
diff --git a/xos-tools/xossh/templates/_helpers.tpl b/tools/xossh/templates/_helpers.tpl
similarity index 100%
rename from xos-tools/xossh/templates/_helpers.tpl
rename to tools/xossh/templates/_helpers.tpl
diff --git a/xos-tools/xossh/templates/configmap.yaml b/tools/xossh/templates/configmap.yaml
similarity index 100%
rename from xos-tools/xossh/templates/configmap.yaml
rename to tools/xossh/templates/configmap.yaml
diff --git a/xos-tools/xossh/templates/deployment.yaml b/tools/xossh/templates/deployment.yaml
similarity index 100%
rename from xos-tools/xossh/templates/deployment.yaml
rename to tools/xossh/templates/deployment.yaml
diff --git a/xos-tools/xossh/values.yaml b/tools/xossh/values.yaml
similarity index 100%
rename from xos-tools/xossh/values.yaml
rename to tools/xossh/values.yaml
diff --git a/xos-tools/xossh/xossh-attach.sh b/tools/xossh/xossh-attach.sh
similarity index 100%
rename from xos-tools/xossh/xossh-attach.sh
rename to tools/xossh/xossh-attach.sh