diff --git a/xos-core/Chart.yaml b/xos-core/Chart.yaml
index 350aa64..d47d9c1 100644
--- a/xos-core/Chart.yaml
+++ b/xos-core/Chart.yaml
@@ -14,4 +14,12 @@
 # limitations under the License.
 
 name: xos-core
-version: 2.1.0-dev
+description: XOS - An Extensible Cloud Operating System
+icon: https://guide.opencord.org/logos/xos.svg
+
+version: 2.1.15
+
+# appVersion is of the xos-core and xos-chameleon containers.
+# xos-tosca and xos-api-tester are versioned in values.yaml
+appVersion: 2.1.15
+
diff --git a/xos-core/requirements.yaml b/xos-core/requirements.yaml
index 2d165b1..de38084 100644
--- a/xos-core/requirements.yaml
+++ b/xos-core/requirements.yaml
@@ -15,10 +15,10 @@
 
 dependencies:
 - name: xos-db
-  version: 0.1.0-dev0
+  version: 1.0.0
   repository: file://../xos-db
 - name: xos-gui
-  version: 1.1.0-dev
+  version: 1.2.0
   repository: file://../xos-gui
   condition: xos-gui.enabled
 
diff --git a/xos-core/templates/chameleon-deployment.yaml b/xos-core/templates/chameleon-deployment.yaml
index d61cdd9..41f1f6e 100644
--- a/xos-core/templates/chameleon-deployment.yaml
+++ b/xos-core/templates/chameleon-deployment.yaml
@@ -28,8 +28,8 @@
     spec:
       containers:
         - name: xos-chameleon
-          image: {{ tpl .Values.xos_chameleonImage . | quote }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          image:  {{ .Values.global.registry }}{{ .Values.images.xos_chameleon.repository }}:{{ tpl .Values.images.xos_chameleon.tag . }}
+          imagePullPolicy: {{ .Values.images.xos_chameleon.pullPolicy }}
           command: ["python", "chameleon/chameleon/main.py", "-R", "9101", "-G", "xos-core:50055", "--swagger-url", "/apidocs", "-r"]
           ports:
             - containerPort: 9101
diff --git a/xos-core/templates/core-deployment.yaml b/xos-core/templates/core-deployment.yaml
index 54b2a5a..a785392 100644
--- a/xos-core/templates/core-deployment.yaml
+++ b/xos-core/templates/core-deployment.yaml
@@ -28,8 +28,8 @@
     spec:
       containers:
         - name: xos-core
-          image: {{ tpl .Values.xos_coreImage . | quote }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          image: {{ .Values.global.registry }}{{ .Values.images.xos_core.repository }}:{{ tpl .Values.images.xos_core.tag . }}
+          imagePullPolicy: {{ .Values.images.xos_core.pullPolicy }}
           command: ["/bin/bash", "-c", "cd coreapi; ./start_coreapi.sh"]
           ports:
             - containerPort: 50051
diff --git a/xos-core/templates/tests/test-xos-core-api.yaml b/xos-core/templates/tests/test-xos-core-api.yaml
index 7899b00..1162de0 100644
--- a/xos-core/templates/tests/test-xos-core-api.yaml
+++ b/xos-core/templates/tests/test-xos-core-api.yaml
@@ -25,8 +25,8 @@
   restartPolicy: Never
   containers:
     - name: {{ .Release.Name }}-api-test
-      image: {{ .Values.xos_api_testerImage }}
-      imagePullPolicy: {{ .Values.imagePullPolicy }}
+      image: {{ .Values.global.registry }}{{ .Values.images.xos_api_tester.repository }}:{{ tpl .Values.images.xos_api_tester.tag . }}
+      imagePullPolicy: {{ .Values.images.xos_api_tester.pullPolicy }}
       volumeMounts:
         - name: log-volume
           mountPath: /src/cord-api/Tests/Log/
diff --git a/xos-core/templates/tosca-deployment.yaml b/xos-core/templates/tosca-deployment.yaml
index 48eecf2..c6f8376 100644
--- a/xos-core/templates/tosca-deployment.yaml
+++ b/xos-core/templates/tosca-deployment.yaml
@@ -28,8 +28,8 @@
     spec:
       containers:
         - name: xos-tosca
-          image: {{ .Values.xos_toscaImage | quote }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          image: {{ .Values.global.registry }}{{ .Values.images.xos_tosca.repository }}:{{ tpl .Values.images.xos_tosca.tag . }}
+          imagePullPolicy: {{ .Values.images.xos_tosca.pullPolicy }}
           ports:
             - containerPort: 9102
               port: 9102
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 7f315bc..688f379 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -16,14 +16,31 @@
 xos_gui:
   enabled: true
 
-imagePullPolicy: 'Always'
-
 # Docker images
 # YAML variable names can't contain `-`, so substituted with `_`
-xos_coreImage: 'xosproject/xos-core:master'
-xos_chameleonImage: 'xosproject/chameleon:master'
-xos_toscaImage: 'xosproject/xos-tosca:master'
-xos_api_testerImage: 'xosproject/xos-api-tester:master'
+images:
+  xos_core:
+    repository: 'xosproject/xos-core'
+    tag: '{{ .Chart.AppVersion }}'
+    pullPolicy: 'Always'
+
+  xos_chameleon:
+    repository: 'xosproject/chameleon'
+    tag: '{{ .Chart.AppVersion }}'
+    pullPolicy: 'Always'
+
+  xos_tosca:
+    repository: 'xosproject/xos-tosca'
+    tag: '1.1.1'
+    pullPolicy: 'Always'
+
+  xos_api_tester:
+    repository: 'xosproject/xos-api-tester'
+    tag: '2.0.3'
+    pullPolicy: 'Always'
+
+global:
+  registry: ""
 
 # NodePorts
 xos_chameleonNodePort: 30006