diff --git a/VERSION b/VERSION
index 276cbf9..32d1656 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.0
+2.3.1-dev
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 9c1e6e9..b2ee870 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -17,5 +17,4 @@
 description: A Helm chart for Voltha OpenONU Adapter
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.3.0
-appVersion: 2.3.6
+version: 2.3.1
diff --git a/voltha-adapter-openonu/templates/adapters-openonu-go.yaml b/voltha-adapter-openonu/templates/adapters-openonu-go.yaml
index 74fd58a..9ff5e58 100644
--- a/voltha-adapter-openonu/templates/adapters-openonu-go.yaml
+++ b/voltha-adapter-openonu/templates/adapters-openonu-go.yaml
@@ -65,7 +65,7 @@
           image: '{{ tpl .Values.images.adapter_open_onu.registry . }}{{ tpl .Values.images.adapter_open_onu_go.repository . }}:{{ tpl ( tpl .Values.images.adapter_open_onu_go.tag . ) . }}'
           imagePullPolicy: {{ tpl .Values.images.adapter_open_onu_go.pullPolicy . }}
           args:
-            - "/app/openonugo"
+            - "/app/openonu"
             - "--banner=true"
             - "--kafka_reconnect_retries=-1"
             - "--kafka_adapter_host={{ .Values.services.kafka.adapter.service }}"
@@ -90,4 +90,4 @@
               port: 8080
             initialDelaySeconds: 10
             periodSeconds: 5
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index 426b4fb..e2acb98 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -49,9 +49,9 @@
   adapter_open_onu:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-openonu-adapter'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.3.6{{- end }}{{- else }}2.3.6{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
   adapter_open_onu_go:
     repository: '{{ .Values.defaults.image_org }}voltha-openonu-adapter-go'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}master{{- end }}{{- else }}master{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'