diff --git a/examples/imagePullPolicy-IfNotPresent.yaml b/examples/imagePullPolicy-IfNotPresent.yaml
index 31e6f32..8e8de99 100644
--- a/examples/imagePullPolicy-IfNotPresent.yaml
+++ b/examples/imagePullPolicy-IfNotPresent.yaml
@@ -19,10 +19,31 @@
 image:
   pullPolicy: 'IfNotPresent'
 
-xos-gui:
+# in xos-core chart and other charts with multiple images
+images:
+  xos_core:
+    pullPolicy: 'IfNotPresent'
+  xos_chameleon:
+    pullPolicy: 'IfNotPresent'
+  xos_tosca:
+    pullPolicy: 'IfNotPresent'
+  xos_api_tester:
+    pullPolicy: 'IfNotPresent'
+  tosca_loader:
+    pullPolicy: 'IfNotPresent'
+
+xos-db:
   image:
     pullPolicy: 'IfNotPresent'
 
+# in xos-gui sub-chart required by xos-core chart
+xos-gui:
+  images:
+    xos_gui:
+      pullPolicy: 'IfNotPresent'
+    xos_ws:
+      pullPolicy: 'IfNotPresent'
+
 # in RCORD service chart
 addressmanager:
   image:
diff --git a/xos-core/templates/chameleon-deployment.yaml b/xos-core/templates/chameleon-deployment.yaml
index 41f1f6e..a715a98 100644
--- a/xos-core/templates/chameleon-deployment.yaml
+++ b/xos-core/templates/chameleon-deployment.yaml
@@ -28,7 +28,7 @@
     spec:
       containers:
         - name: xos-chameleon
-          image:  {{ .Values.global.registry }}{{ .Values.images.xos_chameleon.repository }}:{{ tpl .Values.images.xos_chameleon.tag . }}
+          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:
diff --git a/xos-db/templates/db-deployment.yaml b/xos-db/templates/db-deployment.yaml
index d467b05..9814677 100644
--- a/xos-db/templates/db-deployment.yaml
+++ b/xos-db/templates/db-deployment.yaml
@@ -28,7 +28,7 @@
     spec:
       containers:
         - name: xos-db
-          image:  {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 5432