diff --git a/voltha/templates/envoy_for_etcd.yaml b/voltha/templates/envoy_for_etcd.yaml
index 59bacdb..4869682 100644
--- a/voltha/templates/envoy_for_etcd.yaml
+++ b/voltha/templates/envoy_for_etcd.yaml
@@ -41,7 +41,8 @@
       serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
       containers:
         - name: voltha
-          image: {{ .Values.pull_docker_registry }}{{ .Values.images.envoy_for_etcd.repository }}:{{ .Values.images.envoy_for_etcd.tag }}
+          image: {{ .Values.envoyForEtcdImage }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: POD_IP
               valueFrom:
@@ -67,6 +68,5 @@
               name: mystery2-port
             - containerPort: 50555
               name: grpc-port
-          imagePullPolicy: {{ .Values.image_pull_policy }}
 
 
diff --git a/voltha/templates/freeradius.yaml b/voltha/templates/freeradius.yaml
index 10a32c6..6436303 100644
--- a/voltha/templates/freeradius.yaml
+++ b/voltha/templates/freeradius.yaml
@@ -55,7 +55,8 @@
       serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
       containers:
         - name: freeradius
-          image: {{ .Values.pull_docker_registry }}{{ .Values.images.freeradius.repository }}:{{ .Values.images.freeradius.tag }}
+          image: {{ .Values.freeradiusImage }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: POD_IP
               valueFrom:
diff --git a/voltha/templates/grafana.yaml b/voltha/templates/grafana.yaml
index 4fa7566..f4716bb 100644
--- a/voltha/templates/grafana.yaml
+++ b/voltha/templates/grafana.yaml
@@ -63,7 +63,8 @@
       serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
       containers:
       - name: grafana
-        image: {{ .Values.pull_docker_registry }}{{ .Values.images.grafana.repository }}:{{ .Values.images.grafana.tag }}
+        image: {{ .Values.grafanaImage }}
+        imagePullPolicy: {{ .Values.imagePullPolicy }}
         ports:
         - containerPort: 80
         - containerPort: 2003
diff --git a/voltha/templates/netconf.yaml b/voltha/templates/netconf.yaml
index cacbf2e..acec48f 100644
--- a/voltha/templates/netconf.yaml
+++ b/voltha/templates/netconf.yaml
@@ -53,8 +53,8 @@
               topologyKey: kubernetes.io/hostname
       containers:
       - name: netconf
-        image: {{ .Values.pull_docker_registry }}{{ .Values.images.netconf.repository }}:{{ .Values.images.netconf.tag }}
-        imagePullPolicy: {{ .Values.image_pull_policy }}
+        image: {{ .Values.netconfImage }}
+        imagePullPolicy: {{ .Values.imagePullPolicy }}
         ports:
         - containerPort: 830
         env:
diff --git a/voltha/templates/ofagent.yaml b/voltha/templates/ofagent.yaml
index 124f0b4..9a2f836 100644
--- a/voltha/templates/ofagent.yaml
+++ b/voltha/templates/ofagent.yaml
@@ -41,8 +41,8 @@
             topologyKey: kubernetes.io/hostname
       containers:
       - name: ofagent
-        image: {{ .Values.pull_docker_registry }}{{ .Values.images.ofagent.repository }}:{{ .Values.images.ofagent.tag }}
-        imagePullPolicy: {{ .Values.image_pull_policy }}
+        image: {{ .Values.ofagentImage }}
+        imagePullPolicy: {{ .Values.imagePullPolicy }}
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/voltha/templates/stats.yaml b/voltha/templates/stats.yaml
index a7b9a70..51511a8 100644
--- a/voltha/templates/stats.yaml
+++ b/voltha/templates/stats.yaml
@@ -31,8 +31,8 @@
       serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
       containers:
       - name: dashd
-        image: {{ .Values.pull_docker_registry }}{{ .Values.images.dashd.repository }}:{{ .Values.images.dashd.tag }}
-        imagePullPolicy: {{ .Values.image_pull_policy }}
+        image: {{ .Values.dashdImage }}
+        imagePullPolicy: {{ .Values.imagePullPolicy }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -64,8 +64,8 @@
       serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
       containers:
       - name: shovel
-        image: {{ .Values.pull_docker_registry }}{{ .Values.images.shovel.repository }}:{{ .Values.images.shovel.tag }}
-        imagePullPolicy: {{ .Values.image_pull_policy }}
+        image: {{ .Values.shovelImage }}
+        imagePullPolicy: {{ .Values.imagePullPolicy }}
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/voltha/templates/vcli.yaml b/voltha/templates/vcli.yaml
index 5b8fbdb..4a9e9c7 100644
--- a/voltha/templates/vcli.yaml
+++ b/voltha/templates/vcli.yaml
@@ -48,7 +48,8 @@
       serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
       containers:
         - name: vcli
-          image: {{ .Values.pull_docker_registry }}{{ .Values.images.vcli.repository }}:{{ .Values.images.vcli.tag }}
+          image: {{ .Values.vcliImage }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: POD_IP
               valueFrom:
@@ -63,6 +64,5 @@
           ports:
             - containerPort: 22
               name: ssh-port
-          imagePullPolicy: {{ .Values.image_pull_policy }}
 
 
diff --git a/voltha/templates/vcore_for_etcd.yaml b/voltha/templates/vcore_for_etcd.yaml
index b9051ee..7f02fe0 100644
--- a/voltha/templates/vcore_for_etcd.yaml
+++ b/voltha/templates/vcore_for_etcd.yaml
@@ -53,7 +53,8 @@
       serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
       containers:
         - name: voltha
-          image: {{ .Values.pull_docker_registry }}{{ .Values.images.vcore.repository }}:{{ .Values.images.vcore.tag }}
+          image: {{ .Values.vcoreImage }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: NAMESPACE
               valueFrom:
@@ -77,6 +78,5 @@
               name: mystery-port
             - containerPort: 50556
               name: grpc-port
-          imagePullPolicy: {{ .Values.image_pull_policy }}
 
 
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 8939b33..a666ea5 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -15,7 +15,7 @@
 pull_docker_registry:
 k8s_docker_registry: 'k8s.gcr.io/'
 
-image_pull_policy: IfNotPresent
+imagePullPolicy: IfNotPresent
 
 replicas:
   vcore: 1
@@ -51,41 +51,15 @@
   customResources:
     createEtcdClusterCRD: true
 
-images:
-  consul:
-    repository: consul
-    tag: '0.9.2'
-  envoy_for_etcd:
-    repository: voltha/voltha-envoy
-    tag: 'latest'
-  fluentd:
-    repository: fluentd-gcp
-    tag: '1.30'
-  freeradius:
-    repository: marcelmaatkamp/freeradius
-    tag: 'latest'
-  grafana:
-    repository: kamon/grafana_graphite
-    tag: '3.0'
-  netconf:
-    repository: voltha/voltha-netconf
-    tag: 'latest'
-  ofagent:
-    repository: voltha/voltha-ofagent
-    tag: 'latest'
-  dashd:
-    repository: voltha/voltha-dashd
-    tag: 'latest'
-  shovel:
-    repository: voltha/voltha-shovel
-    tag: 'latest'
-  vcli:
-    repository: voltha/voltha-cli
-    tag: 'latest'
-  vcore:
-    repository: voltha/voltha-voltha
-    tag: 'latest'
-    
+envoyForEtcdImage: 'voltha/voltha-envoy:latest'
+freeradiusImage: 'marcelmaatkamp/freeradius:latest'
+grafanaImage: 'kamon/grafana_graphite:3.0'
+netconfImage: 'voltha/voltha-netconf:latest'
+ofagentImage: 'voltha/voltha-ofagent:latest'
+dashdImage: 'voltha/voltha-dashd:latest'
+shovelImage: 'voltha/voltha-shovel:latest'
+vcliImage: 'voltha/voltha-cli:latest'
+vcoreImage: 'voltha/voltha-voltha:latest'
   
 kafka:
   enabled: true