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>`_
 
 |