diff --git a/xos-tools/xossh/Chart.yaml b/xos-tools/xossh/Chart.yaml
index 00bfe0a..fe2df9d 100644
--- a/xos-tools/xossh/Chart.yaml
+++ b/xos-tools/xossh/Chart.yaml
@@ -1,3 +1,4 @@
+---
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for xossh
 name: xossh
-version: 0.1.0
+description: A Helm chart for xossh, the XOS command line shell
+version: 2.0.0
diff --git a/xos-tools/xossh/templates/deployment.yaml b/xos-tools/xossh/templates/deployment.yaml
index 3c20f86..0e9540a 100644
--- a/xos-tools/xossh/templates/deployment.yaml
+++ b/xos-tools/xossh/templates/deployment.yaml
@@ -47,7 +47,7 @@
                - "{{ .Values.xosshConfig.accessor.endpoint }}"
           stdin: true
           tty: true
-          image: "{{ .Values.xosshImage }}"
+          image: {{ tpl .Values.xosshImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-tools/xossh/values.yaml b/xos-tools/xossh/values.yaml
index a1ff5f5..ff07162 100644
--- a/xos-tools/xossh/values.yaml
+++ b/xos-tools/xossh/values.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +26,7 @@
 
 imagePullPolicy: Always
 
-xosshImage: 'xosproject/xos-client:master'
+xosshImage: "xosproject/xos-client:{{ .Chart.Version }}"
 
 resources: {}