diff --git a/Makefile b/Makefile
index b9f8ce4..e8a029e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
 
 # Other repos with documentation to include.
 # edit the `git_refs` file with the commit/tag/branch that you want to use
-OTHER_REPO_DOCS ?= bbsim cord-tester ofagent-go openolt voltctl voltha-openolt-adapter voltha-openonu-adapter voltha-openonu-adapter-go voltha-protos voltha-system-tests device-management-interface voltha-helm-charts
+OTHER_REPO_DOCS ?= bbsim cord-tester ofagent-go openolt voltctl voltha-openolt-adapter voltha-openonu-adapter-go voltha-protos voltha-system-tests device-management-interface voltha-helm-charts
 
 # Static docs, built by other means (usually robot framework)
 STATIC_DOCS    := _static/voltha-system-tests _static/cord-tester
diff --git a/VERSION b/VERSION
index e43686a..bcd0f91 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.8.6
+2.8.7
diff --git a/conf.py b/conf.py
index 05a442a..7969551 100644
--- a/conf.py
+++ b/conf.py
@@ -56,6 +56,7 @@
     'sphinxcontrib.spelling',
     "sphinx_multiversion",
     "sphinx.ext.intersphinx",
+    "sphinxcontrib.openapi",
 ]
 
 # API documentation
diff --git a/git_refs b/git_refs
index f9840b5..08b04c4 100644
--- a/git_refs
+++ b/git_refs
@@ -11,17 +11,15 @@
 
 _REPO NAME_             _DIR_    _REF_
 
-bbsim                        /        master
-cord-tester                  /        master
-ofagent-go                   /        master
-openolt                      /        master
-pyvoltha                     /        master
-voltctl                      /        master
-voltha-go                    /        master
-voltha-openolt-adapter       /        master
-voltha-openonu-adapter       /        master
-voltha-openonu-adapter-go    /        master
-voltha-protos                /        master
-voltha-system-tests          /        master
-device-management-interface  /        master
-voltha-helm-charts           /        master
+bbsim                        /        a9875ddcbaf846e970826004db51f9a15a465911
+cord-tester                  /        44ef9be3bf8f18fd64ea8cf44b5171ca049b9ef9
+ofagent-go                   /        voltha-2.8
+openolt                      /        voltha-2.8
+voltctl                      /        voltha-2.8
+voltha-go                    /        voltha-2.8
+voltha-openolt-adapter       /        voltha-2.8
+voltha-openonu-adapter-go    /        voltha-2.8
+voltha-protos                /        9c3e1c8dc6a867d0f552861d2b36d0b44ca68fb1
+voltha-system-tests          /        voltha-2.8
+device-management-interface  /        6bdb0f7eb9f3bca1842d01bb55625fafd70279fc
+voltha-helm-charts           /        voltha-2.8
diff --git a/index.rst b/index.rst
index eba22b8..6039904 100644
--- a/index.rst
+++ b/index.rst
@@ -44,8 +44,8 @@
 ---------
 
 Information about participating in the VOLTHA community and development process
-can be found on the `VOLTHA section of the CORD Wiki
-<https://wiki.opencord.org/display/CORD/VOLTHA>`_.
+can be found on the `VOLTHA section of the opennetworking Wiki
+<https://wiki.opennetworking.org/display/COM/VOLTHA>`_.
 
 
 .. toctree::
diff --git a/logging/centralised_log_analysis.rst b/logging/centralised_log_analysis.rst
index 5c1e94d..d935dc8 100644
--- a/logging/centralised_log_analysis.rst
+++ b/logging/centralised_log_analysis.rst
@@ -14,8 +14,8 @@
 fluentd-elasticsearch) setup for voltha enables the Operator to push
 logs from all VOLTHA components.
 
-To deploy VOLTHA with the EFK stack follow
-`these instructions <../voltha-helm-charts#enable-log-correlation-in-voltha-optional>`_.
+To deploy VOLTHA with the EFK stack follow the paraghraph `Support-for-logging-and-tracing-(optional)`
+in the `voltha-helm-charts README <../voltha-helm-charts/README.md>`_.
 
 This will deploy Efk stack with a single node elasticsearch and
 kibana instance will be deployed and a fluentd-elasticsearch pod will be
diff --git a/operations/software-upgrade.rst b/operations/software-upgrade.rst
index bda7420..d62feb2 100644
--- a/operations/software-upgrade.rst
+++ b/operations/software-upgrade.rst
@@ -108,7 +108,7 @@
 #. delete all the OLTs managed by the stack via VOLTHA gRPC API.
 #. upgrade the stack version via `helm` upgrade command and the correct version of the `voltha-stack` chart.
 
-Details on the `helm` commands can be found in the `voltha-helm-charts README file <voltha-helm-charts/README.md>`_
+Details on the `helm` commands can be found in the voltha-helm-charts README file <voltha-helm-charts/README.md>_
 
 If the API change is between the `openolt adapter` and the `openolt agent` on the OLT hardware please refer to section
 :ref:`OpenOLT Agent Update <openolt-update>`.
