diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index affb839..660e18d 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -13,16 +13,12 @@
 # limitations under the License.
 
 ---
-use_go: false
-
 # Default overrides
 defaults:
   image_registry: ""
-  image_tag: "::DEFAULT::"
+  image_tag: '{{ .Chart.AppVersion }}'
   image_org: "voltha/"
   image_pullPolicy: "Always"
-  default_go_image_tag: "master-go"
-  default_py_image_tag: '{{ .Chart.AppVersion }}'
 
 # Define connectivity to required services
 services:
@@ -47,6 +43,5 @@
   adapter_open_olt:
     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" }}'