diff --git a/bbsim-sadis-server/Chart.yaml b/bbsim-sadis-server/Chart.yaml
index 490a4f5..fa52e01 100644
--- a/bbsim-sadis-server/Chart.yaml
+++ b/bbsim-sadis-server/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "bbsim-sadis-server"
-version: "0.2.1"
+version: "0.2.2"
 description: "A Helm chart for Voltha BBSIM sadis server"
 keywords:
   - "onf"
@@ -32,4 +32,4 @@
 
 # appVersion refers to multiple components with potentially different
 # container image versions.
-appVersion: "0.3.0"
+appVersion: "0.3.1"
diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index 6389ad2..80f67f5 100644
--- a/bbsim/Chart.yaml
+++ b/bbsim/Chart.yaml
@@ -16,5 +16,5 @@
 description: Broadband Simulator
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 4.5.0
-appVersion: 1.8.1
+version: 4.5.1
+appVersion: 1.9.0
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index b0bf873..43f7566 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha-adapter-openolt"
-version: "2.10.6"
+version: "2.10.7"
 description: "A Helm chart for Voltha OpenOLT Adapter"
 keywords:
   - "onf"
@@ -33,4 +33,4 @@
 
 # appVersion refers to multiple components with potentially different
 # container image versions.
-appVersion: "4.0.0"
+appVersion: "4.1.1"
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index dcd2dc1..fe76c8a 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha-adapter-openonu"
-version: "2.9.8"
+version: "2.9.9"
 description: "A Helm chart for Voltha OpenONU Adapter"
 keywords:
   - "onf"
@@ -33,4 +33,4 @@
 
 # appVersion refers to multiple components with potentially different
 # container image versions.
-appVersion: "2.0.2"
+appVersion: "2.1.0"
diff --git a/voltha-infra/Chart.yaml b/voltha-infra/Chart.yaml
index e704466..123cc8f 100644
--- a/voltha-infra/Chart.yaml
+++ b/voltha-infra/Chart.yaml
@@ -29,7 +29,7 @@
 name: voltha-infra
 
 appVersion: "2.9-dev"
-version: 2.9.8
+version: 2.9.9
 
 dependencies:
   - name: onos-classic
@@ -38,7 +38,7 @@
     condition: onos-classic.enabled
   - name: bbsim-sadis-server
     repository: file://../bbsim-sadis-server
-    version: 0.2.1
+    version: 0.2.2
     condition: bbsim-sadis-server.enabled
   - name: etcd
     repository: https://charts.bitnami.com/bitnami
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index c542672..fbf55d3 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -28,18 +28,18 @@
 name: voltha-stack
 
 appVersion: "2.9-dev"
-version: 2.9.12
+version: 2.9.13
 
 dependencies:
   - name: voltha
     repository: file://../voltha
-    version: 2.10.7
+    version: 2.10.8
     condition: voltha.enabled
   - name: voltha-adapter-openonu
     repository: file://../voltha-adapter-openonu
-    version: 2.9.8
+    version: 2.9.9
     condition: voltha-adapter-openonu.enabled
   - name: voltha-adapter-openolt
     repository: file://../voltha-adapter-openolt
-    version: 2.10.6
+    version: 2.10.7
     condition: voltha-adapter-openolt.enabled
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 2204589..674d8f2 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha"
-version: "2.10.7"
+version: "2.10.8"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index fa5731b..807faa1 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -93,6 +93,7 @@
             - "--banner"
             - "--kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }}"
             - "--rpc_timeout={{ tpl .Values.rw_core.rpc_timeout . }}"
+            - "--flow_timeout={{ tpl .Values.rw_core.flow_timeout . }}"
             - "--internal_timeout={{ tpl .Values.rw_core.internal_timeout . }}"
             - "--event_topic={{ .Values.rw_core.topics.event_topic }}"
             - "--log_level={{ $log_level }}"
diff --git a/voltha/values.yaml b/voltha/values.yaml
index c2dd843..345f088 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -28,6 +28,7 @@
   image_pullPolicy: "Always"
   rw_core:
     rpc_timeout: "30s"
+    flow_timeout: "30s"
     internal_timeout: "30s"
   # Configure Log Correlation
   log_correlation:
@@ -88,6 +89,7 @@
 rw_core:
   log_level: '{{ .Values.global.log_level }}'
   rpc_timeout: '{{ .Values.global.rw_core.rpc_timeout }}'
+  flow_timeout: '{{ .Values.global.rw_core.flow_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 }}"
@@ -112,7 +114,7 @@
   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 }}3.0.0{{- end }}{{- else }}3.0.0{{- end }}'
+    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}3.0.1{{- end }}{{- else }}3.0.1{{- end }}'
     pullPolicy: '{{ .Values.global.image_pullPolicy }}'
 
 ingress: