diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index ea3f20d..efbade5 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.10.1"
+version: "2.10.2"
 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.2.4"
+appVersion: "2.2.6"
diff --git a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
index 2360d84..f36292c 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
@@ -100,6 +100,7 @@
             - "--log_correlation_enabled={{ .Values.global.log_correlation.enabled }}"
             - "--allowed_onu_vendors={{ template "allowed_onu_vendors" . }}"
             - "--metrics_enabled={{ .Values.global.metrics.enabled }}"
+            - "--extended_omci_support_enabled={{ .Values.global.extended_omci_support.enabled }}"
             - "--mib_audit_interval={{ .Values.global.mib_audit.interval }}"
             - "--alarm_audit_interval={{ .Values.global.alarm_audit.interval }}"
             - "--uni_port_mask={{ .Values.adapter_open_onu.uni_port_mask }}"
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index 374e857..c2c6cac 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -48,6 +48,9 @@
   # Configure Performance Metrics
   metrics:
     enabled: true
+  # Configure Extended OMCI Support
+  extended_omci_support:
+    enabled: false
   # Configure Mib Audit
   mib_audit:
   # configure "0s" to disable Mib Audit
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 33268f0..248d5dd 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -28,7 +28,7 @@
 name: voltha-stack
 
 appVersion: "2.10-dev"
-version: 2.10.4
+version: 2.10.5
 
 dependencies:
   - name: voltha
@@ -37,7 +37,7 @@
     condition: voltha.enabled
   - name: voltha-adapter-openonu
     repository: file://../voltha-adapter-openonu
-    version: 2.10.1
+    version: 2.10.2
     condition: voltha-adapter-openonu.enabled
   - name: voltha-adapter-openolt
     repository: file://../voltha-adapter-openolt