diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index fed0f67..f5f5564 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.4.3
+version: 2.4.4
 
 # app version applies to multiple components with potentially different
 # container image versions
diff --git a/voltha/templates/ofagent-go.yaml b/voltha/templates/ofagent-go.yaml
index f8f2cc2..283f986 100644
--- a/voltha/templates/ofagent-go.yaml
+++ b/voltha/templates/ofagent-go.yaml
@@ -77,7 +77,7 @@
         - "--kv_store_host=voltha-etcd-cluster-client.{{ .Release.Namespace }}.svc.cluster.local"
         - "--kv_store_port=2379"
         - "--kv_store_type=etcd"
-        - "--kv_store_request_timeout=60"
+        - "--kv_store_request_timeout=60s"
         - "--log_level={{ $log_level }}"
         - "--probe=:8080"
         livenessProbe:
diff --git a/voltha/templates/rw-core.yaml b/voltha/templates/rw-core.yaml
index fabeb3e..b56a989 100644
--- a/voltha/templates/rw-core.yaml
+++ b/voltha/templates/rw-core.yaml
@@ -117,9 +117,9 @@
             - "-core_pair_topic=core-pair-1"
             - "-kv_store_data_prefix=service/voltha"
             - "-in_competing_mode=false"
-            - "-core_timeout=9999"
-            - "-timeout_long_request=9999"
-            - "-timeout_request=9999"
+            - "-core_timeout=10s"
+            - "-timeout_long_request=10s"
+            - "-timeout_request=10s"
             - "-log_level={{ $log_level }}"
             - "-probe_port=8080"
           ports:
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 313d32d..d0d445f 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -91,7 +91,7 @@
   ofagent_go:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-ofagent-go'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}1.1.6{{- end }}{{- else }}1.1.6{{- end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}1.2.0{{- end }}{{- else }}1.2.0{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   ofagent_py:
@@ -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.4.0{{- end }}{{- else }}2.4.0{{- end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.4.1{{- end }}{{- else }}2.4.1{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'