diff --git a/xos-gui/Chart.yaml b/xos-gui/Chart.yaml
index a1efce3..9f379f8 100644
--- a/xos-gui/Chart.yaml
+++ b/xos-gui/Chart.yaml
@@ -15,5 +15,8 @@
 
 name: xos-gui
 description: Web GUI for XOS
-version: 1.1.0-dev
+icon: https://guide.opencord.org/logos/xos.svg
+version: 1.2.0
 
+# appVersion is of the xos-gui container, xos-ws tag is specified in values.yaml
+appVersion: 1.0.2
diff --git a/xos-gui/templates/gui-deployment.yaml b/xos-gui/templates/gui-deployment.yaml
index 153a6bf..d8d8b13 100644
--- a/xos-gui/templates/gui-deployment.yaml
+++ b/xos-gui/templates/gui-deployment.yaml
@@ -28,8 +28,8 @@
     spec:
       containers:
         - name: xos-gui
-          image: {{ tpl .Values.xos_guiImage . | quote }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          image: {{ .Values.global.registry }}{{ .Values.images.xos_gui.repository }}:{{ tpl .Values.images.xos_gui.tag . }}
+          imagePullPolicy: {{ .Values.images.xos_gui.pullPolicy }}
           ports:
             - containerPort: 4000
               port: 4000
diff --git a/xos-gui/templates/ws-deployment.yaml b/xos-gui/templates/ws-deployment.yaml
index 9d958bb..e10d0f8 100644
--- a/xos-gui/templates/ws-deployment.yaml
+++ b/xos-gui/templates/ws-deployment.yaml
@@ -28,8 +28,8 @@
     spec:
       containers:
         - name: xos-ws
-          image: {{ .Values.xos_wsImage | quote }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          image: {{ .Values.global.registry }}{{ .Values.images.xos_ws.repository }}:{{ tpl .Values.images.xos_ws.tag . }}
+          imagePullPolicy: {{ .Values.images.xos_ws.pullPolicy }}
           command: ["npm", "start", "--", "--config", "gateway-config.yml"]
           ports:
             - containerPort: 3000
diff --git a/xos-gui/values.yaml b/xos-gui/values.yaml
index 4ea2e9d..7e54158 100644
--- a/xos-gui/values.yaml
+++ b/xos-gui/values.yaml
@@ -13,11 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-imagePullPolicy: 'Always'
-
 # Docker Images
-xos_guiImage: 'xosproject/xos-gui:master'
-xos_wsImage: 'xosproject/xos-ws:master'
+images:
+  xos_gui:
+    repository: 'xosproject/xos-gui'
+    tag: "{{ .Chart.AppVersion }}"
+    pullPolicy: 'Always'
+
+  xos_ws:
+    repository: 'xosproject/xos-ws'
+    tag: '2.0.0'
+    pullPolicy: 'Always'
+
+global:
+  registry: ""
 
 # NodePorts
 xos_guiNodePort: 30001