diff --git a/VERSION b/VERSION
index 763f85e..46b81d8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.11.0-dev8
+2.11.0
diff --git a/conf.py b/conf.py
index 4a68580..654136c 100644
--- a/conf.py
+++ b/conf.py
@@ -291,6 +291,14 @@
         'vol-git'  : ('https://github.com/opencord/%s', 'git::%s'),
     }
 
+# -- Options for inlining a constant value -----------------------------------
+# NOTE: rst_prolog will affect every file in the repository.
+# Use per-file substitution to limit scope:
+#   https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html
+# rst_prolog = """
+# .. |voltha-latest| replace:: voltha-2.11
+# """
+
 # -- Options for todo extension ----------------------------------------------
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
diff --git a/howto/code/linting.rst b/howto/code/linting.rst
index 76f19ca..cc837f7 100644
--- a/howto/code/linting.rst
+++ b/howto/code/linting.rst
@@ -65,7 +65,7 @@
 Sources:
 
 - `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/>`__
-- `makefiles/lint/helm.mk <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/helm.mk>`_
+- `makefiles/lint/helm/include.mk <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/helm/include.mk>`_
 - [`master <https://gerrit.opencord.org/plugins/gitiles/helm-repo-tools/+/refs/heads/master>`__] `helm-repo-tools <https://gerrit.opencord.org/plugins/gitiles/helm-repo-tools>`_
 
 |
diff --git a/howto/release/ci-management/jjb_software_upgrades.rst b/howto/release/ci-management/jjb_software_upgrades.rst
index 23e64cc..d26eb4a 100644
--- a/howto/release/ci-management/jjb_software_upgrades.rst
+++ b/howto/release/ci-management/jjb_software_upgrades.rst
@@ -13,3 +13,5 @@
 
   - `aaa-app/2.9.0-SNAPSHOT <https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.9.0-SNAPSHOT/>`_
 
+  - `aaa.index <https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app>`_
+
diff --git a/release_notes/release_process.rst b/release_notes/release_process.rst
index 63be3af..2953b6c 100644
--- a/release_notes/release_process.rst
+++ b/release_notes/release_process.rst
@@ -1,3 +1,5 @@
+.. |voltha-latest| replace:: voltha_2.11
+
 Release Process
 ===============
 
@@ -8,9 +10,9 @@
 
 A release branch name is decided on, where all tagged releases will be created
 in each repo. Historically this has been ``voltha`` followed by the Major and
-Minor `Semver <https://semver.org/>`_ version, such as ``voltha-2.2``,
-``voltha-2.3``, etc.  The rest of this section will use the ``voltha-2.3``
-release as an example:
+Minor `Semver <https://semver.org/>`_ version, such as ``voltha-2.3``,
+etc.  The rest of this section will use the ``voltha-2.3`` release as an
+example:
 
 A branch named ``voltha-2.3`` is created on the voltha-helm-charts repo.
 Release candidates will be created of each chart for the ``2.3`` release.
diff --git a/release_notes/voltha_2.11.rst b/release_notes/voltha_2.11.rst
index f808e4e..af60c17 100644
--- a/release_notes/voltha_2.11.rst
+++ b/release_notes/voltha_2.11.rst
@@ -1,4 +1,4 @@
-.. figure:: images/voltha.svg
+. figure:: images/voltha.svg
    :alt: voltha- Release Notes
    :width: 40%
    :align: center
@@ -180,6 +180,12 @@
      -
      - `X <https://gerrit.opencord.org/plugins/gitiles/aaa/+/refs/tags/2.9.0>`__
      - `X <https://github.com/opencord/aaa/tree/2.9.0>`__
+   * - `bng <https://gerrit.opencord.org/gitweb?p=bng.git;a=summary>`_
+     -
+     - ``2.4.0``
+     -
+     - `X <https://github.com/opencord/bng/tree/2.4.0>`__
+     - `X <https://gerrit.opencord.org/plugins/gitiles/bng/+/refs/tags/2.4.0>`__
    * - `dhcpl2relay <https://gerrit.opencord.org/gitweb?p=dhcpl2relay.git;a=summary>`_
      -
      - ``2.9.0``
