diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index a76a027..7c243a4 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for Voltha OpenOLT Adapter
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.0.2
+version: 2.0.3
 appVersion: 2.0.0
diff --git a/voltha-adapter-openolt/templates/adapters-openolt.yaml b/voltha-adapter-openolt/templates/adapters-openolt.yaml
index 83a352b..e4b9f1b 100644
--- a/voltha-adapter-openolt/templates/adapters-openolt.yaml
+++ b/voltha-adapter-openolt/templates/adapters-openolt.yaml
@@ -38,9 +38,17 @@
       containers:
         - name: adapter-open-olt
           {{- if .Values.use_go }}
-          image: {{ tpl .Values.images.adapter_open_olt.registry . }}{{ tpl .Values.images.adapter_open_olt.repository . }}:{{ tpl .Values.images.adapter_open_olt.tag_go . }}
+          {{- $image_tag := tpl .Values.images.adapter_open_olt.tag_go . }}
+          {{- if eq "::DEFAULT::" $image_tag }}
+          {{- $image_tag = .Values.defaults.default_go_image_tag }}
+          {{- end }}
+          image: {{ tpl .Values.images.adapter_open_olt.registry . }}{{ tpl .Values.images.adapter_open_olt.repository . }}:{{ $image_tag }}
           {{- else }}
-          image: {{ tpl .Values.images.adapter_open_olt.registry . }}{{ tpl .Values.images.adapter_open_olt.repository . }}:{{ tpl .Values.images.adapter_open_olt.tag . }}
+          {{- $image_tag := tpl .Values.images.adapter_open_olt.tag . }}
+          {{- if eq "::DEFAULT::" $image_tag }}
+          {{- $image_tag = .Values.defaults.default_py_image_tag }}
+          {{- end }}
+          image: {{ tpl .Values.images.adapter_open_olt.registry . }}{{ tpl .Values.images.adapter_open_olt.repository . }}:{{ $image_tag }}
           {{- end }}
           imagePullPolicy: {{ tpl .Values.images.adapter_open_olt.pullPolicy . }}
           args:
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 7610fa4..affb839 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -17,10 +17,12 @@
 
 # Default overrides
 defaults:
-  image_registry:
-  image_tag:
-  image_org:
-  image_pullPolicy:
+  image_registry: ""
+  image_tag: "::DEFAULT::"
+  image_org: "voltha/"
+  image_pullPolicy: "Always"
+  default_go_image_tag: "master-go"
+  default_py_image_tag: '{{ .Chart.AppVersion }}'
 
 # Define connectivity to required services
 services:
@@ -43,8 +45,8 @@
 
 images:
   adapter_open_olt:
-    registry: '{{ .Values.defaults.image_registry | default "" }}'
-    repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-openolt-adapter'
-    tag_go: '{{ .Values.defaults.image_tag | default "master-go" }}'
-    tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
+    registry: '{{ .Values.defaults.image_registry }}'
+    repository: '{{ .Values.defaults.image_org }}voltha-openolt-adapter'
+    tag_go: '{{ .Values.defaults.image_tag }}'
+    tag: '{{ .Values.defaults.image_tag }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'