diff --git a/xos-tools/kafkacat/Chart.yaml b/xos-tools/kafkacat/Chart.yaml
index 39e9fb5..dadfad4 100644
--- a/xos-tools/kafkacat/Chart.yaml
+++ b/xos-tools/kafkacat/Chart.yaml
@@ -15,9 +15,4 @@
 
 name: kafkacat
 description: A Helm chart for kafkacat
-icon: https://kafka.apache.org/images/logo.png
-
-version: 1.0.0
-
-# version of confluentinc/cp-kafkacat container
-appVersion: 4.1.2
+version: 1.0.0-dev
diff --git a/xos-tools/kafkacat/templates/deployment.yaml b/xos-tools/kafkacat/templates/deployment.yaml
index de219c9..5a16db5 100644
--- a/xos-tools/kafkacat/templates/deployment.yaml
+++ b/xos-tools/kafkacat/templates/deployment.yaml
@@ -1,4 +1,5 @@
 ---
+
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,6 +37,6 @@
     spec:
       containers:
         - name: kafkacat
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          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
index 6b96e1b..ae6d055 100644
--- a/xos-tools/kafkacat/values.yaml
+++ b/xos-tools/kafkacat/values.yaml
@@ -19,16 +19,11 @@
 
 replicaCount: 1
 
+pull_docker_registry:
+
 nameOverride: ""
 fullnameOverride: ""
 
 imagePullPolicy: Always
 
-image:
-  repository: 'confluentinc/cp-kafkacat'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
-
-global:
-  registry: ''
-
+kafkacatImage: "confluentinc/cp-kafkacat:4.0.2"
diff --git a/xos-tools/xossh/Chart.yaml b/xos-tools/xossh/Chart.yaml
index 814a6bb..22858d3 100644
--- a/xos-tools/xossh/Chart.yaml
+++ b/xos-tools/xossh/Chart.yaml
@@ -15,8 +15,4 @@
 
 name: xossh
 description: A Helm chart for xossh, the XOS command line shell
-icon: https://guide.opencord.org/logos/xos.svg
-version: 2.1.15
-
-# Runs the xosproject/xos-client container
-appVersion: 2.1.15
+version: 2.1.0-dev
diff --git a/xos-tools/xossh/templates/deployment.yaml b/xos-tools/xossh/templates/deployment.yaml
index 44af9ff..0e9540a 100644
--- a/xos-tools/xossh/templates/deployment.yaml
+++ b/xos-tools/xossh/templates/deployment.yaml
@@ -47,8 +47,8 @@
                - "{{ .Values.xosshConfig.accessor.endpoint }}"
           stdin: true
           tty: true
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.xosshImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-tools/xossh/values.yaml b/xos-tools/xossh/values.yaml
index e8d03b8..2ae231d 100644
--- a/xos-tools/xossh/values.yaml
+++ b/xos-tools/xossh/values.yaml
@@ -19,16 +19,14 @@
 
 replicaCount: 1
 
+pull_docker_registry:
+
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/xos-client'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: Always
 
-global:
-  registry: ''
+xosshImage: "xosproject/xos-client:master"
 
 resources: {}