diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 8f99f5c..884d100 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.6.0"
+version: "2.6.1"
 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: "2.5"
+appVersion: "2.5.4"
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index 1ddf17f..55feb6d 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -101,6 +101,7 @@
             - "--trace_enabled={{ .Values.tracing.enabled }}"
             - "--trace_agent_address={{ .Values.services.tracing_agent.address }}"
             - "--log_correlation_enabled={{ .Values.log_correlation.enabled }}"
+            - "--omcc_encryption={{ .Values.defaults.omcc_encryption }}"
           {{- if .Values.securityContext.enabled }}
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 788c216..c0c73ce 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -30,6 +30,8 @@
   # If you're running multiple voltha stacks the this value
   # should be unique across the stacks.
   kv_store_data_prefix: "service/voltha"
+  #enable OMCC encryption
+  omcc_encryption: false
 
 # Default security context under which the containers run
 securityContext: