diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 24028a4..8703014 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.3'
+    pullPolicy: 'Always'
+
+  xos_api_tester:
+    repository: 'xosproject/xos-api-tester'
+    tag: 'master'
+    pullPolicy: 'Always'
+
+global:
+  registry: ""
 
 # NodePorts
 xos_chameleonNodePort: 30006