diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 3707a0a..8846411 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for Voltha based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.0.3
+version: 2.0.4
 appVersion: 2.0.0
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 7221470..5c8c9a7 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -19,12 +19,12 @@
 
 # Default overrides
 defaults:
-  image_registry:
-  image_tag:
-  image_org:
-  image_pullPolicy:
+  image_registry: ""
+  image_tag: '{{ .Chart.AppVersion }}'
+  image_org: "voltha/"
+  image_pullPolicy: "Always"
   rw_core:
-    timeout:
+    timeout: "8000"
 
 # Configure the Kafka sub-chart (if it is used)
 kafka:
@@ -74,46 +74,46 @@
   afrouterd: 1
 
 rw_core:
-  core_timeout: '{{ .Values.defaults.rw_core.timeout | default "8000" }}'
-  timeout_long_request: '{{ .Values.defaults.rw_core.timeout | default "8000" }}'
-  timeout_request: '{{ .Values.defaults.rw_core.timeout | default "8000" }}'
+  core_timeout: '{{ .Values.defaults.rw_core.timeout }}'
+  timeout_long_request: '{{ .Values.defaults.rw_core.timeout }}'
+  timeout_request: '{{ .Values.defaults.rw_core.timeout }}'
 
 
 # Define Docker images to be used
 images:
   cli:
-    registry: '{{ .Values.defaults.image_registry | default "" }}'
-    repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-cli'
-    tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
-    pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'
+    registry: '{{ .Values.defaults.image_registry }}'
+    repository: '{{ .Values.defaults.image_org }}voltha-cli'
+    tag: '{{ .Values.defaults.image_tag }}'
+    pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   ofagent:
-    registry: '{{ .Values.defaults.image_registry | default "" }}'
-    repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-ofagent'
-    tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
-    pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'
+    registry: '{{ .Values.defaults.image_registry }}'
+    repository: '{{ .Values.defaults.image_org }}voltha-ofagent'
+    tag: '{{ .Values.defaults.image_tag }}'
+    pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   ro_core:
-    registry: '{{ .Values.defaults.image_registry | default "" }}'
-    repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-ro-core'
-    tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
-    pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'
+    registry: '{{ .Values.defaults.image_registry }}'
+    repository: '{{ .Values.defaults.image_org }}voltha-ro-core'
+    tag: '{{ .Values.defaults.image_tag }}'
+    pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   rw_core:
-    registry: '{{ .Values.defaults.image_registry | default "" }}'
-    repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-rw-core'
-    tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
-    pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'
+    registry: '{{ .Values.defaults.image_registry }}'
+    repository: '{{ .Values.defaults.image_org }}voltha-rw-core'
+    tag: '{{ .Values.defaults.image_tag }}'
+    pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   afrouter:
-    registry: '{{ .Values.defaults.image_registry | default "" }}'
-    repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-afrouter'
-    tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
-    pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'
+    registry: '{{ .Values.defaults.image_registry }}'
+    repository: '{{ .Values.defaults.image_org }}voltha-afrouter'
+    tag: '{{ .Values.defaults.image_tag }}'
+    pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   afrouterd:
-    registry: '{{ .Values.defaults.image_registry | default "" }}'
-    repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-afrouterd'
-    tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
-    pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'
+    registry: '{{ .Values.defaults.image_registry }}'
+    repository: '{{ .Values.defaults.image_org }}voltha-afrouterd'
+    tag: '{{ .Values.defaults.image_tag }}'
+    pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
     restartPolicy: 'Always'