diff --git a/.gitignore b/.gitignore
index 06371ed..60ccb38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # -*- makefile -*-
 
 # build related
+__pycache__/
 .venv/
 venv_docs
 doc_venv
diff --git a/VERSION b/VERSION
index 65cde91..dcb27a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.12.4.6-dev
+2.12.5
diff --git a/howto/release/branching/index.rst b/howto/release/branching/index.rst
new file mode 100644
index 0000000..ae389f0
--- /dev/null
+++ b/howto/release/branching/index.rst
@@ -0,0 +1,6 @@
+Release Branching Tasks
+=======================
+- `VOL-5063 <https://jira.opencord.org/browse/VOL-5063>`_
+
+  - Freeze version of voltctl captured by the build docker image target.
+
diff --git a/howto/release/checklist.rst b/howto/release/checklist.rst
index 789d779..206ac9d 100644
--- a/howto/release/checklist.rst
+++ b/howto/release/checklist.rst
@@ -55,7 +55,46 @@
 Helm Charts
 -----------
 
+voltha-infra
+^^^^^^^^^^^^
+
 Once dependent packages are built update helm charts:  charts/index
+- Verify by `installation <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts>`_
+
+.. code:: bash
+
+   helm upgrade --install --create-namespace -n infra --version 2.8.0 voltha-infra onf/voltha-infra
+
+voltha-stack
+^^^^^^^^^^^^
+
+.. code:: bash
+
+   helm upgrade --install --create-namespace \
+       -n voltha voltha onf/voltha-stack \
+       --set global.stack_name=voltha \
+       --set global.voltha_infra_name=voltha-infra \
+       --set global.voltha_infra_namespace=infra
+
+Verify DT & TT
+^^^^^^^^^^^^^^
+
+`deploying-a-different-workflow <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts#deploying-a-different-workflow>`_
+
+Update
+https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/voltha-stack/Chart.yaml
+
+
+Misc
+^^^^
+
+.. code:: bash
+
+   helm upgrade --install -n voltha bbsim0 onf/bbsim --set olt_id=10
+
+   # https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts#deploying-a-different-workflow
+   kubectl get pods --all-namespaces
+
 
 Voltha with golang source
 -------------------------
@@ -115,3 +154,7 @@
      - Update go mod files
 
 Review `voltha-helm-charts <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts>`_
+
+Release voltha-protos & friends in order
+----------------------------------------
+https://docs.voltha.org/master/overview/release_process.html?highlight=charts%20yaml
diff --git a/howto/release/components/igmpproxy/index.rst b/howto/release/components/igmpproxy/index.rst
new file mode 100644
index 0000000..d6c96f4
--- /dev/null
+++ b/howto/release/components/igmpproxy/index.rst
@@ -0,0 +1,17 @@
+ONOS Component: mcast
+=====================
+
+Repository: igmpproxy
+App: igmpproxy
+
+Dependencies (pom.xml)
+----------------------
+
+- sadis
+
+Dependencies (Maven plugins)
+----------------------------
+
+- spotbugs-maven-plugin  v4.7.3.4
+- findsecbugs-plugin     v1.12.0
+
diff --git a/howto/release/components/index.rst b/howto/release/components/index.rst
index 3910d27..7001c48 100644
--- a/howto/release/components/index.rst
+++ b/howto/release/components/index.rst
@@ -4,6 +4,14 @@
 .. toctree::
    :maxdepth: 1
 
+   igmpproxy/index
+   kafka/index
+   maclearner/index
+   mcast/index
+   olt/index
+   olttopology/index
+   pppoeagent/index
+
    onos_components
    onos_dependencies
    maven_plugins
@@ -19,13 +27,6 @@
    atomix/index
    onos/index
 
-   maclearner/index
-   mcast/index
-   olt/index
-   olttopology/index
-   pppoeagent/index
-
-
 See Also
 --------
    `VOLTHA and ONOS update procedures <https://docs.voltha.org/master/operations/software-upgrade.html?highlight=set%20global%20image>`_.
