diff --git a/xos-tools/xossh/Chart.yaml b/xos-tools/xossh/Chart.yaml
index 22858d3..814a6bb 100644
--- a/xos-tools/xossh/Chart.yaml
+++ b/xos-tools/xossh/Chart.yaml
@@ -15,4 +15,8 @@
 
 name: xossh
 description: A Helm chart for xossh, the XOS command line shell
-version: 2.1.0-dev
+icon: https://guide.opencord.org/logos/xos.svg
+version: 2.1.15
+
+# Runs the xosproject/xos-client container
+appVersion: 2.1.15
diff --git a/xos-tools/xossh/templates/deployment.yaml b/xos-tools/xossh/templates/deployment.yaml
index 0e9540a..44af9ff 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: {{ tpl .Values.xosshImage . | quote }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-tools/xossh/values.yaml b/xos-tools/xossh/values.yaml
index 2ae231d..e8d03b8 100644
--- a/xos-tools/xossh/values.yaml
+++ b/xos-tools/xossh/values.yaml
@@ -19,14 +19,16 @@
 
 replicaCount: 1
 
-pull_docker_registry:
-
 nameOverride: ""
 fullnameOverride: ""
 
-imagePullPolicy: Always
+image:
+  repository: 'xosproject/xos-client'
+  tag: '{{ .Chart.AppVersion }}'
+  pullPolicy: 'Always'
 
-xosshImage: "xosproject/xos-client:master"
+global:
+  registry: ''
 
 resources: {}