diff --git a/voltha/values.yaml b/voltha/values.yaml
index b25670b..f703115 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -27,7 +27,8 @@
   image_tag: ~
   image_pullPolicy: "Always"
   rw_core:
-    timeout: "10s"
+    rpc_timeout: "10s"
+    internal_timeout: "10s"
   # Configure Log Correlation
   log_correlation:
     enabled: true
@@ -35,6 +36,15 @@
   tracing:
     enabled: true
 
+# Probe values
+probe:
+  liveness:
+    initial_delay_seconds: 3
+    period_seconds: 3
+  readiness:
+    initial_delay_seconds: 3
+    period_seconds: 3
+
 # Default security context under which the containers run
 securityContext:
   enabled: true
@@ -45,8 +55,6 @@
 # Define connectivity to services on which VOLTHA depends
 services:
   kafka:
-    adapter:
-      address: kafka:9092
     cluster:
       address: kafka:9092
 
@@ -79,14 +87,15 @@
 
 rw_core:
   log_level: '{{ .Values.global.log_level }}'
-  core_timeout: '{{ .Values.global.rw_core.timeout }}'
-  timeout_long_request: '{{ .Values.global.rw_core.timeout }}'
-  timeout_request: '{{ .Values.global.rw_core.timeout }}'
+  rpc_timeout: '{{ .Values.global.rw_core.rpc_timeout }}'
+  internal_timeout: '{{ .Values.global.rw_core.internal_timeout }}'
   kv_store_data_prefix: 'service/{{ .Values.global.stack_name }}_voltha'
   stack_id: "{{ .Values.global.stack_name }}"
   topics:
-    core_topic: "{{ .Values.global.stack_name }}_rwcore"
     event_topic: "voltha.events"
+  backoff_initial_interval: 500ms
+  backoff_max_interval: 5s
+  backoff_max_elapsed_time: 0s
 
 ofagent:
   log_level: '{{ .Values.global.log_level }}'
@@ -97,13 +106,13 @@
   ofagent:
     registry: '{{ .Values.global.image_registry }}'
     repository: '{{ .Values.global.image_org }}voltha-ofagent-go'
-    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}1.6.5{{- end }}{{- else }}1.6.5{{- end }}'
+    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}2.0.0{{- end }}{{- else }}2.0.0{{- end }}'
     pullPolicy: '{{ .Values.global.image_pullPolicy }}'
 
   rw_core:
     registry: '{{ .Values.global.image_registry }}'
     repository: '{{ .Values.global.image_org }}voltha-rw-core'
-    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}2.9.3{{- end }}{{- else }}2.9.3{{- end }}'
+    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}3.0.0{{- end }}{{- else }}3.0.0{{- end }}'
     pullPolicy: '{{ .Values.global.image_pullPolicy }}'
 
 ingress: