diff --git a/VERSION b/VERSION
index fb2c076..94f15e9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.13.0
+2.13.1
diff --git a/conf.py b/conf.py
index 19ee0bb..13415f7 100644
--- a/conf.py
+++ b/conf.py
@@ -289,7 +289,8 @@
     "vol-ger": ("https://gerrit.opencord.org/plugins/gitiles/%s", "gerrit::%s"),
     "vol-git": ("https://github.com/opencord/%s", "git::%s"),
     # https://mvnrepository
-    "mvn-cord": ("http://mvnrepository.com/artifact/org.opencord/%s", "mvn::%s"),
+    "mvn-cord": ("https://mvnrepository.com/artifact/org.opencord/%s", "mvn::%s"),
+    "vol-docker": ("https://hub.docker.com/r/voltha/%s", "%s"),
 }
 
 # -- Options for inlining a constant value -----------------------------------
diff --git a/howto/code/lint/fix-errors/index.rst b/howto/code/lint/fix-errors/index.rst
index e48d6a8..20289fc 100644
--- a/howto/code/lint/fix-errors/index.rst
+++ b/howto/code/lint/fix-errors/index.rst
@@ -4,5 +4,5 @@
 .. toctree::
     :glob:
 
-   sphinx/spelling/*
-   yamllint/*
+   sphinx/spelling/spelling-exclusions.rst
+   yamllint/long-lines.rst
diff --git a/howto/code/lint/fix-errors/sphinx/spelling/index.rst b/howto/code/lint/fix-errors/sphinx/spelling/index.rst
deleted file mode 100644
index fe040a5..0000000
--- a/howto/code/lint/fix-errors/sphinx/spelling/index.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-LINT: Spelling Errors
-=====================
-
-.. toctree::
-   :maxdepth: 2
-
-   spelling-exclusions
diff --git a/howto/code/lint/fix-errors/yamllint/long-lines.rst b/howto/code/lint/fix-errors/yamllint/long-lines.rst
index e4d16bf..2368905 100644
--- a/howto/code/lint/fix-errors/yamllint/long-lines.rst
+++ b/howto/code/lint/fix-errors/yamllint/long-lines.rst
@@ -12,4 +12,4 @@
 
 .. seealso::
 
-- https://yaml-multiline.info/
+   - https://yaml-multiline.info/
diff --git a/howto/code/lint/index.rst b/howto/code/lint/index.rst
index 01e4f71..4113b3d 100644
--- a/howto/code/lint/index.rst
+++ b/howto/code/lint/index.rst
@@ -4,8 +4,10 @@
 .. toctree::
    :maxdepth: 1
 
-   lint-helm.rst
-   fix-errors
+   lint-chart
+   lint-helm
+   lint-robot
+   fix-errors/index
    pre-commit
 
 
@@ -40,7 +42,7 @@
 
 .. seealso::
 
-- :ref:`Makefile Target lint-chart`
-- :ref:`Makefile Target lint-helm`
-- :ref:`Makefile Target lint-robot`
-- :ref:`Makefile Target lint-pre-commit`
+   - :ref:`Makefile Target lint-chart`
+   - :ref:`Makefile Target lint-helm`
+   - :ref:`Makefile Target lint-robot`
+   - :ref:`Makefile Target lint-pre-commit`
diff --git a/howto/code/linting.rst b/howto/code/linting.rst
index 5bf8524..7fd223e 100644
--- a/howto/code/linting.rst
+++ b/howto/code/linting.rst
@@ -58,9 +58,9 @@
 
 .. seealso::
 
-- :ref:`Makefile Target lint-chart`
-- :ref:`Makefile Target lint-helm`
-- :ref:`Makefile Target lint-robot`
+   - :ref:`Makefile Target lint-chart`
+   - :ref:`Makefile Target lint-helm`
+   - :ref:`Makefile Target lint-robot`
 
 |
 
@@ -166,8 +166,6 @@
 --------
 
 - lint-doc8-all target dependency will create a `python virtual env <https://wiki.opencord.org>`_
-- python 3.10+ requires `virtual env patching <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/patches/>`_ (dynamic, applied when needed).
-- `makefiles/patches/include.mk <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/makefiles-orig/patches/>`__
 
 |
 
@@ -192,8 +190,6 @@
 Notes:
 
 - lint-flake8-all target dependency will create a `python virtual env <https://wiki.opencord.org>`_
-- python 3.10+ requires `virtual env patching <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/patches/>`_ (dynamic, applied when needed).
-- `makefiles/patches/include.mk <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/makefiles-orig/patches/>`__
 
 |
 
@@ -269,7 +265,6 @@
 
 - pylint the --py3k option is no longer supported by v3.10+
 - lint-pylint-all target dependency will create a `python virtual env <https://wiki.opencord.org>`_
-- python 3.10+ requires `virtual env patching <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/patches/>`_ (dynamic, applied when needed).
 
 |
 
diff --git a/howto/code/voltha-protos.rst b/howto/code/voltha-protos.rst
index 3dfa20a..17aca59 100644
--- a/howto/code/voltha-protos.rst
+++ b/howto/code/voltha-protos.rst
@@ -88,7 +88,7 @@
      - Cleanup syntax issues in golang source that will fail your pending commit
    * - go mod vendor
      - | Update sources and dependencies beneath the vendor/ directory.
-       | See also `go-mod-vendor <https://go.dev/ref/mod#go-mod-vendor>`_, `Packages & Modules <https://golangbyexample.com/packages-modules-go-second/>`_
+       | See also `go-mod-vendor <https://go.dev/ref/mod#go-mod-vendor>`_, `Packages & Modules <https://golangbot.com/go-packages/>`_
    * - make build
      - Compile with updated module dependencies.
    * - make test
diff --git a/howto/docs.voltha.org/quickstart.rst b/howto/docs.voltha.org/quickstart.rst
index 73096ee..e012f3a 100644
--- a/howto/docs.voltha.org/quickstart.rst
+++ b/howto/docs.voltha.org/quickstart.rst
@@ -48,12 +48,12 @@
 .. code-block:: shell-session
    :caption: Launch a browser for viewing local edits
    :linenos:
-   :emphasize-lines: 4
+   :emphasize-lines: 2
 
    cd voltha-docs
    make reload
 
-- source edit: modify reStructuredText (RST) sources
+- Source edit: modify reStructuredText (RST) sources
 - Modify content to taste
 
 Invoke checkin tests locally
diff --git a/howto/release/charts/voltha-openolt-adapter.rst b/howto/release/charts/voltha-openolt-adapter.rst
index e3aeb73..1a185f6 100644
--- a/howto/release/charts/voltha-openolt-adapter.rst
+++ b/howto/release/charts/voltha-openolt-adapter.rst
@@ -63,4 +63,4 @@
 
 .. seealso::
 
-`voltha-docs::charts <../charts/index>`
+   `voltha-docs::charts <../charts/index>`
diff --git a/howto/release/charts/voltha-openonu-adapter.rst b/howto/release/charts/voltha-openonu-adapter.rst
index bd4ad85..4683158 100644
--- a/howto/release/charts/voltha-openonu-adapter.rst
+++ b/howto/release/charts/voltha-openonu-adapter.rst
@@ -65,4 +65,4 @@
 
 .. seealso::
 
-`voltha-docs::charts <../charts/index>`
+   `voltha-docs::charts <../charts/index>`
diff --git a/howto/release/ci-management/create_lts_view.rst b/howto/release/ci-management/create_lts_view.rst
deleted file mode 100644
index 0d76365..0000000
--- a/howto/release/ci-management/create_lts_view.rst
+++ /dev/null
@@ -1,67 +0,0 @@
-Jenkins job views: VOLTHA-LTS
-=============================
-
-Intent
-------
-
-With each new VOLTHA LTS release (v2.11, v2.8) a jenkins view will need
-to be created to allow running regression tests.  This page will document
-those instructions.
-
-LTS Folder
-----------
-Visit `jenkins::Dashboard <https://jenkins.opencord.org>`_ and create a
-VOLTHA-LTS folder if one does not exist.
-
-- Click ``New Item`` in the left margin.
-- For ``item name`` type in VOLTHA-LTS
-- Click Folder or Copy from an existing folder.
-- Uncheck "Add to current view"
-- Click the OK button
-
-Jenkins job view: global
-------------------------
-
-Two view creation options are available
-
-- global - all jobs are selectable
-- local  - simple list creation
-
-Global job view creation
-------------------------
-
-This option will add a named view in the `jenkins::Dashboard soup <https://jenkins.opencord.org/>`__ at the top.
-
-- Visit `jenkins::Dashboard <https://jenkins.opencord.org>`_
-- Click "New View" in the left margin.
-- Name view for the current release voltha-2.12
-- Select type "List View"
-- Click the "create" button
-- Accept basic values to begin configuring
-- Add an appropraite job Description.
-- Scroll down to "Job Filters"
-
-  - Selelect individual jobs to hardcode an explicit list.
-  - Select "Use a regular expression to pattern match", value: .*voltha-2.12.*
-
-- Removing voltha-2.8 view deleted the "Coverage" and "Favorite" columns.
-- The voltha-2.12 view is complete for now.
-- Click the [ok] button
-
-Add new release job view in the LTS folder
-------------------------------------------
-
-- Visit `jenkins::Dashboard <https://jenkins.opencord.org>`_
-- Click the `VOLTHA-LTS folder <https://jenkins.opencord.org/job/VOLTHA-LTS/>`_ in the center panel beneath job view soup at the top.
-- Click "New View" in the left margin.
-- Add view name: VOLTHA-2.12
-- Select "Include a global view"
-- Click the "create" button
-- Type in an appropraite Description.
-- View name should contain the global view name VOLTHA-2.12 created earlier
-- Click "OK"
-
-Access LTS jobs
----------------
-- Visit the `VOLTHA-LTS job folder <https://jenkins.opencord.org/job/VOLTHA-LTS/>`__
-- Select or bookmark job view `VOLTHA-2.12 <https://jenkins.opencord.org/job/VOLTHA-LTS/view/voltha-2.12/>`_
diff --git a/howto/release/ci-management/index.rst b/howto/release/ci-management/index.rst
index d812ab8..8805543 100644
--- a/howto/release/ci-management/index.rst
+++ b/howto/release/ci-management/index.rst
@@ -10,7 +10,6 @@
    :maxdepth: 1
 
    clone_and_branch_testing
-   create_lts_view
    jjb_software_upgrades
 
    clone_testing
diff --git a/howto/release/components/index.rst b/howto/release/components/index.rst
index 7001c48..54c537f 100644
--- a/howto/release/components/index.rst
+++ b/howto/release/components/index.rst
@@ -6,6 +6,7 @@
 
    igmpproxy/index
    kafka/index
+   kafka-onos/index
    maclearner/index
    mcast/index
    olt/index
diff --git a/howto/release/index.rst b/howto/release/index.rst
index 507ec11..8f1c827 100644
--- a/howto/release/index.rst
+++ b/howto/release/index.rst
@@ -13,6 +13,7 @@
    components/index
    hierarchy/index
    jenkins/index
+   jjb/index
    voltha-docs/index
    post-release/index
 
diff --git a/howto/release/repositories/ci-management/index.rst b/howto/release/repositories/ci-management/index.rst
index 38c9ae2..ecf40fe 100644
--- a/howto/release/repositories/ci-management/index.rst
+++ b/howto/release/repositories/ci-management/index.rst
@@ -4,3 +4,5 @@
 .. toctree::
    :maxdepth: 1
 
+   misc
+   release
diff --git a/howto/release/repositories/go_mod_update.rst b/howto/release/repositories/go_mod_update.rst
deleted file mode 100644
index c2dc1b7..0000000
--- a/howto/release/repositories/go_mod_update.rst
+++ /dev/null
@@ -1 +0,0 @@
-golang_gofmt_syntax.rst
diff --git a/howto/release/repositories/pod-configs/index.rst b/howto/release/repositories/pod-configs/index.rst
deleted file mode 100644
index 6dd3133..0000000
--- a/howto/release/repositories/pod-configs/index.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Repository: pod-configs
-=======================
-
-.. toctree::
-   :maxdepth: 1
-
diff --git a/howto/release/repositories/voltha-northbound-bbf-adapter/index.rst b/howto/release/repositories/voltha-northbound-bbf-adapter/index.rst
deleted file mode 100644
index be01503..0000000
--- a/howto/release/repositories/voltha-northbound-bbf-adapter/index.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Release repository: voltha-northbound-bbf-adapter
-=================================================
-
-- Prototyping repository still under development.
-
-  - Currently this repository does not participate in release.
diff --git a/howto/release/repositories/voltha-onos/index.rst b/howto/release/repositories/voltha-onos/index.rst
index abef329..36f2956 100644
--- a/howto/release/repositories/voltha-onos/index.rst
+++ b/howto/release/repositories/voltha-onos/index.rst
@@ -4,4 +4,7 @@
 .. toctree::
    :maxdepth: 1
 
+   dependencies
+   release
    resources
+   todo
diff --git a/howto/release/tasks/index.rst b/howto/release/tasks/index.rst
index 3e305e4..4a62ce5 100644
--- a/howto/release/tasks/index.rst
+++ b/howto/release/tasks/index.rst
@@ -41,3 +41,11 @@
 ----------
 
 - Update version string(s) for voltha-lib-go.
+
+.. toctree::
+   :maxdepth: 1
+
+   charts
+   copyright
+   go_mod_update
+   golang_gofmt_syntax
diff --git a/howto/release/voltha-docs/create_lts_view.rst b/howto/release/voltha-docs/create_lts_view.rst
deleted file mode 100644
index 5a60a53..0000000
--- a/howto/release/voltha-docs/create_lts_view.rst
+++ /dev/null
@@ -1,75 +0,0 @@
-Jenkins job views: VOLTHA-LTS
-=============================
-
-Intent
-------
-
-With each new VOLTHA LTS release (v2.11, v2.8) a jenkins view will need
-to be created to allow running regression tests.  This page will document
-those instructions.
-
-LTS Folder
-----------
-Visit `jenkins::Dashboard <https://jenkins.opencord.org>`_ and create a
-VOLTHA-LTS folder if one does not exist.
-
-- Click ``New Item`` in the left margin.
-- For ``item name`` type in VOLTHA-LTS
-- Click Folder or Copy from an existing folder.
-- Uncheck "Add to current view"
-- Click the OK button
-
-Jenkins job view: global
-------------------------
-
-Two view creation options are available
-
-- global - all jobs are selectable
-- local  - simple list creation
-
-Global job view creation
-------------------------
-
-- Visit `jenkins::Dashboard <https://jenkins.opencord.org>`_
-- Click "New View" in the left margin.
-- Name view for the current release VOLTHA-XXX
-- Select type "List View"
-- Accept basic values to begin configuring
-- Add an appropriate job Description.
-- Scroll down to "Job Filters"
-
-  - Selelect individual jobs
-  - Select "Use a regular expression to include jobs in the view", value: .*voltha-2.11.*
-
-- The voltha-2.8 view deleted the "Coverage" and "Favorite" columns.
-- The voltha-2.11 view is complete for now.
-- Click the "create" button
-
-Add job view in the LTS folder
-------------------------------
-
-- Visit `jenkins::Dashboard <https://jenkins.opencord.org>`_
-- Click the `VOLTHA-LTS folder <https://jenkins.opencord.org/job/VOLTHA-LTS/>`_ in center.
-- Click "New View" in the left margin.
-- Add view name: VOLTHA-2.11
-- Select "Include a global view"
-- Click the "create" button
-- Type in an appropriate Description.
-- View name should contain the global view name VOLTHA-2.11
-- Click "Apply"
-- Click "OK"
-
-Create job folder voltha-2.12 on the dashboard (not a view)
------------------------------------------------------------
-
-- Visit `jenkins::Dashboard <https://jenkins.opencord.org>`_
-- Click "New View" in the left margin.
-- Copy entry 'voltha-master'
-- New name: voltha-2.12
-- Click the "create" button
-- Dashboard Folder ``jenkins::voltha-2.12``
-
-Access LTS jobs
----------------
-- Visit the `VOLTHA-LTS job folder <https://jenkins.opencord.org/job/VOLTHA-LTS/>`__
-- Select or bookmark job view VOLTHA-2.11.
diff --git a/howto/release/voltha-docs/index.rst b/howto/release/voltha-docs/index.rst
index 3b2534f..acf2ef3 100644
--- a/howto/release/voltha-docs/index.rst
+++ b/howto/release/voltha-docs/index.rst
@@ -11,4 +11,3 @@
 
    release_notes
    release_history
-   create_lts_view
diff --git a/overview/contributing/jira_tickets.rst b/overview/contributing/jira_tickets.rst
index 0f381f5..76dc7e5 100644
--- a/overview/contributing/jira_tickets.rst
+++ b/overview/contributing/jira_tickets.rst
@@ -41,7 +41,7 @@
     - Note: Jenkins job logs will age out and disappear over time.
     - To prevent this view the job history panel in jenkins UI
 
-      - `View a jenkins job page <https://jenkins.opencord.org/view/vip/job/verify_bbsim_unit-test>`_
+      - `View a jenkins job page <https://jenkins.opencord.org/view/All%20Jobs/job/bbsim_scale_test/>`_
       - Two links are available in history (lower left corner), colored icon on the left and #job on the right.
       - Click the #job link to view job.
       - Top right corner will contain a clickable button "Keep this build forever".
@@ -68,7 +68,7 @@
      - Notes
    * - `VOL-5214 <https://lf-broadband.atlassian.net/browse/VOL-5214>`__
      - Jira ticket
-   * - `jenkins <https://jenkins.opencord.org/view/VOLTHA-2.X-Tests/job/periodic-voltha-etcd-test/>`_
+   * - `jenkins <https://jenkins.opencord.org/>`_
      - Capture job URLs to document errors and log messages.
    * - `gerrit:34854 <https://gerrit.opencord.org/c/ci-management/+/34854>`_
      - Capture gerrit patch URLs for state and job reconstruction.
diff --git a/release_notes/index.rst b/release_notes/index.rst
index 829012b..deb7fa7 100644
--- a/release_notes/index.rst
+++ b/release_notes/index.rst
@@ -4,6 +4,7 @@
 .. toctree::
    :maxdepth: 1
 
+   voltha_2.13.rst
    voltha_2.12.rst
    voltha_2.11.rst
    voltha_2.10.rst
@@ -15,5 +16,3 @@
    voltha_2.4.rst
    voltha_2.3.rst
    voltha_2.2.rst
-
-   template
diff --git a/release_notes/voltha_2.12.rst b/release_notes/voltha_2.12.rst
index 876e8f2..8598d3d 100644
--- a/release_notes/voltha_2.12.rst
+++ b/release_notes/voltha_2.12.rst
@@ -19,7 +19,7 @@
 
    * - Jira
      - Description
-   * - :jira-browse:`VOL-4949`
+   * - :jira-browse:`VOL-4949 <VOL-4949>`
      - Introduce DEVICE_BUSY reason in the UploadDebugInfoStatus DMI message
    * - :jira-browse:`VOL-4783 <VOL-4783>`
      - Introduce UploadDebugInformation RPC in DMI
@@ -119,7 +119,7 @@
      - Open onu adapter crashes during delete device
    * - :jira-browse:`VOL-5249 <VOL-5249>`
      - error loading onos image in voltha-onos-sanity_test
-   * - :jira-browse:`VOL-5236 <VOL-5236>`_
+   * - :jira-browse:`VOL-5236 <VOL-5236>`
      - onu adapter should gracefully reset vlan config fsm on onu down
    * - :jira-browse:`VOL-5223 <VOL-5223>`
      - OpenOnuAdapterGo: Alarm Mgr has to handle unconfigured MEs responses from ONT during Alarm Audit.
@@ -240,92 +240,92 @@
      -
      -
    * - `aaa <https://gerrit.opencord.org/gitweb?p=aaa.git;a=summary>`_
-     - :mvn-cord:`2.11.0 <aaai/2.11.0>`_
-     - :mvn-cord:`X <aaa-api/2.11.0>`_
-     - :mvn-cord:`X <aaa-app/2.11.0>`_
-     - :mvn-cord:`X <aaa/2.11.0>`_
-     - :vol-ger:`X </aaa/+/refs/tags/2.11.0>`_
-     - :vol-git:`X </aaa/releases/tag/2.11.0>`_
+     - :mvn-cord:`2.11.0 <aaai/2.11.0>`
+     - :mvn-cord:`X <aaa-api/2.11.0>`
+     - :mvn-cord:`X <aaa-app/2.11.0>`
+     - :mvn-cord:`X <aaa/2.11.0>`
+     - :vol-ger:`X <aaa/+/refs/tags/2.11.0>`
+     - :vol-git:`X <aaa/releases/tag/2.11.0>`
      -
    * - `bng <https://gerrit.opencord.org/gitweb?p=bng.git;a=summary>`__
-     - :mvn-cord:`2.5.1 </bng/2.5.1>`_
-     - :mvn-cord:`X </bng-api/2.5.1>`_
-     - :mvn-cord:`X </bng-app/2.5.1>`_
-     - :mvn-cord:`X </bng/2.5.1>`_
-     - :vol-ger:`X </bng/+/refs/tags/2.5.1>`_
-     - :vol-git:`X </bng/releases/tag/2.5.1>`_
+     - :mvn-cord:`2.5.1 <bng/2.5.1>`
+     - :mvn-cord:`X <bng-api/2.5.1>`
+     - :mvn-cord:`X <bng-app/2.5.1>`
+     - :mvn-cord:`X <bng/2.5.1>`
+     - :vol-ger:`X <bng/+/refs/tags/2.5.1>`
+     - :vol-git:`X <bng/releases/tag/2.5.1>`
      -
    * - `dhcpl2relay <https://gerrit.opencord.org/gitweb?p=dhcpl2relay.git;a=summary>`__
-     - :mvn-cord:`2.11.0 </dhcpl2relay/2.11.0>`_
-     - :mvn-cord:`X </dhcpl2relay-api/2.11.0>`_
-     - :mvn-cord:`X </dhcpl2relay-app/2.11.0>`_
-     - :mvn-cord:`X </dhcpl2relay>`_
-     - :vol-ger:`X </dhcpl2relay/+/refs/tags/2.11.0>`_
-     - :vol-git:`X </dhcpl2relay/releases/tag/2.11.0>`_
+     - :mvn-cord:`2.11.0 <dhcpl2relay/2.11.0>`
+     - :mvn-cord:`X <dhcpl2relay-api/2.11.0>`
+     - :mvn-cord:`X <dhcpl2relay-app/2.11.0>`
+     - :mvn-cord:`X <dhcpl2relay>`
+     - :vol-ger:`X <dhcpl2relay/+/refs/tags/2.11.0>`
+     - :vol-git:`X <dhcpl2relay/releases/tag/2.11.0>`
      -
    * - `igmpproxy <https://gerrit.opencord.org/gitweb?p=igmpproxy.git;a=summary>`__
-     - :mvn-cord:`2.9.0 </onos-app-igmpproxy/2.9.0>`_
-     - :mvn-cord:`X </onos-app-igmpproxy-api/2.9.0>`_
-     - :mvn-cord:`X </onos-app-igmpproxy-app/2.9.0>`_
-     - :mvn-cord:`X </onos-app-igmpproxy/2.9.0>`_
-     - :vol-ger:`X </igmpproxy/+/refs/tags/2.9.0>`_
-     - :vol-git:`X </igmpproxy/releases/tag/2.9.0>`_
+     - :mvn-cord:`2.9.0 <onos-app-igmpproxy/2.9.0>`
+     - :mvn-cord:`X <onos-app-igmpproxy-api/2.9.0>`
+     - :mvn-cord:`X <onos-app-igmpproxy-app/2.9.0>`
+     - :mvn-cord:`X <onos-app-igmpproxy/2.9.0>`
+     - :vol-ger:`X <igmpproxy/+/refs/tags/2.9.0>`
+     - :vol-git:`X <igmpproxy/releases/tag/2.9.0>`
      -
    * - `kafka <https://gerrit.opencord.org/gitweb?p=kafka-onos.git;a=summary>`__
-     - :mvn-cord:`2.13.2 </kafka/2.13.2>`_
-     - :mvn-cord:`X </kafka-api/2.13.2>`_
-     - :mvn-cord:`X </kafka-app/2.13.2>`_
-     - :mvn-cord:`X </kafka/2.13.2>`_
-     - :vol-ger:`X </kafka-onos/+/refs/tags/2.13.2>`_
-     - :vol-git:`X </kafka-onos/releases/tag/2.13.2>`_
+     - :mvn-cord:`2.13.2 <kafka/2.13.2>`
+     - :mvn-cord:`X <kafka-api/2.13.2>`
+     - :mvn-cord:`X <kafka-app/2.13.2>`
+     - :mvn-cord:`X <kafka/2.13.2>`
+     - :vol-ger:`X <kafka-onos/+/refs/tags/2.13.2>`
+     - :vol-git:`X <kafka-onos/releases/tag/2.13.2>`
      - ``N``
-   * - :vol-ger:`maclearner </mac-learning>`_
-     - :mvn-cord:`1.2.3 </maclearner/1.2.3>`_
-     - :mvn-cord:`X </maclearner-api/1.2.3>`_
-     - :mvn-cord:`X </maclearner-app/1.2.3>`_
-     - :mvn-cord:`X </maclearner>`_
-     - :vol-ger:`X </mac-learning/+/refs/tags/1.2.3>`_
-     - :vol-git:`X </mac-learning/releases/tag/1.2.3>`__, :vol-git:`T </mac-learning/tree/1.2.3>`_
+   * - :vol-ger:`maclearner <mac-learning>`
+     - :mvn-cord:`1.2.3 <maclearner/1.2.3>`
+     - :mvn-cord:`X <maclearner-api/1.2.3>`
+     - :mvn-cord:`X <maclearner-app/1.2.3>`
+     - :mvn-cord:`X <maclearner>`
+     - :vol-ger:`X <mac-learning/+/refs/tags/1.2.3>`
+     - :vol-git:`X </mac-learning/releases/tag/1.2.3>`, :vol-git:`T <mac-learning/tree/1.2.3>`
      -
    * - `mcast <https://gerrit.opencord.org/gitweb?p=mcast.git;a=summary>`__
-     - :mvn-cord:`2.9.1 </mcast/2.9.1>`_
-     - :mvn-cord:`X </mcast-api/2.9.1>`_
-     - :mvn-cord:`X </mcast-app/2.9.1>`_
-     - :mvn-cord:`X </mcast/2.9.1>`_
-     - :vol-ger:`X </mcast/+/refs/tags/2.9.1>`_
-     - :vol-git:`X </mcast/releases/tag/2.9.1>`__, :vol-git:`T </mcast/tree/2.9.1>`_
+     - :mvn-cord:`2.9.1 <mcast/2.9.1>`
+     - :mvn-cord:`X <mcast-api/2.9.1>`
+     - :mvn-cord:`X <mcast-app/2.9.1>`
+     - :mvn-cord:`X <mcast/2.9.1>`
+     - :vol-ger:`X <mcast/+/refs/tags/2.9.1>`
+     - :vol-git:`X </mcast/releases/tag/2.9.1>`, :vol-git:`T <mcast/tree/2.9.1>`
      -
    * - `olt <https://gerrit.opencord.org/gitweb?p=olt.git;a=summary>`__
-     - :mvn-cord:`5.2.6 </olt/5.2.6>`_
-     - :mvn-cord:`X </olt-api/5.2.6>`_
-     - :mvn-cord:`X </olt-app/5.2.6>`_
-     - :mvn-cord:`X </olt/5.2.6>`_
-     - :vol-ger:`X </olt/+/refs/tags/5.2.6>`_
-     - :vol-git:`X </olt/releases/tag/5.2.6>`_
+     - :mvn-cord:`5.2.6 <olt/5.2.6>`
+     - :mvn-cord:`X <olt-api/5.2.6>`
+     - :mvn-cord:`X <olt-app/5.2.6>`
+     - :mvn-cord:`X <olt/5.2.6>`
+     - :vol-ger:`X <olt/+/refs/tags/5.2.6>`
+     - :vol-git:`X <olt/releases/tag/5.2.6>`
      -
-   * - :vol-ger:`olttopology </olttopology/>`_
-     - :mvn-cord:`1.3.1 </olttopology/1.3.1>`_
-     - :mvn-cord:`X </olttopology-api/1.3.1>`_
-     - :mvn-cord:`X </olttopology-app/1.3.1>`_
-     - :mvn-cord:`X </olttopology>`_
-     - :vol-ger:`X </olttopology/+/refs/tags/1.3.1>`_
-     - :vol-git:`X </olttopology/releases/tag/1.3.1>`_
+   * - :vol-ger:`olttopology <olttopology/>`
+     - :mvn-cord:`1.3.1 <olttopology/1.3.1>`
+     - :mvn-cord:`X <olttopology-api/1.3.1>`
+     - :mvn-cord:`X <olttopology-app/1.3.1>`
+     - :mvn-cord:`X <olttopology>`
+     - :vol-ger:`X <olttopology/+/refs/tags/1.3.1>`
+     - :vol-git:`X <olttopology/releases/tag/1.3.1>`
      -
-   * - :vol-ger:`pppoeagent </pppoeagent/>`_
-     - :mvn-cord:`1.3.0 </pppoeagent/1.3.0>`_
-     - :mvn-cord:`X </pppoeagent-api/1.3.0>`_
-     - :mvn-cord:`X </pppoeagent-app/1.3.0>`_
-     - :mvn-cord:`X </pppoeagent>`_
-     - :vol-ger:`X </pppoeagent/+/refs/tags/1.3.0>`_
-     - :vol-git:`X </pppoeagent/releases/tag/1.3.0>`_
+   * - :vol-ger:`pppoeagent <pppoeagent/>`
+     - :mvn-cord:`1.3.0 <pppoeagent/1.3.0>`
+     - :mvn-cord:`X <pppoeagent-api/1.3.0>`
+     - :mvn-cord:`X <pppoeagent-app/1.3.0>`
+     - :mvn-cord:`X <pppoeagent>`
+     - :vol-ger:`X <pppoeagent/+/refs/tags/1.3.0>`
+     - :vol-git:`X <pppoeagent/releases/tag/1.3.0>`
      -
    * - `sadis <https://gerrit.opencord.org/gitweb?p=sadis.git;a=summary>`__
-     - :mvn-cord:`5.12.2 </sadis/5.12.2>`_
-     - :mvn-cord:`X </sadis-api/5.12.2>`_
-     - :mvn-cord:`X </sadis-app/5.12.2>`_
-     - :mvn-cord:`X </sadis>`_
-     - :vol-ger:`X </sadis/+/refs/tags/5.12.2>`_
-     - :vol-git:`X </sadis/releases/tag/5.12.2>`_
+     - :mvn-cord:`5.12.2 <sadis/5.12.2>`
+     - :mvn-cord:`X <sadis-api/5.12.2>`
+     - :mvn-cord:`X <sadis-app/5.12.2>`
+     - :mvn-cord:`X <sadis>`
+     - :vol-ger:`X <sadis/+/refs/tags/5.12.2>`
+     - :vol-git:`X <sadis/releases/tag/5.12.2>`
      -
 
 - See Also
@@ -343,9 +343,9 @@
 
    * - Component
      - VOLTHA
-     - :vol-ger:`Chart.yaml </voltha-helm-charts/+/refs/heads/master>`
+     - :vol-ger:`Chart.yaml <voltha-helm-charts/+/refs/heads/master>`
      - `Gerrit <https://gerrit.opencord.org/admin/repos>`_
-     - :vol-git:`Github</>`
+     - :vol-git:`Github<>`
      - `Docker <https://hub.docker.com/search?q=voltha>`_
      - `Golang <https://pkg.go.dev>`_
      - `Pypi <https://pypi.org>`_
@@ -369,28 +369,28 @@
      -
      -
    * - `ofagent-go <https://gerrit.opencord.org/gitweb?p=ofagent-go.git;a=tree>`_
-     - :vol-ger:`2.2.1 </ofagent-go/+/refs/heads/voltha-2.12/VERSION>`
+     - :vol-ger:`2.2.1 <ofagent-go/+/refs/heads/voltha-2.12/VERSION>`
      - ``N/A``
-     - :vol-ger:`X </ofagent-go/+/refs/tags/v2.2.1>`_
-     - :vol-git:`X </ofagent-go/releases/tag/v2.2.1>`_
+     - :vol-ger:`X <ofagent-go/+/refs/tags/v2.2.1>`
+     - :vol-git:`X <ofagent-go/releases/tag/v2.2.1>`
      - `1.1.4(stale) <https://hub.docker.com/layers/voltha/ofagent-go/1.1.4/images/sha256-8231111b69c8643c4981d64abff0a85d71f80763bb98632bb101e92b89882647?context=explore>`_
      - `1.6.5(stale) <https://pkg.go.dev/github.com/opencord/ofagent-go/cmd/ofagent>`_
      -
      -
    * - `voltha-go <https://gerrit.opencord.org/gitweb?p=voltha-go.git;a=tree>`_
-     - :vol-ger:`3.5.4 </voltha-go/+/refs/heads/voltha-2.12/VERSION>`
+     - :vol-ger:`3.5.4 <voltha-go/+/refs/heads/voltha-2.12/VERSION>`
      - ``N/A``
-     - :vol-ger:`X </voltha-go/+/refs/tags/v3.5.4>`_
-     - :vol-git:`X </voltha-go/releases/tag/v3.5.4>`_
+     - :vol-ger:`X <voltha-go/+/refs/tags/v3.5.4>`
+     - :vol-git:`X <voltha-go/releases/tag/v3.5.4>`
      - ``N/A``
      - ``v7:?``
      -
      -
-   * - :vol-ger:`voltha-lib-go </voltha-lib-go>`
-     - :vol-ger:`7.5.3 </voltha-lib-go/+/refs/heads/master/VERSION>`
+   * - :vol-ger:`voltha-lib-go <voltha-lib-go>`
+     - :vol-ger:`7.5.3 <voltha-lib-go/+/refs/heads/master/VERSION>`
      - ``N/A``
-     - :vol-ger:`X </voltha-lib-go/+/refs/tags/v7.5.3>`_
-     - :vol-git:`X </voltha-lib-go/releases/tag/v7.5.3>`_
+     - :vol-ger:`X <voltha-lib-go/+/refs/tags/v7.5.3>`
+     - :vol-git:`X <voltha-lib-go/releases/tag/v7.5.3>`
      - ``?``
      - `v7 <https://pkg.go.dev/github.com/opencord/voltha-lib-go/v7@v7.5.3>`__
      - ``?``
@@ -398,44 +398,44 @@
    * - `voltha-onos <https://gerrit.opencord.org/gitweb?p=voltha-onos.git;a=tree>`_
      - ``5.1.10``
      - ``0.1.27``
-     - :vol-ger:`X </voltha-onos/+/refs/tags/5.1.10>`_
-     - :vol-git:`X </voltha-onos/releases/tag/5.1.10>`_
+     - :vol-ger:`X <voltha-onos/+/refs/tags/5.1.10>`
+     - :vol-git:`X <voltha-onos/releases/tag/5.1.10>`
      - `X <https://hub.docker.com/layers/voltha/voltha-onos/5.1.10/images/sha256-d2498af38194a1cd01a1b9072a58af8647ed50fea2dbc9bd3ac4d4e4b583d72a?context=explore>`__
      -
      -
      - ``N``
    * - `voltha-openolt-adapter <https://gerrit.opencord.org/gitweb?p=voltha-openolt-adapter.git;a=tree>`_
-     - :vol-ger:`4.4.11 </voltha-openolt-adapter/+/refs/heads/voltha-2.12/VERSION>`
-     - :vol-ger:`2.12.6 </voltha-helm-charts/+/refs/heads/master/voltha-adapter-openolt/Chart.yaml#20>`
-     - :vol-ger:`X </voltha-openolt-adapter/+/refs/tags/v4.4.11>`_
-     - :vol-git:`X </voltha-openolt-adapter/releases/tag/v4.4.11>`_
+     - :vol-ger:`4.4.11 <voltha-openolt-adapter/+/refs/heads/voltha-2.12/VERSION>`
+     - :vol-ger:`2.12.6 <voltha-helm-charts/+/refs/heads/master/voltha-adapter-openolt/Chart.yaml#20>`
+     - :vol-ger:`X <voltha-openolt-adapter/+/refs/tags/v4.4.11>`
+     - :vol-git:`X <voltha-openolt-adapter/releases/tag/v4.4.11>`
      - `X <https://hub.docker.com/layers/voltha/voltha-openolt-adapter/4.4.11/images/sha256-eed64f687f6029f4cbf531162a10d5e496ea454878987ec0212cd5dbf4c6d9cf?context=explore>`__
      - ``N/A``
      - ``N/A``
      -
    * - `voltha-openonu-adapter-go <https://gerrit.opencord.org/gitweb?p=voltha-openonu-adapter-go.git;a=tree>`_
-     - :vol-ger:`2.11.12 </voltha-openonu-adapter-go/+/refs/heads/voltha-2.12/VERSION>`
-     - :vol-ger:`2.12.2 </voltha-helm-charts/+/refs/heads/master/voltha-adapter-openonu/Chart.yaml#17>`_
-     - :vol-ger:`X </voltha-openonu-adapter-go/+/refs/tags/v2.11.12>`_
-     - :vol-git:`X </voltha-openonu-adapter-go/releases/tag/v2.11.12>`_
+     - :vol-ger:`2.11.12 <voltha-openonu-adapter-go/+/refs/heads/voltha-2.12/VERSION>`
+     - :vol-ger:`2.12.2 <voltha-helm-charts/+/refs/heads/master/voltha-adapter-openonu/Chart.yaml#17>`
+     - :vol-ger:`X <voltha-openonu-adapter-go/+/refs/tags/v2.11.12>`
+     - :vol-git:`X <voltha-openonu-adapter-go/releases/tag/v2.11.12>`
      - `X <https://hub.docker.com/layers/voltha/voltha-openonu-adapter-go/2.11.12/images/sha256-e9484a8963d08748af5766a6a8ce7f7485efb384488bcf93840ecc1142d7ad74?context=explore>`__
      - `stale <https://pkg.go.dev/github.com/opencord/voltha-openonu-adapter-go>`_
      - ``N/A``
      -
-   * - :vol-ger:`voltha-protos </voltha-protos>`
-     - :vol-ger:`5.4.11 </voltha-protos/+/refs/heads/voltha-2.12/VERSION>`
+   * - :vol-ger:`voltha-protos <voltha-protos>`
+     - :vol-ger:`5.4.11 <voltha-protos/+/refs/heads/voltha-2.12/VERSION>`
      - ``N/A``
-     - :vol-ger:`X </voltha-protos/+/refs/tags/v5.4.11>`_
-     - :vol-git:`X </voltha-protos/releases/tag/v5.4.11>`_
+     - :vol-ger:`X <voltha-protos/+/refs/tags/v5.4.11>`
+     - :vol-git:`X <voltha-protos/releases/tag/v5.4.11>`
      - `stale <https://hub.docker.com/r/voltha/voltha-protos/tags>`__
      - `stale <https://pkg.go.dev/github.com/opencord/voltha-protos>`__
      - `5.4.11 <https://pypi.org/project/voltha-protos/5.4.11>`__
      -
-   * - :vol-git:`voltha-system-tests </voltha-system-tests/releases/tag/2.9.0>`_
+   * - :vol-git:`voltha-system-tests <voltha-system-tests/releases/tag/2.9.0>`
      - ``2.12.13``
      -
-     - :vol-ger:`X </voltha-system-tests/+/refs/tags/2.12.13>`_
-     - :vol-git:`X </voltha-system-tests/tree/2.12.13>`_
+     - :vol-ger:`X <voltha-system-tests/+/refs/tags/2.12.13>`
+     - :vol-git:`X <voltha-system-tests/tree/2.12.13>`
      -
      -
      -
@@ -465,9 +465,9 @@
 
    * - Component
      - VOLTHA
-     - :vol-ger:`Chart.yaml </voltha-helm-charts/+/refs/heads/master>`
+     - :vol-ger:`Chart.yaml <voltha-helm-charts/+/refs/heads/master>`
      - `Gerrit <https://gerrit.opencord.org/admin/repos>`_
-     - :vol-git:`Github</>`
+     - :vol-git:`Github<>`
      - `Docker <https://hub.docker.com/search?q=voltha>`_
      - `Golang <https://pkg.go.dev>`_
      - `Pypi <https://pypi.org>`_
@@ -490,38 +490,38 @@
      -
      -
      -
-   * - :vol-ger:`voltha-docs </voltha-docs>`_ , `docs.voltha.org <https://docs.voltha.org>`
+   * - :vol-ger:`voltha-docs <voltha-docs>` , `docs.voltha.org <https://docs.voltha.org>`
      - ``2.12.25``
      - ``N/A``
-     - :vol-ger:`X </voltha-docs/+/refs/tags/2.12.25>`_
-     - :vol-git:`X </voltha-docs/releases/tag/2.12.25>`_
+     - :vol-ger:`X <voltha-docs/+/refs/tags/2.12.25>`
+     - :vol-git:`X <voltha-docs/releases/tag/2.12.25>`
      -
      -
      -
      - ``N``
    * - `bbsim <https://gerrit.opencord.org/gitweb?p=bbsim.git;a=tree>`__
      - ``1.16.3+``
-     - ``4.8.6`` :vol-ger:`chart </voltha-helm-charts/+/refs/heads/voltha-2.12/bbsim/Chart.yaml>`_
-     - :vol-ger:`X </bbsim>`_
-     - :vol-git:`X </bbsim/tree/v1.14.4>`_
+     - ``4.8.6`` :vol-ger:`chart <voltha-helm-charts/+/refs/heads/voltha-2.12/bbsim/Chart.yaml>`
+     - :vol-ger:`X <bbsim>`
+     - :vol-git:`X <bbsim/tree/v1.14.4>`
      - `X <https://hub.docker.com/layers/voltha/bbsim/1.14.4/images/sha256-c23de193c1d7cf8d32c48edfbec4bfa6c47dbeecd4b31d040da0255eeab2ec58?context=explore>`__
      - ``?``
      - ``?``
      - ``N``
    * - `Bbsim-sadis-server <https://gerrit.opencord.org/gitweb?p=bbsim-sadis-server.git;a=tree>`__
-     - :vol-ger:`0.3.6 </bbsim-sadis-server/+/refs/heads/voltha-2.12/VERSION>`
-     - :vol-ger:`0.3.3 </voltha-helm-charts/+/refs/heads/voltha-2.12/voltha-infra/Chart.yaml#45>`
-     - :vol-ger:`X </bbsim-sadis-server/+/refs/tags/v0.3.6/VERSION>`_
-     - :vol-git:`X </bbsim-sadis-server/releases/tag/v0.3.6>`_
+     - :vol-ger:`0.3.6 <bbsim-sadis-server/+/refs/heads/voltha-2.12/VERSION>`
+     - :vol-ger:`0.3.3 <voltha-helm-charts/+/refs/heads/voltha-2.12/voltha-infra/Chart.yaml#45>`
+     - :vol-ger:`X <bbsim-sadis-server/+/refs/tags/v0.3.6/VERSION>`
+     - :vol-git:`X <bbsim-sadis-server/releases/tag/v0.3.6>`
      - `X <https://hub.docker.com/layers/voltha/bbsim-sadis-server/0.3.6/images/sha256-0ea9df1be13f8b1d0a8314cbf0e0800e4a4b7e2920ae3ce5e119abddb9359350?context=explore>`__
      -
      -
      - ``N``
    * - `voltctl <https://gerrit.opencord.org/gitweb?p=voltctl.git;a=tree>`_
-     - :vol-ger:`1.10.2 </voltctl/+/refs/heads/voltha-2.12/VERSION>`
+     - :vol-ger:`1.10.2 <voltctl/+/refs/heads/voltha-2.12/VERSION>`
      - ``N/A``
-     - :vol-ger:`X </voltctl/+/refs/tags/v1.10.2>`_
-     - :vol-git:`? </voltctl/releases/tag/v1.10.2>`
+     - :vol-ger:`X <voltctl/+/refs/tags/v1.10.2>`
+     - :vol-git:`? <voltctl/releases/tag/v1.10.2>`
      - ``N/A``
      - `X <https://pkg.go.dev/github.com/opencord/voltctl@v1.10.2>`__
      - ``N/A``
@@ -543,13 +543,13 @@
    * -
      -
    * - Helm Charts (voltha-helm-charts)
-     - :vol-ger:`3.3.0 </voltha-helm-charts/+/refs/heads/voltha-2.12/VERSION>`
+     - :vol-ger:`3.3.0 <voltha-helm-charts/+/refs/heads/voltha-2.12/VERSION>`
    * - Voltha
-     - :vol-ger:`2.12.17 </voltha-helm-charts/+/refs/heads/master/voltha/Chart.yaml#20>`
+     - :vol-ger:`2.12.17 <voltha-helm-charts/+/refs/heads/master/voltha/Chart.yaml#20>`
    * - Voltha-infra
-     - :vol-ger:`2.12.6 </voltha-helm-charts/+/refs/heads/master/voltha-infra/Chart.yaml#37>`_
+     - :vol-ger:`2.12.6 <voltha-helm-charts/+/refs/heads/master/voltha-infra/Chart.yaml#37>`
    * - Voltha-stack
-     - :vol-ger:`2.12.9 </voltha-helm-charts/+/refs/heads/master/voltha-stack/Chart.yaml#37>`
+     - :vol-ger:`2.12.9 <voltha-helm-charts/+/refs/heads/master/voltha-stack/Chart.yaml#37>`
 
 BAL Version
 +++++++++++
diff --git a/release_notes/voltha_2.13.rst b/release_notes/voltha_2.13.rst
index 19934e0..acdb631 100644
--- a/release_notes/voltha_2.13.rst
+++ b/release_notes/voltha_2.13.rst
@@ -141,92 +141,92 @@
      -
      -
    * - `aaa <https://gerrit.opencord.org/gitweb?p=aaa.git;a=summary>`_
-     - :mvn-cord:`2.11.2 <aaai/2.11.2>`_
-     - :mvn-cord:`X <aaa-api/2.11.2>`_
-     - :mvn-cord:`X <aaa-app/2.11.2>`_
-     - :mvn-cord:`X <aaa/2.11.2>`_
-     - :vol-ger:`X </aaa/+/refs/tags/2.11.2>`_
-     - :vol-git:`X </aaa/releases/tag/2.11.2>`_
+     - :mvn-cord:`2.11.2 <aaai/2.11.2>`
+     - :mvn-cord:`X <aaa-api/2.11.2>`
+     - :mvn-cord:`X <aaa-app/2.11.2>`
+     - :mvn-cord:`X <aaa/2.11.2>`
+     - :vol-ger:`X <aaa/+/refs/tags/2.11.2>`
+     - :vol-git:`X <aaa/releases/tag/2.11.2>`
      -
    * - `bng <https://gerrit.opencord.org/gitweb?p=bng.git;a=summary>`__
-     - :mvn-cord:`2.5.3 </bng/2.5.3>`_
-     - :mvn-cord:`X </bng-api/2.5.3>`_
-     - :mvn-cord:`X </bng-app/2.5.3>`_
-     - :mvn-cord:`X </bng/2.5.3>`_
-     - :vol-ger:`X </bng/+/refs/tags/2.5.3>`_
-     - :vol-git:`X </bng/releases/tag/2.5.3>`_
+     - :mvn-cord:`2.5.3 <bng/2.5.3>`
+     - :mvn-cord:`X <bng-api/2.5.3>`
+     - :mvn-cord:`X <bng-app/2.5.3>`
+     - :mvn-cord:`X <bng/2.5.3>`
+     - :vol-ger:`X <bng/+/refs/tags/2.5.3>`
+     - :vol-git:`X <bng/releases/tag/2.5.3>`
      -
    * - `dhcpl2relay <https://gerrit.opencord.org/gitweb?p=dhcpl2relay.git;a=summary>`__
-     - :mvn-cord:`2.11.2 </dhcpl2relay/2.11.2>`_
-     - :mvn-cord:`X </dhcpl2relay-api/2.11.2>`_
-     - :mvn-cord:`X </dhcpl2relay-app/2.11.2>`_
-     - :mvn-cord:`X </dhcpl2relay>`_
-     - :vol-ger:`X </dhcpl2relay/+/refs/tags/2.11.2>`_
-     - :vol-git:`X </dhcpl2relay/releases/tag/2.11.2>`_
+     - :mvn-cord:`2.11.2 <dhcpl2relay/2.11.2>`
+     - :mvn-cord:`X <dhcpl2relay-api/2.11.2>`
+     - :mvn-cord:`X <dhcpl2relay-app/2.11.2>`
+     - :mvn-cord:`X <dhcpl2relay>`
+     - :vol-ger:`X <dhcpl2relay/+/refs/tags/2.11.2>`
+     - :vol-git:`X <dhcpl2relay/releases/tag/2.11.2>`
      -
    * - `igmpproxy <https://gerrit.opencord.org/gitweb?p=igmpproxy.git;a=summary>`__
-     - :mvn-cord:`2.9.1 </onos-app-igmpproxy/2.9.1>`_
-     - :mvn-cord:`X </onos-app-igmpproxy-api/2.9.1>`_
-     - :mvn-cord:`X </onos-app-igmpproxy-app/2.9.1>`_
-     - :mvn-cord:`X </onos-app-igmpproxy/2.9.1>`_
-     - :vol-ger:`X </igmpproxy/+/refs/tags/2.9.1>`_
-     - :vol-git:`X </igmpproxy/releases/tag/2.9.1>`_
+     - :mvn-cord:`2.9.1 <onos-app-igmpproxy/2.9.1>`
+     - :mvn-cord:`X <onos-app-igmpproxy-api/2.9.1>`
+     - :mvn-cord:`X <onos-app-igmpproxy-app/2.9.1>`
+     - :mvn-cord:`X <onos-app-igmpproxy/2.9.1>`
+     - :vol-ger:`X <igmpproxy/+/refs/tags/2.9.1>`
+     - :vol-git:`X <igmpproxy/releases/tag/2.9.1>`
      -
    * - `kafka <https://gerrit.opencord.org/gitweb?p=kafka-onos.git;a=summary>`__
-     - :mvn-cord:`2.13.3 </kafka/2.13.3>`_
-     - :mvn-cord:`X </kafka-api/2.13.3>`_
-     - :mvn-cord:`X </kafka-app/2.13.3>`_
-     - :mvn-cord:`X </kafka/2.13.3>`_
-     - :vol-ger:`X </kafka-onos/+/refs/tags/2.13.3>`_
-     - :vol-git:`X </kafka-onos/releases/tag/2.13.3>`_
+     - :mvn-cord:`2.13.3 <kafka/2.13.3>`
+     - :mvn-cord:`X <kafka-api/2.13.3>`
+     - :mvn-cord:`X <kafka-app/2.13.3>`
+     - :mvn-cord:`X <kafka/2.13.3>`
+     - :vol-ger:`X <kafka-onos/+/refs/tags/2.13.3>`
+     - :vol-git:`X <kafka-onos/releases/tag/2.13.3>`
      - ``N``
-   * - :vol-ger:`maclearner </mac-learning>`_
-     - :mvn-cord:`1.2.4 </maclearner/1.2.4>`_
-     - :mvn-cord:`X </maclearner-api/1.2.4>`_
-     - :mvn-cord:`X </maclearner-app/1.2.4>`_
-     - :mvn-cord:`X </maclearner>`_
-     - :vol-ger:`X </mac-learning/+/refs/tags/1.2.4>`_
-     - :vol-git:`X </mac-learning/releases/tag/1.2.4>`__, :vol-git:`T </mac-learning/tree/1.2.4>`_
+   * - :vol-ger:`maclearner <mac-learning>`
+     - :mvn-cord:`1.2.4 <maclearner/1.2.4>`
+     - :mvn-cord:`X <maclearner-api/1.2.4>`
+     - :mvn-cord:`X <maclearner-app/1.2.4>`
+     - :mvn-cord:`X <maclearner>`
+     - :vol-ger:`X <mac-learning/+/refs/tags/1.2.4>`
+     - :vol-git:`X </mac-learning/releases/tag/1.2.4>`, :vol-git:`T <mac-learning/tree/1.2.4>`
      -
    * - `mcast <https://gerrit.opencord.org/gitweb?p=mcast.git;a=summary>`__
-     - :mvn-cord:`2.9.3 </mcast/2.9.3>`_
-     - :mvn-cord:`X </mcast-api/2.9.3>`_
-     - :mvn-cord:`X </mcast-app/2.9.3>`_
-     - :mvn-cord:`X </mcast/2.9.3>`_
-     - :vol-ger:`X </mcast/+/refs/tags/2.9.3>`_
-     - :vol-git:`X </mcast/releases/tag/2.9.3>`__, :vol-git:`T </mcast/tree/2.9.3>`_
+     - :mvn-cord:`2.9.3 <mcast/2.9.3>`
+     - :mvn-cord:`X <mcast-api/2.9.3>`
+     - :mvn-cord:`X <mcast-app/2.9.3>`
+     - :mvn-cord:`X <mcast/2.9.3>`
+     - :vol-ger:`X <mcast/+/refs/tags/2.9.3>`
+     - :vol-git:`X </mcast/releases/tag/2.9.3>`, :vol-git:`T <mcast/tree/2.9.3>`
      -
    * - `olt <https://gerrit.opencord.org/gitweb?p=olt.git;a=summary>`__
-     - :mvn-cord:`5.2.8 </olt/5.2.8>`_
-     - :mvn-cord:`X </olt-api/5.2.8>`_
-     - :mvn-cord:`X </olt-app/5.2.8>`_
-     - :mvn-cord:`X </olt/5.2.8>`_
-     - :vol-ger:`X </olt/+/refs/tags/5.2.8>`_
-     - :vol-git:`X </olt/releases/tag/5.2.8>`_
+     - :mvn-cord:`5.2.8 <olt/5.2.8>`
+     - :mvn-cord:`X <olt-api/5.2.8>`
+     - :mvn-cord:`X <olt-app/5.2.8>`
+     - :mvn-cord:`X <olt/5.2.8>`
+     - :vol-ger:`X <olt/+/refs/tags/5.2.8>`
+     - :vol-git:`X <olt/releases/tag/5.2.8>`
      -
-   * - :vol-ger:`olttopology </olttopology/>`_
-     - :mvn-cord:`1.3.1 </olttopology/1.3.1>`_
-     - :mvn-cord:`X </olttopology-api/1.3.1>`_
-     - :mvn-cord:`X </olttopology-app/1.3.1>`_
-     - :mvn-cord:`X </olttopology>`_
-     - :vol-ger:`X </olttopology/+/refs/tags/1.3.1>`_
-     - :vol-git:`X </olttopology/releases/tag/1.3.1>`_
+   * - :vol-ger:`olttopology <olttopology/>`
+     - :mvn-cord:`1.3.1 <olttopology/1.3.1>`
+     - :mvn-cord:`X <olttopology-api/1.3.1>`
+     - :mvn-cord:`X <olttopology-app/1.3.1>`
+     - :mvn-cord:`X <olttopology>`
+     - :vol-ger:`X <olttopology/+/refs/tags/1.3.1>`
+     - :vol-git:`X <olttopology/releases/tag/1.3.1>`
      -
-   * - :vol-ger:`pppoeagent </pppoeagent/>`_
-     - :mvn-cord:`1.3.2 </pppoeagent/1.3.2>`_
-     - :mvn-cord:`X </pppoeagent-api/1.3.2>`_
-     - :mvn-cord:`X </pppoeagent-app/1.3.2>`_
-     - :mvn-cord:`X </pppoeagent>`_
-     - :vol-ger:`X </pppoeagent/+/refs/tags/1.3.2>`_
-     - :vol-git:`X </pppoeagent/releases/tag/1.3.2>`_
+   * - :vol-ger:`pppoeagent <pppoeagent/>`
+     - :mvn-cord:`1.3.2 <pppoeagent/1.3.2>`
+     - :mvn-cord:`X <pppoeagent-api/1.3.2>`
+     - :mvn-cord:`X <pppoeagent-app/1.3.2>`
+     - :mvn-cord:`X <pppoeagent>`
+     - :vol-ger:`X <pppoeagent/+/refs/tags/1.3.2>`
+     - :vol-git:`X <pppoeagent/releases/tag/1.3.2>`
      -
    * - `sadis <https://gerrit.opencord.org/gitweb?p=sadis.git;a=summary>`__
-     - :mvn-cord:`5.12.3 </sadis/5.12.3>`_
-     - :mvn-cord:`X </sadis-api/5.12.3>`_
-     - :mvn-cord:`X </sadis-app/5.12.3>`_
-     - :mvn-cord:`X </sadis>`_
-     - :vol-ger:`X </sadis/+/refs/tags/5.12.3>`_
-     - :vol-git:`X </sadis/releases/tag/5.12.3>`_
+     - :mvn-cord:`5.12.3 <sadis/5.12.3>`
+     - :mvn-cord:`X <sadis-api/5.12.3>`
+     - :mvn-cord:`X <sadis-app/5.12.3>`
+     - :mvn-cord:`X <sadis>`
+     - :vol-ger:`X <sadis/+/refs/tags/5.12.3>`
+     - :vol-git:`X <sadis/releases/tag/5.12.3>`
      -
 
 - See Also
@@ -244,9 +244,9 @@
 
    * - Component
      - VOLTHA
-     - :vol-ger:`Chart.yaml </voltha-helm-charts/+/refs/heads/master>`
+     - :vol-ger:`Chart.yaml <voltha-helm-charts/+/refs/heads/master>`
      - `Gerrit <https://gerrit.opencord.org/admin/repos>`_
-     - :vol-git:`Github</>`
+     - :vol-git:`Github<>`
      - `Docker <https://hub.docker.com/search?q=voltha>`_
      - `Golang <https://pkg.go.dev>`_
      - `Pypi <https://pypi.org>`_
@@ -270,28 +270,28 @@
      -
      -
    * - `ofagent-go <https://gerrit.opencord.org/gitweb?p=ofagent-go.git;a=tree>`_
-     - :vol-ger:`2.3.2 </ofagent-go/+/refs/heads/voltha-2.13/VERSION>`
+     - :vol-ger:`2.3.2 <ofagent-go/+/refs/heads/voltha-2.13/VERSION>`
      - ``N/A``
-     - :vol-ger:`X </ofagent-go/+/refs/tags/v2.3.2>`_
-     - :vol-git:`X </ofagent-go/releases/tag/v2.3.2>`_
+     - :vol-ger:`X <ofagent-go/+/refs/tags/v2.3.2>`
+     - :vol-git:`X <ofagent-go/releases/tag/v2.3.2>`
      - `1.1.4(stale) <https://hub.docker.com/layers/voltha/ofagent-go/1.1.4/images/sha256-8231111b69c8643c4981d64abff0a85d71f80763bb98632bb101e92b89882647?context=explore>`_
      - `1.6.5(stale) <https://pkg.go.dev/github.com/opencord/ofagent-go/cmd/ofagent>`_
      -
      -
    * - `voltha-go <https://gerrit.opencord.org/gitweb?p=voltha-go.git;a=tree>`_
-     - :vol-ger:`3.6.6 </voltha-go/+/refs/heads/voltha-2.13/VERSION>`
+     - :vol-ger:`3.6.6 <voltha-go/+/refs/heads/voltha-2.13/VERSION>`
      - ``N/A``
-     - :vol-ger:`X </voltha-go/+/refs/tags/v3.6.6>`_
-     - :vol-git:`X </voltha-go/releases/tag/v3.6.6>`_
+     - :vol-ger:`X <voltha-go/+/refs/tags/v3.6.6>`
+     - :vol-git:`X <voltha-go/releases/tag/v3.6.6>`
      - ``N/A``
      - ``v7:?``
      -
      -
-   * - :vol-ger:`voltha-lib-go </voltha-lib-go>`
-     - :vol-ger:`7.6.6 </voltha-lib-go/+/refs/heads/master/VERSION>`
+   * - :vol-ger:`voltha-lib-go <voltha-lib-go>`
+     - :vol-ger:`7.6.6 <voltha-lib-go/+/refs/heads/master/VERSION>`
      - ``N/A``
-     - :vol-ger:`X </voltha-lib-go/+/refs/tags/v7.6.6>`_
-     - :vol-git:`X </voltha-lib-go/releases/tag/v7.6.6>`_
+     - :vol-ger:`X <voltha-lib-go/+/refs/tags/v7.6.6>`
+     - :vol-git:`X <voltha-lib-go/releases/tag/v7.6.6>`
      - ``?``
      - `v7 <https://pkg.go.dev/github.com/opencord/voltha-lib-go/v7@v7.6.6>`__
      - ``?``
@@ -299,44 +299,44 @@
    * - `voltha-onos <https://gerrit.opencord.org/gitweb?p=voltha-onos.git;a=tree>`_
      - ``5.1.10``
      - ``0.1.27``
-     - :vol-ger:`X </voltha-onos/+/refs/tags/5.1.10>`_
-     - :vol-git:`X </voltha-onos/releases/tag/5.1.10>`_
+     - :vol-ger:`X <voltha-onos/+/refs/tags/5.1.10>`
+     - :vol-git:`X <voltha-onos/releases/tag/5.1.10>`
      - `X <https://hub.docker.com/layers/voltha/voltha-onos/5.1.10/images/sha256-d2498af38194a1cd01a1b9072a58af8647ed50fea2dbc9bd3ac4d4e4b583d72a?context=explore>`__
      -
      -
      - ``N``
    * - `voltha-openolt-adapter <https://gerrit.opencord.org/gitweb?p=voltha-openolt-adapter.git;a=tree>`_
-     - :vol-ger:`4.5.6 </voltha-openolt-adapter/+/refs/heads/voltha-2.13/VERSION>`
-     - :vol-ger:`2.13.0 </voltha-helm-charts/+/refs/heads/master/voltha-adapter-openolt/Chart.yaml#20>`
-     - :vol-ger:`X </voltha-openolt-adapter/+/refs/tags/v4.5.6>`_
-     - :vol-git:`X </voltha-openolt-adapter/releases/tag/v4.5.6>`_
+     - :vol-ger:`4.5.6 <voltha-openolt-adapter/+/refs/heads/voltha-2.13/VERSION>`
+     - :vol-ger:`2.13.0 <voltha-helm-charts/+/refs/heads/master/voltha-adapter-openolt/Chart.yaml#20>`
+     - :vol-ger:`X <voltha-openolt-adapter/+/refs/tags/v4.5.6>`
+     - :vol-git:`X <voltha-openolt-adapter/releases/tag/v4.5.6>`
      - `X <https://hub.docker.com/layers/voltha/voltha-openolt-adapter/4.5.6/images/sha256-eed64f687f6029f4cbf531162a10d5e496ea454878987ec0212cd5dbf4c6d9cf?context=explore>`__
      - ``N/A``
      - ``N/A``
      -
    * - `voltha-openonu-adapter-go <https://gerrit.opencord.org/gitweb?p=voltha-openonu-adapter-go.git;a=tree>`_
-     - :vol-ger:`2.12.14 </voltha-openonu-adapter-go/+/refs/heads/voltha-2.13/VERSION>`
-     - :vol-ger:`2.13.0 </voltha-helm-charts/+/refs/heads/master/voltha-adapter-openonu/Chart.yaml#17>`_
-     - :vol-ger:`X </voltha-openonu-adapter-go/+/refs/tags/v2.12.14>`_
-     - :vol-git:`X </voltha-openonu-adapter-go/releases/tag/v2.12.14>`_
+     - :vol-ger:`2.12.14 <voltha-openonu-adapter-go/+/refs/heads/voltha-2.13/VERSION>`
+     - :vol-ger:`2.13.0 <voltha-helm-charts/+/refs/heads/master/voltha-adapter-openonu/Chart.yaml#17>`
+     - :vol-ger:`X <voltha-openonu-adapter-go/+/refs/tags/v2.12.14>`
+     - :vol-git:`X <voltha-openonu-adapter-go/releases/tag/v2.12.14>`
      - `X <https://hub.docker.com/layers/voltha/voltha-openonu-adapter-go/2.12.14/images/sha256-e9484a8963d08748af5766a6a8ce7f7485efb384488bcf93840ecc1142d7ad74?context=explore>`__
      - `stale <https://pkg.go.dev/github.com/opencord/voltha-openonu-adapter-go>`_
      - ``N/A``
      -
-   * - :vol-ger:`voltha-protos </voltha-protos>`
-     - :vol-ger:`5.6.2 </voltha-protos/+/refs/heads/voltha-2.13/VERSION>`
+   * - :vol-ger:`voltha-protos <voltha-protos>`
+     - :vol-ger:`5.6.2 <voltha-protos/+/refs/heads/voltha-2.13/VERSION>`
      - ``N/A``
-     - :vol-ger:`X </voltha-protos/+/refs/tags/v5.6.2>`_
-     - :vol-git:`X </voltha-protos/releases/tag/v5.6.2>`_
+     - :vol-ger:`X <voltha-protos/+/refs/tags/v5.6.2>`
+     - :vol-git:`X <voltha-protos/releases/tag/v5.6.2>`
      - `stale <https://hub.docker.com/r/voltha/voltha-protos/tags>`__
      - `stale <https://pkg.go.dev/github.com/opencord/voltha-protos>`__
      - `5.6.2 <https://pypi.org/project/voltha-protos/5.6.2>`__
      -
-   * - :vol-git:`voltha-system-tests </voltha-system-tests/releases/tag/2.13.0>`_
-     - ``2.13.0``
+   * - :vol-git:`voltha-system-tests <voltha-system-tests/releases/tag/v2.13.0>`
+     - ``v2.13.0``
      -
-     - :vol-ger:`X </voltha-system-tests/+/refs/tags/2.13.0>`_
-     - :vol-git:`X </voltha-system-tests/tree/2.13.0>`_
+     - :vol-ger:`X <voltha-system-tests/+/refs/tags/v2.13.0>`
+     - :vol-git:`X <voltha-system-tests/tree/v2.13.0>`
      -
      -
      -
@@ -366,9 +366,9 @@
 
    * - Component
      - VOLTHA
-     - :vol-ger:`Chart.yaml </voltha-helm-charts/+/refs/heads/master>`
+     - :vol-ger:`Chart.yaml <voltha-helm-charts/+/refs/heads/master>`
      - `Gerrit <https://gerrit.opencord.org/admin/repos>`_
-     - :vol-git:`Github</>`
+     - :vol-git:`Github<>`
      - `Docker <https://hub.docker.com/search?q=voltha>`_
      - `Golang <https://pkg.go.dev>`_
      - `Pypi <https://pypi.org>`_
@@ -391,38 +391,38 @@
      -
      -
      -
-   * - :vol-ger:`voltha-docs </voltha-docs>`_ , `docs.voltha.org <https://docs.voltha.org>`
+   * - :vol-ger:`voltha-docs <voltha-docs>` , `docs.voltha.org <https://docs.voltha.org>`
      - ``2.13.0``
      - ``N/A``
-     - :vol-ger:`X </voltha-docs/+/refs/tags/2.13.0>`_
-     - :vol-git:`X </voltha-docs/releases/tag/2.13.0>`_
+     - :vol-ger:`X <voltha-docs/+/refs/tags/2.13.0>`
+     - :vol-git:`X <voltha-docs/releases/tag/2.13.0>`
      -
      -
      -
      - ``N``
    * - `bbsim <https://gerrit.opencord.org/gitweb?p=bbsim.git;a=tree>`__
      - ``1.16.7``
-     - ``4.8.11`` :vol-ger:`chart </voltha-helm-charts/+/refs/heads/voltha-2.13/bbsim/Chart.yaml>`_
-     - :vol-ger:`X </bbsim>`_
-     - :vol-git:`X </bbsim/tree/v1.16.7>`_
+     - ``4.8.11`` :vol-ger:`chart <voltha-helm-charts/+/refs/heads/voltha-2.13/bbsim/Chart.yaml>`
+     - :vol-ger:`X <bbsim>`
+     - :vol-git:`X <bbsim/tree/v1.16.7>`
      - `X <https://hub.docker.com/layers/voltha/bbsim/1.16.7/images/sha256-c23de193c1d7cf8d32c48edfbec4bfa6c47dbeecd4b31d040da0255eeab2ec58?context=explore>`__
      - ``?``
      - ``?``
      - ``N``
    * - `Bbsim-sadis-server <https://gerrit.opencord.org/gitweb?p=bbsim-sadis-server.git;a=tree>`__
-     - :vol-ger:`0.4.0 </bbsim-sadis-server/+/refs/heads/voltha-2.13/VERSION>`
-     - :vol-ger:`0.3.5 </voltha-helm-charts/+/refs/heads/voltha-2.13/voltha-infra/Chart.yaml#45>`
-     - :vol-ger:`X </bbsim-sadis-server/+/refs/tags/v0.4.0/VERSION>`_
-     - :vol-git:`X </bbsim-sadis-server/releases/tag/v0.4.0>`_
+     - :vol-ger:`0.4.0 <bbsim-sadis-server/+/refs/heads/voltha-2.13/VERSION>`
+     - :vol-ger:`0.3.5 <voltha-helm-charts/+/refs/heads/voltha-2.13/voltha-infra/Chart.yaml#45>`
+     - :vol-ger:`X <bbsim-sadis-server/+/refs/tags/v0.4.0/VERSION>`
+     - :vol-git:`X <bbsim-sadis-server/releases/tag/v0.4.0>`
      - `X <https://hub.docker.com/layers/voltha/bbsim-sadis-server/0.4.0/images/sha256-0ea9df1be13f8b1d0a8314cbf0e0800e4a4b7e2920ae3ce5e119abddb9359350?context=explore>`__
      -
      -
      - ``N``
    * - `voltctl <https://gerrit.opencord.org/gitweb?p=voltctl.git;a=tree>`_
-     - :vol-ger:`1.11.8 </voltctl/+/refs/heads/voltha-2.13/VERSION>`
+     - :vol-ger:`1.11.8 <voltctl/+/refs/heads/voltha-2.13/VERSION>`
      - ``N/A``
-     - :vol-ger:`X </voltctl/+/refs/tags/v1.11.8>`_
-     - :vol-git:`? </voltctl/releases/tag/v1.11.8>`
+     - :vol-ger:`X <voltctl/+/refs/tags/v1.11.8>`
+     - :vol-git:`? <voltctl/releases/tag/v1.11.8>`
      - ``N/A``
      - `X <https://pkg.go.dev/github.com/opencord/voltctl@v1.11.8>`__
      - ``N/A``
@@ -445,13 +445,13 @@
    * -
      -
    * - Helm Charts (voltha-helm-charts)
-     - :vol-ger:`3.5.0 </voltha-helm-charts/+/refs/heads/voltha-2.13/VERSION>`
+     - :vol-ger:`3.5.0 <voltha-helm-charts/+/refs/heads/voltha-2.13/VERSION>`
    * - Voltha
-     - :vol-ger:`2.13.0 </voltha-helm-charts/+/refs/heads/master/voltha/Chart.yaml#20>`
+     - :vol-ger:`2.13.0 <voltha-helm-charts/+/refs/heads/master/voltha/Chart.yaml#20>`
    * - Voltha-infra
-     - :vol-ger:`2.13.0 </voltha-helm-charts/+/refs/heads/master/voltha-infra/Chart.yaml#37>`
+     - :vol-ger:`2.13.0 <voltha-helm-charts/+/refs/heads/master/voltha-infra/Chart.yaml#37>`
    * - Voltha-stack
-     - :vol-ger:`2.13.0 </voltha-helm-charts/+/refs/heads/master/voltha-stack/Chart.yaml#37>`
+     - :vol-ger:`2.13.0 <voltha-helm-charts/+/refs/heads/master/voltha-stack/Chart.yaml#37>`
 
 BAL Version
 +++++++++++
diff --git a/release_notes/voltha_2.3.rst b/release_notes/voltha_2.3.rst
index 5eb32fb..379dba8 100644
--- a/release_notes/voltha_2.3.rst
+++ b/release_notes/voltha_2.3.rst
@@ -66,8 +66,7 @@
 Testing
 -------
 
-- `Unit tests coverage
-  <https://jenkins.opencord.org/view/VOLTHA%202.x%20verify>`_ greatly improved
+- Unit tests coverage greatly improved
 
 - Integration Tests
 
@@ -79,7 +78,7 @@
     - Validation checks for Error Scenarios
     - Beginning of functional tests for DT WorkFlow
 
-- `Community pods <https://jenkins.opencord.org/view/Community-PODs/>`_ at DT
+- Community pods at DT
   (Berlin) with GPON and XGSPON OLTs, and Infosys with XGSPON OLT, were set up
 
 - Scale Tests
@@ -173,6 +172,3 @@
 - Get access credentials for https://edgecore.quickconnect.to and then login
   and navigate to File_Station -> EdgecoreNAS, and then the folder
   /ASXvOLT16/OpenOLT_Agent/From_ONF_Distribution/ and pick the version above
-
-
-
diff --git a/sphinx_conf/linkcheck_ignore.py b/sphinx_conf/linkcheck_ignore.py
index d4cb09c..1bae87b 100644
--- a/sphinx_conf/linkcheck_ignore.py
+++ b/sphinx_conf/linkcheck_ignore.py
@@ -109,6 +109,11 @@
     r'.*/_static/cord-tester/.*',
     r'.*/_static/voltha-system-tests/.*',
 
