diff --git a/xos-core/templates/chameleon-deployment.yaml b/xos-core/templates/chameleon-deployment.yaml
index 41f1f6e..d61cdd9 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:  {{ .Values.global.registry }}{{ .Values.images.xos_chameleon.repository }}:{{ tpl .Values.images.xos_chameleon.tag . }}
-          imagePullPolicy: {{ .Values.images.xos_chameleon.pullPolicy }}
+          image: {{ tpl .Values.xos_chameleonImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           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 a785392..54b2a5a 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: {{ .Values.global.registry }}{{ .Values.images.xos_core.repository }}:{{ tpl .Values.images.xos_core.tag . }}
-          imagePullPolicy: {{ .Values.images.xos_core.pullPolicy }}
+          image: {{ tpl .Values.xos_coreImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           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 1162de0..7899b00 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.global.registry }}{{ .Values.images.xos_api_tester.repository }}:{{ tpl .Values.images.xos_api_tester.tag . }}
-      imagePullPolicy: {{ .Values.images.xos_api_tester.pullPolicy }}
+      image: {{ .Values.xos_api_testerImage }}
+      imagePullPolicy: {{ .Values.imagePullPolicy }}
       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 c6f8376..48eecf2 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.global.registry }}{{ .Values.images.xos_tosca.repository }}:{{ tpl .Values.images.xos_tosca.tag . }}
-          imagePullPolicy: {{ .Values.images.xos_tosca.pullPolicy }}
+          image: {{ .Values.xos_toscaImage | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           ports:
             - containerPort: 9102
               port: 9102