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