diff --git a/README.md b/README.md
index a521d28..e2ea58f 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,20 @@
 helm install --namespace voltha --name voltha-adapter-openonu ./voltha-adapter-openonu
 ```
 
+#### Deploying Tracing PoD
+Optionally, a Jaeger tracing stack based all-in-one PoD can be deployed in voltha
+setup to collect and analyze execution traces generated by various Voltha containers
+for execution time analysis and troubleshooting. Refer to below links for more details
+on Open Tracing approach:
+
+[Open Tracing](https://opentracing.io/)
+[Jaeger Distributed Tracing Stack](https://www.jaegertracing.io/)
+
+To install the Voltha Tracing PoD use:
+```shell
+helm install --namespace voltha --name voltha-tracing ./voltha-tracing
+```
+
 ### Kafka and Etcd
 
 VOLTHA relies on [Kafka](https://kafka.apache.org/) for inter-component
diff --git a/VERSION b/VERSION
index 35cee72..69fa968 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.3
+2.5.0-dev
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index da69f6c..8f99f5c 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.5.7"
+version: "2.6.0"
 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.4"
+appVersion: "2.5"
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index 99007b0..1ddf17f 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -98,6 +98,9 @@
             - "--current_replica={{ .Values.replicas.current_replica }}"
             - "--total_replica={{ .Values.replicas.total_replica }}"
             - "--probe_address=:8080"
+            - "--trace_enabled={{ .Values.tracing.enabled }}"
+            - "--trace_agent_address={{ .Values.services.tracing_agent.address }}"
+            - "--log_correlation_enabled={{ .Values.log_correlation.enabled }}"
           {{- if .Values.securityContext.enabled }}
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index cc953f9..788c216 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -56,10 +56,22 @@
   etcd:
     address: etcd:2379
 
+  # Define Tracing Agent connection details
+  tracing_agent:
+    address: jaeger-agent:6831
+
 # Expose the golang pprof webserver, if enabled
 profiler:
   enabled: false
 
+# Configure Log Correlation
+log_correlation:
+  enabled: true
+
+# Configure Tracing
+tracing:
+  enabled: true
+
 # Define the recplica count for everything
 replicas:
   current_replica: 1
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 670d206..435a3ba 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha"
-version: "2.5.5"
+version: "2.6.0"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"
@@ -33,4 +33,4 @@
 
 # app version applies to multiple components with potentially different
 # container image versions
-appVersion: "2.4"
+appVersion: "2.5"
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 5b126ea..1fc648f 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -97,6 +97,9 @@
             - "--timeout_request={{ tpl .Values.rw_core.timeout_request . }}"
             - "--log_level={{ $log_level }}"
             - "--probe_address=:8080"
+            - "--trace_enabled={{ .Values.tracing.enabled }}"
+            - "--trace_agent_address={{ .Values.services.tracing_agent.address }}"
+            - "--log_correlation_enabled={{ .Values.log_correlation.enabled }}"
           ports:
             - containerPort: 50057
               name: grpc
diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index d0e5715..7aae6f2 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -87,6 +87,9 @@
         - "--kv_store_request_timeout=60s"
         - "--log_level={{ $log_level }}"
         - "--probe=:8080"
+        - "--trace_enabled={{ .Values.tracing.enabled }}"
+        - "--trace_agent_address={{ .Values.services.tracing_agent.address }}"
+        - "--log_correlation_enabled={{ .Values.log_correlation.enabled }}"
         {{- if .Values.securityContext.enabled }}
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/voltha/values.yaml b/voltha/values.yaml
index bacf496..8305d01 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -53,6 +53,10 @@
   etcd:
     address: etcd:2379
 
+  # Define Tracing Agent connection details
+  tracing_agent:
+    address: jaeger-agent:6831
+
   # Define the list of controllers to connect to
   controller:
     - address: onos-openflow:6653
@@ -61,7 +65,15 @@
 profiler:
   enabled: false
 
-# Define the recplica count for everything
+# Configure Log Correlation
+log_correlation:
+  enabled: true
+
+# Configure Tracing
+tracing:
+  enabled: false
+
+# Define the replica count for everything
 replicas:
   # For R/W cores the templates translate the number of replicas
   # into the number of RW core pairs with two pods per pair
@@ -84,11 +96,11 @@
   ofagent:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-ofagent-go'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}1.2.1{{- end }}{{- else }}1.2.1{{- end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}1.3.0{{- end }}{{- else }}1.3.0{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   rw_core:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-rw-core'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.4.2{{- end }}{{- else }}2.4.2{{- end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.5.1{{- end }}{{- else }}2.5.1{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'