diff --git a/howto/release/components/kafka/index.rst b/howto/release/components/kafka/index.rst
new file mode 100644
index 0000000..113f6a4
--- /dev/null
+++ b/howto/release/components/kafka/index.rst
@@ -0,0 +1,21 @@
+ONOS Component: mcast
+=====================
+
+Repository: kafka-onos (ssh://gerrit.opencord.org:29418/kafka-onos)
+App: kafka
+
+Dependencies (pom.xml)
+----------------------
+
+- sadis
+- onlab-junit
+
+Dependencies (Maven plugins)
+----------------------------
+
+- spotbugs-maven-plugin  v4.7.3.4
+- findsecbugs-plugin     v1.12.0
+- `org.apache.servicemix.bundles.kafka-clients <https://mvnrepository.com/artifact/org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients>`_
+
+  - 3.4.0_1
+  - 1.1.1_1
diff --git a/howto/release/components/maclearner/index.rst b/howto/release/components/maclearner/index.rst
index 5020439..05327d6 100644
--- a/howto/release/components/maclearner/index.rst
+++ b/howto/release/components/maclearner/index.rst
@@ -1,6 +1,9 @@
 ONOS Component: maclearner
 ==========================
 
+Repository: mac-learning
+App: maclearner
+
 Dependencies (pom.xml)
 ----------------------
 
@@ -10,4 +13,14 @@
 
 `gerrit:mac-learning <https://gerrit.opencord.org/plugins/gitiles/mac-learning/+/refs/tags/1.2.1>`_
 `maven central:maclearner <https://central.sonatype.com/artifact/org.opencord/maclearner/1.2.1>`_
+
 pom.xml:maclearner
+==================
+- sadis
+- onlab-junit
+
+Dependencies (Maven plugins)
+----------------------------
+
+- spotbugs-maven-plugin  v4.7.3.4
+- findsecbugs-plugin     v1.12.0
diff --git a/howto/release/components/pppoeagent/index.rst b/howto/release/components/pppoeagent/index.rst
index 9e81c46..4de5f77 100644
--- a/howto/release/components/pppoeagent/index.rst
+++ b/howto/release/components/pppoeagent/index.rst
@@ -12,3 +12,15 @@
 - Components
 
   - sadis
+
+- Repository
+
+  `pppoeagent <https://gerrit.opencord.org/plugins/gitiles/pppoeagent>`_
+  `gerrit:122 <https://gerrit.opencord.org/plugins/gitiles/pppoeagent/+/refs/tags/1.2.2>`_
+  `github:122 <https://github.com/opencord/pppoeagent/tree/1.2.2>`_
+
+- `Maven Central <https://central.sonatype.com/search?q=pppoeagent>`_
+
+  - `pkg:121 <https://central.sonatype.com/artifact/org.opencord/pppoeagent/1.2.1>`_
+  - `api:121 <https://central.sonatype.com/artifact/org.opencord/pppoeagent-api/1.2.1>`_
+  - `app:121 <https://central.sonatype.com/artifact/org.opencord/pppoeagent-app/1.2.1>`_
diff --git a/howto/release/index.rst b/howto/release/index.rst
index e1d998c..06b7d39 100644
--- a/howto/release/index.rst
+++ b/howto/release/index.rst
@@ -7,6 +7,7 @@
    preparation
    release-notes
 
+   branching/index
    ci-management/index
    components/index
    hierarchy/index
diff --git a/howto/release/release-notes.rst b/howto/release/release-notes.rst
index 6e762dc..c9f1c23 100644
--- a/howto/release/release-notes.rst
+++ b/howto/release/release-notes.rst
@@ -28,7 +28,7 @@
 
 - Add `release_notes/voltha_2.12.rst <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/release_notes/voltha_2.11.rst>`_ in the index file `release_notes/index.rst <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/release_notes/index.rst>`_
 
-- Modify `config.py <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/conf.py#308>`_ so ``make linkcheck`` will not fail on yet-to-be-generated html release notes file.
+- Modify `config.py <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/conf.py>`_ so ``make linkcheck`` will not fail on yet-to-be-generated html release notes file.
 
 - Release notes: content and hilights:
 
diff --git a/howto/release/voltha-docs/index.rst b/howto/release/voltha-docs/index.rst
index 2d3441b..3b2534f 100644
--- a/howto/release/voltha-docs/index.rst
+++ b/howto/release/voltha-docs/index.rst
@@ -10,4 +10,5 @@
    :maxdepth: 1
 
    release_notes
+   release_history
    create_lts_view
diff --git a/howto/release/voltha-docs/release_history.rst b/howto/release/voltha-docs/release_history.rst
new file mode 100644
index 0000000..f65fd91
--- /dev/null
+++ b/howto/release/voltha-docs/release_history.rst
@@ -0,0 +1,15 @@
+docs.voltha.org VOLTHA Releases
+===============================
+
+Intent
+------
+
+Update the VOLTHA Releases page to note date of release, end-of-support
+date and LTS, Long Term Support release candidates.
+
+Source
+------
+
+- `overview/releases.html <https://docs.voltha.org/master/overview/releases.html>`_
+- `overview/releases.rst <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/overview/releases.rst>`_
+
diff --git a/howto/release/voltha-docs/release_notes.rst b/howto/release/voltha-docs/release_notes.rst
index 544fb06..869e022 100644
--- a/howto/release/voltha-docs/release_notes.rst
+++ b/howto/release/voltha-docs/release_notes.rst
@@ -14,3 +14,31 @@
 - Naviagate to the `release_notes <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/release_notes/>`_ folder.
 - Copy the last voltha_X.Y.rst document name name it for the upcoming release.
 - Update `index.rst <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/release_notes/index.rst>`_ so documents are displayed in order.
+
+Release Notes
+-------------
+
+- Sections at the top Hilights, Features, Bug Fixes are normally written by TSTs with help from community members.
+- Now search for the "Component Versions in VOLTHA" section.
+
+  - All of the pkg/api/app version strings will need to be captured in a grid.
+  - If an upgrade wiki page was maintained during release builds the task
+    is easy, just copy build status info from the wiki.
+  - If information was not tracked while packages were built, this step will become all manual lookup activity.
+
+Component Versions in VOLTHA 2.12 release
+
+See Also
+--------
+
+- Release tracking
+
+  - `jira tickets <https://jira.opencord.org/browse/VOL-5019>`_
+  - `Wiki(s) <https://wiki.opennetworking.org/display/VOLTHA/v2.12>`_
+
+    - `Published artifact and versions <https://wiki.opennetworking.org/display/VOLTHA/v2.12+Deployments>`_
+
+- Release notes template
+
+  - Rendered html `docs.voltha.org <https://docs.voltha.org/master/release_notes/template.html>`_
+  - Markup source `rst <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/release_notes/template.rst>`_
diff --git a/overview/releases.rst b/overview/releases.rst
index 5970216..5619bb4 100644
--- a/overview/releases.rst
+++ b/overview/releases.rst
@@ -117,17 +117,17 @@
      -
      -
    * - `VOLTHA 2.10 <../release_notes/voltha_2.10.html>`_
-     - June 30, 2022
-     - December 30, 2022
+     - July 1, 2022
+     - Dec 30, 2022
      -
      -
    * - `VOLTHA 2.11 <../release_notes/voltha_2.11.html>`_
-     - June 30, 2022
-     - December 30, 2022
+     - Feb 6, 2023
+     - July 1, 2023
      -
      -
    * - `VOLTHA 2.12 <../release_notes/voltha_2.12.html>`_
-     - December 30, 2022
-     - June 30, 2023
+     - July 1, 2023
+     - Dec 30, 2023
      -
      -
diff --git a/release_notes/template.rst b/release_notes/template.rst
index cd114ae..48313da 100644
--- a/release_notes/template.rst
+++ b/release_notes/template.rst
@@ -40,7 +40,7 @@
 ---------------------
 
 Thanks to the Continuous Certification program at ONF we can also ensure
-that the following ONF member products are compatible with the VOLTHA 2.xx
+that the following ONF member products are compatible with the VOLTHA 2.XX
 release:
 
 - Edgecore ASGVolt64 GPON OLT
@@ -52,11 +52,11 @@
 Jira stories
 ------------
 A full list of stories and bugs completed can be found under the
-`VOLTHA 2.xx <https://jira.opencord.org/projects/VOL/versions/12600>`_ (`formatted <https://jira.opencord.org/secure/ReleaseNote.jspa?projectId=10106&version=12600>`_) release page in Jira.
+`VOLTHA 2.XX <https://jira.opencord.org/projects/VOL/versions/12600>`_ (`formatted <https://jira.opencord.org/secure/ReleaseNote.jspa?projectId=10106&version=12600>`_) release page in Jira.
 
 |
 
-Component Versions in VOLTHA 2.12 release
+Component Versions in VOLTHA 2.XX release
 -----------------------------------------
 
 Helm Chart Versions
@@ -109,15 +109,20 @@
 
 Mailing List
 ++++++++++++
+
   - `voltha-discuss@opennetworking.org <https://groups.google.com/a/opennetworking.org/g/voltha-discuss>`_.
 
 Weekly TST Meetings
 +++++++++++++++++++
-- `Zoom Meeting <https://www.google.com/url?q=https://onf.zoom.us/j/978447356?pwd%3DdS9WajNLam9ZeFExOHV3SXB2Nk1VZz09&sa=D&source=calendar&ust=1686087684256971&usg=AOvVaw3dMQpIMYLlyjTTmkvW_edp>`_.
-- `Rolling Agenda <https://www.google.com/url?q=https://docs.google.com/document/d/1mNqronCip_-tDjFI-ZoudNteC3AnOcVONPHz7HuW8Eg/edit?usp%3Dsharing&sa=D&source=calendar&ust=1686087684256971&usg=AOvVaw3km2VVU2j1qa6JCGI0iSBx>`_.
 
-Website
-- `onf/VOLTHA <https://opennetworking.org/voltha/>`_
-- `docs.voltha.org <https://docs.voltha.org>`_
+  - `Zoom Meeting <https://www.google.com/url?q=https://onf.zoom.us/j/978447356?pwd%3DdS9WajNLam9ZeFExOHV3SXB2Nk1VZz09&sa=D&source=calendar&ust=1686087684256971&usg=AOvVaw3dMQpIMYLlyjTTmkvW_edp>`_.
+  - `Rolling Agenda <https://www.google.com/url?q=https://docs.google.com/document/d/1mNqronCip_-tDjFI-ZoudNteC3AnOcVONPHz7HuW8Eg/edit?usp%3Dsharing&sa=D&source=calendar&ust=1686087684256971&usg=AOvVaw3km2VVU2j1qa6JCGI0iSBx>`_.
+
+Website(s)
+++++++++++
+
+  - `onf/VOLTHA <https://opennetworking.org/voltha/>`_
+  - `docs.voltha.org <https://docs.voltha.org>`_
+  - `Wiki <https://wiki.opennetworking.org/display/VOLTHA/Voltha>`_
 
 |
diff --git a/release_notes/voltha_2.12.rst b/release_notes/voltha_2.12.rst
index 59a5474..7331bfc 100644
--- a/release_notes/voltha_2.12.rst
+++ b/release_notes/voltha_2.12.rst
@@ -73,8 +73,8 @@
      - Gerrit
      - Github
    * - Name
-     - Version
-     - Version
+     - Ver
+     - Ver
      - Chart
      - URL
      - URL
@@ -97,29 +97,27 @@
      -
      -
 
-ONOS Apps
-+++++++++
+ONOS Components
++++++++++++++++
 
-.. list-table:: ONOS Apps
-   :widths: 10, 5, 2, 3, 5, 5, 5, 1
+.. list-table:: ONOS Components
+   :widths: 10, 2, 2, 2, 2, 2, 2
    :header-rows: 2
 
    * - Component
-     - VOLTHA
-     - Maven
-     - Component
-     - with
+     - Artifact
+     - Api
+     - App
+     - All
      - Gerrit
      - Github
-     - Release
    * - Name
-     - Version
-     - Version(s)
-     - Artifact
-     - Chart
+     - Ver
+     - Ver
+     - Ver
+     - Ver
      - URL
      - URL
-     - Status
    * -
      -
      -
@@ -127,97 +125,83 @@
      -
      -
      -
-     -
    * - `aaa <https://gerrit.opencord.org/gitweb?p=aaa.git;a=summary>`_
-     -
-     - `2.10.3 <https://mvnrepository.com/artifact/org.opencord/aaa>`_
-     - `api <https://central.sonatype.com/artifact/org.opencord/aaa-api/2.10.3>`__
-       `app <https://central.sonatype.com/artifact/org.opencord/aaa-app/2.10.3>`__
-       `pkg <https://central.sonatype.com/artifact/org.opencord/aaa/2.10.3>`__
-     -
+     - `2.10.3 <https://mvnrepository.com/artifact/org.opencord/aaa/2.10.3>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/aaa-api/2.10.3>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/aaa-app/2.10.3>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/aaa>`__
      - `X <https://gerrit.opencord.org/plugins/gitiles/aaa/+/refs/tags/2.10.3>`__
      - `X <https://github.com/opencord/aaa/tree/2.10.3>`__
-     -
-   * - `bng <https://gerrit.opencord.org/gitweb?p=bng.git;a=summary>`_
-     -
-     - `2.5.0 <https://central.sonatype.com/artifact/org.opencord/bng>`__
-     - `api <https://mvnrepository.com/artifact/org.opencord/bng-api/2.5.0>`__
-       `app <https://mvnrepository.com/artifact/org.opencord/bng-app/2.5.0>`__
-       `pkg <https://mvnrepository.com/artifact/org.opencord/bng/2.5.0>`__
-     -
-     - `X <https://github.com/opencord/bng/tree/2.5.0>`__
+   * - `bng <https://gerrit.opencord.org/gitweb?p=bng.git;a=summary>`__
+     - `2.5.0 <https://mvnrepository.com/artifact/org.opencord/bng/2.5.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/bng-api/2.5.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/bng-app/2.5.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/bng/>`__
      - `X <https://gerrit.opencord.org/plugins/gitiles/bng/+/refs/tags/2.5.0>`__
-     -
-   * - `dhcpl2relay <https://gerrit.opencord.org/gitweb?p=dhcpl2relay.git;a=summary>`_
-     -
-     - `2.10.0 <https://mvnrepository.com/artifact/org.opencord/dhcpl2relay>`_
-     - `api <https://mvnrepository.com/artifact/org.opencord/dhcpl2relay-api/2.10.0>`_
-       `app <https://mvnrepository.com/artifact/org.opencord/dhcpl2relay-app/2.10.0>`_
-       `pkg <https://mvnrepository.com/artifact/org.opencord/dhcpl2relay/2.10.0>`_
-     -
+     - `X <https://github.com/opencord/bng/tree/2.5.0>`__
+   * - `dhcpl2relay <https://gerrit.opencord.org/gitweb?p=dhcpl2relay.git;a=summary>`__
+     - `2.10.0 <https://mvnrepository.com/artifact/org.opencord/dhcpl2relay/2.10.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/dhcpl2relay-api/2.10.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/dhcpl2relay-app/2.10.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/dhcpl2relay>`__
      - `X <https://gerrit.opencord.org/plugins/gitiles/dhcpl2relay/+/refs/tags/2.10.0>`__
      - `X <https://github.com/opencord/dhcpl2relay/tree/2.10.0>`__
-     -
-   * - `igmpproxy <https://gerrit.opencord.org/gitweb?p=igmpproxy.git;a=summary>`_
-     -
-     - `2.8.0 <https://mvnrepository.com/artifact/org.opencord/onos-app-igmpproxy>`__
-     - `app <https://mvnrepository.com/artifact/org.opencord/onos-app-igmpproxy-app/2.8.0>`__
-       `api <https://mvnrepository.com/artifact/org.opencord/onos-app-igmpproxy-api/2.8.0>`__
-       `pkg <https://mvnrepository.com/artifact/org.opencord/onos-app-igmpproxy/2.8.0>`__
-     -
-     - `X <https://gerrit.opencord.org/plugins/gitiles/igmpproxy/+/refs/tags/2.7.0>`__
-     - `X <https://github.com/opencord/igmpproxy/tree/2.7.0>`__
-     - !
-   * - `kafka <https://gerrit.opencord.org/gitweb?p=kafka-onos.git;a=summary>`_
-     -
-     - `2.12-unpublished <https://mvnrepository.com/artifact/org.opencord/kafka>`__
-     - `api <https://mvnrepository.com/artifact/org.opencord/kafka-api/2.10.0>`__
-       `app <https://mvnrepository.com/artifact/org.opencord/kafka-app/2.10.0>`__
-       `pkg <https://mvnrepository.com/artifact/org.opencord/kafka/2.10.0>`__
-     -
-     - ``X-unpublished`` ``https://gerrit.opencord.org/plugins/gitiles/kafka-onos/+/refs/tags/2.12.0``
-     - ``X-unpublished`` ``https://github.com/opencord/kafka-onos/tree/2.12.0``
-     - !
-   * - `mcast <https://gerrit.opencord.org/gitweb?p=mcast.git;a=summary>`_
-     -
-     - `2.9.0 <https://central.sonatype.com/artifact/org.opencord/mcast/2.9.0>`_
-     -
-     -
+   * - `igmpproxy <https://gerrit.opencord.org/gitweb?p=igmpproxy.git;a=summary>`__
+     - `2.8.0 <https://mvnrepository.com/artifact/org.opencord/onos-app-igmpproxy/2.8.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/onos-app-igmpproxy-app/2.8.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/onos-app-igmpproxy-api/2.8.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/onos-app-igmpproxy>`__
+     - `X <https://gerrit.opencord.org/plugins/gitiles/igmpproxy/+/refs/tags/2.8.0>`__
+     - `X <https://github.com/opencord/igmpproxy/tree/2.8.0>`__
+   * - `kafka <https://gerrit.opencord.org/gitweb?p=kafka-onos.git;a=summary>`__
+     - `2.12.0 <https://mvnrepository.com/artifact/org.opencord/kafka/1.2.0>`__
+     - X
+     - X
+     - `X <https://mvnrepository.com/artifact/org.opencord/kafka>`__
+     - `X <https://gerrit.opencord.org/plugins/gitiles/kafka-onos/+/refs/tags/2.12.0>`__
+     - `X <https://github.com/opencord/kafka-onos/tree/2.12.0>`__
+   * - `maclearner <https://gerrit.opencord.org/plugins/gitiles/mac-learning>`__
+     - `1.2.2 <https://mvnrepository.com/artifact/org.opencord/maclearner/1.2.2>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/maclearner-api/1.2.2>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/maclearner-app/1.2.2>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/maclearner>`__
+     - `X <https://gerrit.opencord.org/plugins/gitiles/mac-learning/+/refs/tags/1.2.2>`__
+     - `X <https://github.com/opencord/mac-learning/tree/1.2.2>`__
+   * - `mcast <https://gerrit.opencord.org/gitweb?p=mcast.git;a=summary>`__
+     - `2.9.0 <https://mvnrepository.com/artifact/org.opencord/mcast/2.9.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/mcast-api/2.9.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/mcast-app/2.9.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/mcast>`__
      - `X <https://gerrit.opencord.org/plugins/gitiles/mcast/+/refs/tags/2.9.0>`__
      - `X <https://github.com/opencord/mcast/tree/2.9.0>`__
-     -
-   * - `olt <https://gerrit.opencord.org/gitweb?p=olt.git;a=summary>`_
-     -
-     - `5.2.4 <https://central.sonatype.com/artifact/org.opencord/olt/5.2.4>`_
-     -
-     -
+   * - `olt <https://gerrit.opencord.org/gitweb?p=olt.git;a=summary>`__
+     - `5.2.4 <https://mvnrepository.com/artifact/org.opencord/olt/5.2.4>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/olt-api/5.2.4>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/olt-app/5.2.4>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/olt>`__
      - `X <https://gerrit.opencord.org/plugins/gitiles/olt/+/refs/tags/5.2.4>`__
      - `X <https://github.com/opencord/olt/tree/5.2.4>`__
-     -
-   * - `sadis <https://gerrit.opencord.org/gitweb?p=sadis.git;a=summary>`_
-     -
-     - `5.11.1 <https://central.sonatype.com/artifact/org.opencord/sadis/5.11.1>`_
-     -
-     -
+   * - `olttopology <https://gerrit.opencord.org/plugins/gitiles/olttopology/>`__
+     - `1.3.0 <https://mvnrepository.com/artifact/org.opencord/olttopology/1.3.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/olttopology-api/1.3.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/olttopology-app/1.3.0>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/olttopology>`__
+     - `X <https://gerrit.opencord.org/plugins/gitiles/olttopology/+/refs/tags/1.3.0>`__
+     - `X <https://github.com/opencord/olttopology/releases/tag/1.3.0>`__
+   * - `pppoeagent <https://gerrit.opencord.org/plugins/gitiles/pppoeagent/>`__
+     - `1.2.3 <https://mvnrepository.com/artifact/org.opencord/pppoeagent/1.2.3>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/pppoeagent-api/1.2.3>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/pppoeagent-app/1.2.3>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/pppoeagent>`__
+     - `X <https://gerrit.opencord.org/plugins/gitiles/pppoeagent/+/refs/tags/1.2.3>`__
+     - `X <https://github.com/opencord/pppoeagent/releases/tag/1.2.3>`__
+   * - `sadis <https://gerrit.opencord.org/gitweb?p=sadis.git;a=summary>`__
+     - `5.11.1 <https://mvnrepository.com/artifact/org.opencord/sadis/5.11.1>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/sadis-api/5.11.1>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/sadis-app/5.11.1>`__
+     - `X <https://mvnrepository.com/artifact/org.opencord/sadis>`__
      - `X <https://gerrit.opencord.org/plugins/gitiles/sadis/+/refs/tags/5.11.1>`__
-     - `X <https://github.com/opencord/sadis/tree/5.11.1>`__
-     -
-   * - `pppoeagent <https://gerrit.opencord.org/plugins/gitiles/pppoeagent/>`_
-     -
-     - ``1.2.0``
-     -
-     -
-     - `X <https://gerrit.opencord.org/plugins/gitiles/pppoeagent/+/refs/tags/1.2.1>`__
-     - `X <https://github.com/opencord/pppoeagent/tree/1.2.1>`__
-     - !
-   * - `olttopology <https://gerrit.opencord.org/plugins/gitiles/olttopology/>`_
-     -
-     - ``1.2.0``
-     -
-     -
-     - `X <https://gerrit.opencord.org/plugins/gitiles/olttopology/+/refs/tags/1.2.1>`__
-     - `X <https://github.com/opencord/olttopology/tree/1.2.1>`__
-     - !
+     - `X <https://github.com/opencord/sadis/releases/tag/5.11.1>`__
 
 VOLTHA Components
 +++++++++++++++++
@@ -338,13 +322,6 @@
      - `X <https://gerrit.opencord.org/plugins/gitiles/voltha-system-tests/+/refs/tags/2.11.10>`__
      - `X <https://github.com/opencord/voltha-system-tests/tree/2.11.10>`__
      -
-   * - maclearner
-     - ``1.2.1``
-     -
-     -
-     -
-     -
-     -
    * - ppoeagent
      - ``1.2.1``
      -
@@ -478,22 +455,27 @@
 
 Slack
 +++++
+
   - `voltha-dev <https://app.slack.com/client/T095Z193Q/C01D229FP2A>`_
   - `community <https://app.slack.com/client/T095Z193Q/C0184DT7116>`_
   - `general <https://app.slack.com/client/T095Z193Q/C095YQBLL>`_
 
 Mailing List
 ++++++++++++
+
   - `voltha-discuss@opennetworking.org <https://groups.google.com/a/opennetworking.org/g/voltha-discuss>`_.
 
 Weekly TST Meetings
 +++++++++++++++++++
-- `Zoom Meeting <https://www.google.com/url?q=https://onf.zoom.us/j/978447356?pwd%3DdS9WajNLam9ZeFExOHV3SXB2Nk1VZz09&sa=D&source=calendar&ust=1686087684256971&usg=AOvVaw3dMQpIMYLlyjTTmkvW_edp>`_.
-- `Rolling Agenda <https://www.google.com/url?q=https://docs.google.com/document/d/1mNqronCip_-tDjFI-ZoudNteC3AnOcVONPHz7HuW8Eg/edit?usp%3Dsharing&sa=D&source=calendar&ust=1686087684256971&usg=AOvVaw3km2VVU2j1qa6JCGI0iSBx>`_.
 
-Website
-+++++++
-- `onf/VOLTHA <https://opennetworking.org/voltha/>`_
-- `docs.voltha.org <https://docs.voltha.org>`_
+  - `Zoom Meeting <https://www.google.com/url?q=https://onf.zoom.us/j/978447356?pwd%3DdS9WajNLam9ZeFExOHV3SXB2Nk1VZz09&sa=D&source=calendar&ust=1686087684256971&usg=AOvVaw3dMQpIMYLlyjTTmkvW_edp>`_.
+  - `Rolling Agenda <https://www.google.com/url?q=https://docs.google.com/document/d/1mNqronCip_-tDjFI-ZoudNteC3AnOcVONPHz7HuW8Eg/edit?usp%3Dsharing&sa=D&source=calendar&ust=1686087684256971&usg=AOvVaw3km2VVU2j1qa6JCGI0iSBx>`_.
+
+Website(s)
+++++++++++
+
+  - `onf/VOLTHA <https://opennetworking.org/voltha/>`_
+  - `docs.voltha.org <https://docs.voltha.org>`_
+  - `Wiki <https://wiki.opennetworking.org/display/VOLTHA/Voltha>`_
 
 |
diff --git a/sphinx_conf/linkcheck_ignore.py b/sphinx_conf/linkcheck_ignore.py
index a4f5b8f..d043e08 100644
--- a/sphinx_conf/linkcheck_ignore.py
+++ b/sphinx_conf/linkcheck_ignore.py
@@ -34,6 +34,16 @@
     r'https://mvnrepository.com/artifact/org.opencord/\S+',
 ])
 
+## [HACK] to get release notes edits in
+linkcheck_ignore.extend([
+
+    r'https://mvnrepository.com/artifact/org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients',
+
+    # conf.py#308 - Anchor '308' not found
+    # Line numbers in source are valid, figure out why this was flagged
+#    r'https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/conf.py\#\d+',
+])
+
 ## -----------------------------------------------------------------------
 ## https://jira.opencord.org/browse/VOL-5079
 ## -----------------------------------------------------------------------