+    # Some docs were not correctly deployed, creating a cycle where new docs
+    # can't be generated because of link failures. We therefore need to
+    # temporarily stop all linkchecks against docs.voltha.org.
+    r'https://docs.voltha.org/.*',
+
     ])
 
 # [SEE ALSO]
diff --git a/testing/voltha_test_automation.rst b/testing/voltha_test_automation.rst
index cd40c4a..39aea2a 100644
--- a/testing/voltha_test_automation.rst
+++ b/testing/voltha_test_automation.rst
@@ -15,15 +15,14 @@
 
    Voltha OpenCord Jenkins
 
-Similar set of jobs are kept under similar tabs. Like,
-all the master build jobs are placed under
-`VOLTHA-2.X-Tests <https://jenkins.opencord.org/view/VOLTHA-2.X-Tests/>`_
-tab, jobs related to the voltha-2.12 LTS release are in VOLTHA-2.12 tab.
+Similar set of jobs are kept under similar tabs. For example, jobs related to
+the voltha-2.13 release are in VOLTHA-2.13 tab.
 
 Likewise, tests that collect measurements on Voltha performance at scale
 are placed under `voltha-scale-measurements <https://jenkins.opencord.org/view/voltha-scale-measurements/>`_.
 
-Jenkins also host `verification jobs <https://jenkins.opencord.org/view/VOLTHA%202.x%20verify/>`_ that trigger automatically whenever a patch is pushed or updated on Gerrit for the review.
+Jenkins also hosts verification jobs that trigger automatically whenever a patch
+is pushed or updated on Gerrit for the review.
 
 
 Job Templates