@@ -216,12 +222,6 @@
      -
      - `X <https://gerrit.opencord.org/plugins/gitiles/sadis/+/refs/tags/5.10.0>`__
      - `X <https://github.com/opencord/sadis/tree/5.10.0>`__
-   * - `bng <https://gerrit.opencord.org/gitweb?p=bng.git;a=summary>`_
-     -
-     - ``2.4.0``
-     -
-     - `X <https://github.com/opencord/bng/tree/2.4.0>`__
-     - `X <https://gerrit.opencord.org/plugins/gitiles/bng/+/refs/tags/2.4.0>`__
    * - `pppoeagent <https://gerrit.opencord.org/plugins/gitiles/pppoeagent/>`_
      -
      - ``1.2.0``
@@ -230,7 +230,7 @@
      - `X <https://github.com/opencord/pppoeagent/tree/1.2.1>`__
    * - `olttopology <https://gerrit.opencord.org/plugins/gitiles/olttopology/>`_
      -
-     - ``1.2.0`` ``latest: 1.2.1``
+     - ``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>`__
@@ -253,7 +253,7 @@
      - Version
      - Version
      - `with Chart <https://gerrit.opencord.org/gitweb?p=helm-charts.git;a=tree;f=bbsim>`_
-     - URL
+     - ULR
      - URL
      - URL
    * -
@@ -264,7 +264,7 @@
      -
      -
    * - `Helm Charts (voltha-helm-charts) <https://gerrit.opencord.org/gitweb?p=voltha-helm-charts.git;a=tree>`_
-     - ``3.2.1-dev1``
+     - ``3.2.2-dev1``
      -
      -
      - `X <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master>`__
@@ -274,26 +274,26 @@
      - ``1.14.4``
      - ``4.8.6``
      - `chart <https://gerrit.opencord.org/gitweb?p=helm-charts.git;a=tree;f=bbsim>`_
-     - `X <https://gerrit.opencord.org/plugins/gitiles/voltha-openolt-adapter/+/refs/tags/v4.2.10>`__
+     -
      - `X <https://github.com/opencord/bbsim/tree/v1.14.4>`__
      - `X <https://hub.docker.com/layers/voltha/bbsim/1.14.4/images/sha256-c23de193c1d7cf8d32c48edfbec4bfa6c47dbeecd4b31d040da0255eeab2ec58?context=explore>`__
    * - `Bbsim-sadis-server <https://gerrit.opencord.org/gitweb?p=bbsim-sadis-server.git;a=tree>`_
      -
      - ``0.3.4``
-     -
+     - `0.3.2 <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/bbsim-sadis-server/Chart.yaml>`_
      - `X <https://gerrit.opencord.org/plugins/gitiles/bbsim-sadis-server/+/refs/tags/v0.3.4>`_
      - `X <https://github.com/opencord/bbsim-sadis-server/releases/tag/v0.3.4>`__
      -
    * - `ofagent-go <https://gerrit.opencord.org/gitweb?p=ofagent-go.git;a=tree>`_
-     - ``2.1.2``
-     - ``2.1.2``
+     - ``2.1.3``
+     - ``2.1.3``
      - ``2.11.3``
      -
      - `X <https://github.com/opencord/ofagent-go>`__
      - `1.1.4-? <https://hub.docker.com/layers/voltha/ofagent-go/1.1.4/images/sha256-8231111b69c8643c4981d64abff0a85d71f80763bb98632bb101e92b89882647?context=explore>`_
    * - `openolt agent <https://gerrit.opencord.org/gitweb?p=openolt.git;a=tree>`_
      -
-     - ``3.7.5``
+     - ``4.2.12``
      -
      -
      - `X <https://github.com/opencord/openolt>`__