Use voltha-rw-core v2.3.6

Change-Id: I13d42852039f7443686b295bc302552575881a0c
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/Chart.yaml b/voltha/Chart.yaml
index 925165c..dd168d0 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,7 +17,7 @@
 description: A Helm chart for Voltha based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.3.0
+version: 2.3.1
 
 # app version applies to multiple components with potentially different
 # container image versions
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 8bc8421..f9773d1 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -103,5 +103,5 @@
   rw_core:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-rw-core'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.3.5{{- end }}{{- else }}2.3.5{{- 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 }}'