diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index 8cf0355..e9475ec 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.8.5
-appVersion: 1.12.9
+version: 4.8.6
+appVersion: 1.12.10
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index bb767c7..1420de7 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.11.1"
+version: "2.11.2"
 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.2.2"
+appVersion: "4.2.5"
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index 9010d7c..a9b8fad 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -135,6 +135,7 @@
             - "--omcc_encryption={{ .Values.global.omcc_encryption }}"
             - "--enable_onu_stats={{ .Values.global.enable_onu_stats }}"
             - "--enable_gem_stats={{ .Values.global.enable_gem_stats }}"
+            - "--check_onu_exist_on_discovery={{ tpl .Values.adapter_open_olt.check_onu_exist_on_discovery . }}"
           {{- if .Values.securityContext.enabled }}
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 0bd2e31..a7c9f56 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -31,6 +31,7 @@
     timeout: "5s"
     heartbeat_check_interval: "15s"
     heartbeat_fail_interval: "31s"
+    check_onu_exist_on_discovery: false
 
   #enable OMCC encryption
   omcc_encryption: false
@@ -98,6 +99,7 @@
   kv_store_data_prefix: 'service/{{ .Values.global.stack_name }}_voltha'
   heartbeat_check_interval: '{{ .Values.global.adapter_open_olt.heartbeat_check_interval }}'
   heartbeat_fail_interval: '{{ .Values.global.adapter_open_olt.heartbeat_fail_interval }}'
+  check_onu_exist_on_discovery: '{{ .Values.global.adapter_open_olt.check_onu_exist_on_discovery }}' 
   rpc_timeout: '{{ .Values.global.rpc_timeout }}'
   endpoints:
     # core_endpoint: '{{ .Values.global.adapter_open_olt.core_endpoint }}'
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 248d5dd..87c2a16 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -28,12 +28,12 @@
 name: voltha-stack
 
 appVersion: "2.10-dev"
-version: 2.10.5
+version: 2.10.6
 
 dependencies:
   - name: voltha
     repository: file://../voltha
-    version: 2.11.1
+    version: 2.11.2
     condition: voltha.enabled
   - name: voltha-adapter-openonu
     repository: file://../voltha-adapter-openonu
@@ -41,5 +41,5 @@
     condition: voltha-adapter-openonu.enabled
   - name: voltha-adapter-openolt
     repository: file://../voltha-adapter-openolt
-    version: 2.11.1
+    version: 2.11.2
     condition: voltha-adapter-openolt.enabled
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index e507eba..87bdd2e 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha"
-version: "2.11.1"
+version: "2.11.2"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 2dccaaa..f0118f9 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -114,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.1.2{{- end }}{{- else }}3.1.2{{- end }}'
+    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}3.1.5{{- end }}{{- else }}3.1.5{{- end }}'
     pullPolicy: '{{ .Values.global.image_pullPolicy }}'
 
 ingress: