diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index fc2eed4..1d13960 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.2.2
-appVersion: 2.3.6
+version: 2.2.3
+appVersion: 2.3.7
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 0c12bb3..dc20f86 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.2.3
+version: 2.2.4
 
 # app version applies to multiple components with potentially different
 # container image versions
diff --git a/voltha/templates/rw-core.yaml b/voltha/templates/rw-core.yaml
index 72bdab3..724447e 100644
--- a/voltha/templates/rw-core.yaml
+++ b/voltha/templates/rw-core.yaml
@@ -11,23 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-{{- $set_log_level := tpl .Values.rw_core.log_level . | upper }}
-{{- $log_level := 3 }}
-{{- if eq $set_log_level "DEBUG" }}
-{{- $log_level = 0 }}
-{{- else if eq $set_log_level "INFO" }}
-{{- $log_level = 1 }}
-{{- else if eq $set_log_level "WARN" }}
-{{- $log_level = 2 }}
-{{- else if eq $set_log_level "ERROR" }}
-{{- $log_level = 3 }}
-{{- else if eq $set_log_level "PANIC" }}
-{{- $log_level = 4 }}
-{{- else if eq $set_log_level "FATAL" }}
-{{- $log_level = 5 }}
-{{- else }}
-{{- $log_level = 3 }}
-{{- end }}
+{{- $log_level := tpl .Values.rw_core.log_level . | upper }}
 ---
 apiVersion: v1
 kind: Service
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 3fbfe1a..24a61ca 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -95,6 +95,6 @@
   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.0{{- end }}{{- else }}2.3.0{{- end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.3.2{{- end }}{{- else }}2.3.2{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'