@@ -180,7 +180,7 @@
 #. re-provision the subscribers
 #. iterate over steps 2,3,4,5,6 for each stack connected to the ETCD cluster you want to update.
 
-Details on the `helm` commands for the voltha stack can be found in the `voltha-helm-charts README file <voltha-helm-charts/README.md>`_
+Details on the `helm` commands for the voltha stack can be found in the `voltha-helm-charts README file <../voltha-helm-charts/README.md>`_
 
 Following is an example on how to deploy a new 3 node ETCD cluster:
 
diff --git a/overview/workflows.rst b/overview/workflows.rst
index dfe9497..8a0a149 100644
--- a/overview/workflows.rst
+++ b/overview/workflows.rst
@@ -20,8 +20,8 @@
 Given that NEM is not available in a plain VOLTHA deployment the user has to ensure proper config in the right places,
 and then triggering of api's themselves.
 
-To deploy a specific workflow follow the steps in the voltha-helm-charts
-`README <./../voltha-helm-charts/README.md#deploying-a-different-workflow>`_.
+To deploy a specific workflow follow the steps under `deploying-a-different-workflow` in the `voltha-helm-charts
+README <../voltha-helm-charts/README.md>`_.
 
 A workflow in VOLTHA entails different elements: Customer tag allocation, Technology profile, Bandwidth profile,
 Flow and Group Management
@@ -43,8 +43,11 @@
 Subscriber Services on an OpenFlow managed Logical Switch overlaid upon an OLT
 or other technology specific platform.
 
-More on Technology profiles here:
-https://wiki.opencord.org/display/CORD/Technology+Profiles#TechnologyProfiles-IntroductiontoTechnologyProfiles
+More information on Technology profiles can be found here:
+`2018/03/22 VOLTHA TST on Technology profile <https://youtu.be/L0JBJ3R1Mag>`_
+`VOLTHA technical notes on Technology profile <https://wiki-archive.opencord.org/attachments/4981667/4981671.docx>`_
+`VOLTHA Implementation of Technology profiles <https://wiki-archive.opencord.org/attachments/4981667/4981670.docx>`_
+`Technology profile instance example <https://wiki-archive.opencord.org/Technology-Profile-Instance_4982088.html>`_
 
 Technology profiles in VOLTHA are stored in ETCD. If you want to load a custom
 Technology profile in your stack you can do so by:
diff --git a/release_notes/release_process.rst b/release_notes/release_process.rst
index 632dd7e..827008d 100644
--- a/release_notes/release_process.rst
+++ b/release_notes/release_process.rst
@@ -153,6 +153,6 @@
 - ofagent-go
 - voltha-go (rw_core)
 - voltha-openolt-adapter
-- voltha-openonu-adapter
+- voltha-openonu-adapter-go
 - voltha-onos (includes ONOS Apps)
 
diff --git a/release_notes/voltha_2.8.rst b/release_notes/voltha_2.8.rst
index 1972c0a..f2b3d12 100644
--- a/release_notes/voltha_2.8.rst
+++ b/release_notes/voltha_2.8.rst
@@ -206,7 +206,7 @@
 - `voltha-go <https://gerrit.opencord.org/gitweb?p=voltha-go.git;a=tree;h=refs/heads/voltha-2.8>`_ - ``2.9.3`` with chart ``2.9.7``
 - `ofagent-go <https://gerrit.opencord.org/gitweb?p=ofagent-go.git;a=tree;h=refs/heads/voltha-2.8>`_ - ``1.6.5``  with chart ``2.9.7``
 - `voltctl <https://gerrit.opencord.org/gitweb?p=voltctl.git;a=tree>`_ - ``1.6.11``
-- `voltha-openolt-adapter <https://gerrit.opencord.org/gitweb?p=voltha-openolt-adapter.git;a=tree;h=refs/heads/voltha-2.8>`_ - ``3.5.4`` with chart ``2.9.4``
+- `voltha-openolt-adapter <https://gerrit.opencord.org/gitweb?p=voltha-openolt-adapter.git;a=tree;h=refs/heads/voltha-2.8>`_ - ``3.5.5`` with chart ``2.9.5``
 - `voltha-openonu-adapter-go <https://gerrit.opencord.org/gitweb?p=voltha-openonu-adapter-go.git;a=tree;h=refs/heads/voltha-2.8>`_ - ``1.3.12`` with chart ``2.8.9``
 - `voltha-onos <https://gerrit.opencord.org/gitweb?p=voltha-onos.git;a=tree;h=refs/heads/voltha-2.8>`_ -  ``5.0.1`` with chart ``0.1.16``
 - `openolt agent <https://gerrit.opencord.org/gitweb?p=openolt.git;a=tree;h=refs/heads/voltha-2.8>`_ - ``3.4.9``
@@ -220,7 +220,7 @@
 ++++++++++++++++++++
 This section refers to the macro charts to deploy the required infrastructure and a (or many) VOLTHA stacks:
 - Voltha-infra: ``2.8.0``
-- Voltha-stack: ``2.8.5``
+- Voltha-stack: ``2.8.6``
 
 Openolt Agent packages:
 +++++++++++++++++++++++