diff --git a/howto/code/job-failures.rst b/howto/code/job-failures.rst
index ac7870b..f487c41 100644
--- a/howto/code/job-failures.rst
+++ b/howto/code/job-failures.rst
@@ -16,7 +16,7 @@
 FIX:
 ^^^^
 
-Most VOLTHA repositories contain the file `VERISON <https://gerrit.opencord.org/plugins/gitiles/voltha-openolt-adapter/+/refs/heads/master/VERSION>`_ which contain a semantic version string for builds.
+Most VOLTHA repositories contain the file `VERISON <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-openolt-adapter/+/refs/heads/master/VERSION>`_ which contain a semantic version string for builds.
 
 Content and use of the VERSION file is documented [`here <https://docs.voltha.org/master/overview/contributing.html#versioning>`_]
 
diff --git a/howto/code/lint/index.rst b/howto/code/lint/index.rst
index 4113b3d..520486b 100644
--- a/howto/code/lint/index.rst
+++ b/howto/code/lint/index.rst
@@ -20,7 +20,7 @@
 
 .. code:: bash
 
-    git clone ssh://gerrit.opencord.org:29418/voltha-helm-charts.git
+    git clone ssh://gerrit.lfbroadband.org:29418/voltha-helm-charts.git
     cd voltha-helm-charts
     make help | grep lint
     lint-chart                    chart_version_check.sh
diff --git a/howto/code/lint/lint-chart.rst b/howto/code/lint/lint-chart.rst
index c6f67ea..1177641 100644
--- a/howto/code/lint/lint-chart.rst
+++ b/howto/code/lint/lint-chart.rst
@@ -8,7 +8,7 @@
 
 ### Command(s):
 
-- `chart_version_check.sh <https://gerrit.opencord.org/plugins/gitiles/helm-repo-tools/+/refs/heads/master/chart_version_check.sh>`_
+- `chart_version_check.sh <https://gerrit.lfbroadband.org/plugins/gitiles/helm-repo-tools/+/refs/heads/master/chart_version_check.sh>`_
 
 .. code:: bash
 
@@ -17,8 +17,8 @@
 
 Sources:
 
-- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/>`__
-- `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>`_
+- `makefiles/lint <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/>`__
+- `makefiles/lint/helm/include.mk <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/helm/include.mk>`_
+- [`master <https://gerrit.lfbroadband.org/plugins/gitiles/helm-repo-tools/+/refs/heads/master>`__] `helm-repo-tools <https://gerrit.lfbroadband.org/plugins/gitiles/helm-repo-tools>`_
 
 |
diff --git a/howto/code/lint/lint-helm.rst b/howto/code/lint/lint-helm.rst
index 18994fc..2c016bb 100644
--- a/howto/code/lint/lint-helm.rst
+++ b/howto/code/lint/lint-helm.rst
@@ -7,7 +7,7 @@
 ===========
 
 Command(s):
-- `helmlint.sh <https://gerrit.opencord.org/plugins/gitiles/helm-repo-tools/+/refs/heads/master/helmlint.sh>`_
+- `helmlint.sh <https://gerrit.lfbroadband.org/plugins/gitiles/helm-repo-tools/+/refs/heads/master/helmlint.sh>`_
 
 .. code:: bash
 
@@ -16,8 +16,8 @@
 
 Sources:
 
-- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/>`__
-- `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>`_
+- `makefiles/lint <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/>`__
+- `makefiles/lint/helm/include.mk <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master/makefiles/lint/helm/include.mk>`_
+- [`master <https://gerrit.lfbroadband.org/plugins/gitiles/helm-repo-tools/+/refs/heads/master>`__] `helm-repo-tools <https://gerrit.lfbroadband.org/plugins/gitiles/helm-repo-tools>`_
 
 |
diff --git a/howto/code/lint/lint-robot.rst b/howto/code/lint/lint-robot.rst
index b1e2dfb..59814ec 100644
--- a/howto/code/lint/lint-robot.rst
+++ b/howto/code/lint/lint-robot.rst
@@ -18,8 +18,8 @@
 
 Sources:
 
-- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
-- `makefiles/lint/robot/*.mk <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/robot>`_
+- `makefiles/lint <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
+- `makefiles/lint/robot/*.mk <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/robot>`_
 
 .. seealso:
 
diff --git a/howto/code/lint/pre-commit.rst b/howto/code/lint/pre-commit.rst
index 29d4915..fe47e96 100644
--- a/howto/code/lint/pre-commit.rst
+++ b/howto/code/lint/pre-commit.rst
@@ -17,7 +17,7 @@
 
 .. code:: bash
 
-    % git clone ssh://gerrit.opencord.org:29418/bbsim.git
+    % git clone ssh://gerrit.lfbroadband.org:29418/bbsim.git
     % cd bbsim
 
     % make help
@@ -35,7 +35,7 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 VOLTHA repositories that have
-`repo:onf-make <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master>`_
+`repo:onf-make <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master>`_
 installed as a git submodule can use the makefile target `pre-commit` to
 create a virtualenv and invoke pre-commit with a single command.
 
@@ -58,7 +58,7 @@
 
 - Each repository contains a yaml config file that controls hooks and linting behavior:
 
-  - repo:bbsim/`.pre-commit-config.yaml <https://gerrit.opencord.org/plugins/gitiles/bbsim/+/refs/heads/master/.pre-commit-config.yaml>`__
+  - repo:bbsim/`.pre-commit-config.yaml <https://gerrit.lfbroadband.org/plugins/gitiles/bbsim/+/refs/heads/master/.pre-commit-config.yaml>`__
 
 - A skeleton config is currently being used.
 
@@ -78,9 +78,9 @@
 
 | Source | Description |
 | ------ | ----------- |
-| `repo:onf-make <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master>`_ | Repository containing makefile targets and common pre-commit config. |
-| `pre-commit <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/commands/pre-commit/>`_ | Makfile targets used to install the pre-commit tool. |
-| `virtualenv <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/virtualenv/>`_ | These makefiles will install a python virtulenv into sandbox/.venv/. |
+| `repo:onf-make <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master>`_ | Repository containing makefile targets and common pre-commit config. |
+| `pre-commit <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/commands/pre-commit/>`_ | Makfile targets used to install the pre-commit tool. |
+| `virtualenv <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/virtualenv/>`_ | These makefiles will install a python virtulenv into sandbox/.venv/. |
 
 .. todo:
 
diff --git a/howto/code/linting.rst b/howto/code/linting.rst
index 7fd223e..942260d 100644
--- a/howto/code/linting.rst
+++ b/howto/code/linting.rst
@@ -9,7 +9,7 @@
 
 .. code:: bash
 
-    % git clone ssh://gerrit.opencord.org:29418/onf-make.git
+    % git clone ssh://gerrit.lfbroadband.org:29418/onf-make.git
     % cd onf-make
 
     % make help | grep lint
@@ -155,17 +155,17 @@
 
    * - Source
      - Description
-   * - `makefiles/lint/doc8/include.mk <http://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/doc8/include.mk>`_
+   * - `makefiles/lint/doc8/include.mk <http://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/doc8/include.mk>`_
      - Main makefile logic for syntax checking RST sources.
-   * - `makefiles/lint/doc8/install.mk <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/doc8/install.mk>`_
+   * - `makefiles/lint/doc8/install.mk <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/doc8/install.mk>`_
      - Dependency logic to install the doc8 tool when needed.
-   * - `makefiles/lint/doc8/excl.mk <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/doc8/install.mk>`_
+   * - `makefiles/lint/doc8/excl.mk <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/doc8/install.mk>`_
      - Common doc8 exclusion patterns for all repositories.
 
 See Also
 --------
 
-- lint-doc8-all target dependency will create a `python virtual env <https://wiki.opencord.org>`_
+- lint-doc8-all target dependency will create a `python virtual env <https://lf-broadband.atlassian.net/wiki>`_
 
 |
 
@@ -184,12 +184,12 @@
 
 Sources:
 
-- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
+- `makefiles/lint <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
 - makefiles/lint/flake8.mk
 
 Notes:
 
-- lint-flake8-all target dependency will create a `python virtual env <https://wiki.opencord.org>`_
+- lint-flake8-all target dependency will create a `python virtual env <https://lf-broadband.atlassian.net/wiki>`_
 
 |
 
@@ -200,7 +200,7 @@
 
 Sources:
 
-- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
+- `makefiles/lint <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
 
 |
 
@@ -219,8 +219,8 @@
 
 Sources:
 
-- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
-- `makefiles/lint/json.mk <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/json.mk>`_
+- `makefiles/lint <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
+- `makefiles/lint/json.mk <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/json.mk>`_
 
 |
 
@@ -237,8 +237,8 @@
 
 Sources:
 
-- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/voltha-system-tests/+/refs/heads/master/makefiles/lint>`__
-- `makefiles/lint/license.mk <http://gerrit.opencord.org/plugins/gitiles/voltha-system-tests/+/refs/heads/master/makefiles/lint/license/include.mk>`_
+- `makefiles/lint <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-system-tests/+/refs/heads/master/makefiles/lint>`__
+- `makefiles/lint/license.mk <http://gerrit.lfbroadband.org/plugins/gitiles/voltha-system-tests/+/refs/heads/master/makefiles/lint/license/include.mk>`_
 
 |
 
@@ -257,14 +257,14 @@
 
 Sources:
 
-- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
+- `makefiles/lint <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
 - makefiles/lint/pylint.mk
-- `makefiles/patches/include.mk <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master/makefiles-orig/patches/>`__
+- `makefiles/patches/include.mk <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-docs/+/refs/heads/master/makefiles-orig/patches/>`__
 
 Notes:
 
 - 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>`_
+- lint-pylint-all target dependency will create a `python virtual env <https://lf-broadband.atlassian.net/wiki>`_
 
 |
 
@@ -283,8 +283,8 @@
 
 Sources:
 
-- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
-- `makefiles/lint/shell.mk <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/shell/include.mk>`_
+- `makefiles/lint <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
+- `makefiles/lint/shell.mk <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/shell/include.mk>`_
 
 |
 
@@ -303,8 +303,8 @@
 
 Sources:
 
-- `makefiles/lint <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
-- `makefiles/lint/yaml.mk <https://gerrit.opencord.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/yaml.mk>`_
+- `makefiles/lint <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/>`__
+- `makefiles/lint/yaml.mk <https://gerrit.lfbroadband.org/plugins/gitiles/onf-make/+/refs/heads/master/makefiles/lint/yaml.mk>`_
 
 |
 
@@ -323,11 +323,11 @@
 Repositories
 ============
 
-- [`master <https://gerrit.opencord.org/plugins/gitiles/bbsim/+/refs/heads/master>`__] `bbsim <https://gerrit.opencord.org/plugins/gitiles/bbsim>`_
-- [`master <https://gerrit.opencord.org/plugins/gitiles/pod-configs/+/refs/heads/master>`__] `pod-configs <https://gerrit.opencord.org/plugins/gitiles/pod-configs>`_
-- [`master <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master>`__] `voltha-docs <https://gerrit.opencord.org/plugins/gitiles/voltha-docs>`_
-- [`master <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master>`__] `voltha-helm-charts <https://gerrit.opencord.org/plugins/gitiles/voltha-helm-charts>`_
-- [`master <https://gerrit.opencord.org/plugins/gitiles/voltha-docs/+/refs/heads/master>`__] `voltha-docs <https://gerrit.opencord.org/plugins/gitiles/voltha-docs>`_
+- [`master <https://gerrit.lfbroadband.org/plugins/gitiles/bbsim/+/refs/heads/master>`__] `bbsim <https://gerrit.lfbroadband.org/plugins/gitiles/bbsim>`_
+- [`master <https://gerrit.lfbroadband.org/plugins/gitiles/pod-configs/+/refs/heads/master>`__] `pod-configs <https://gerrit.lfbroadband.org/plugins/gitiles/pod-configs>`_
+- [`master <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-docs/+/refs/heads/master>`__] `voltha-docs <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-docs>`_
+- [`master <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-helm-charts/+/refs/heads/master>`__] `voltha-helm-charts <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-helm-charts>`_
+- [`master <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-docs/+/refs/heads/master>`__] `voltha-docs <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-docs>`_
 
 |
 
diff --git a/howto/code/pull_request.rst b/howto/code/pull_request.rst
index b02b992..a09f6e6 100644
--- a/howto/code/pull_request.rst
+++ b/howto/code/pull_request.rst
@@ -18,7 +18,7 @@
 unrelated to your patch/changeset you can re-trigger the job by commenting
 on the patch with *recheck*.
 
-- Visit gerrit:  https://gerrit.opencord.org/c/bbsim/+/34384
+- Visit gerrit:  https://gerrit.lfbroadband.org/c/bbsim/+/34384
 - Click the pencil icon in the top left by reviewers.
 - Comment/description text: ``recheck``
 
@@ -46,7 +46,7 @@
 Manually add reviewers at a later date
 --------------------------------------
 
-- `Naviagate to your patch in gerrit <https://gerrit.opencord.org/c/bbsim/+/34384>`_
+- `Naviagate to your patch in gerrit <https://gerrit.lfbroadband.org/c/bbsim/+/34384>`_
 - Click the pencil icon in the top left by reviewers.
 - Add community members to request a review.
 
diff --git a/howto/code/release-bugfix.rst b/howto/code/release-bugfix.rst
index 498c9ab..d38864e 100644
--- a/howto/code/release-bugfix.rst
+++ b/howto/code/release-bugfix.rst
@@ -10,7 +10,7 @@
    # Clone a repostiory of interest (ex: votlha-lib-go)
    # Checkout release branch voltha-2.12 for patching
    # ------------------------------------------------
-   % git clone "ssh://gerrit.opencord.org:29418/voltha-lib-go.git"
+   % git clone "ssh://gerrit.lfbroadband.org:29418/voltha-lib-go.git"
    % cd voltha-lib-go
 
    # Pull in all remote tags/branches
diff --git a/howto/code/voltha-protos.rst b/howto/code/voltha-protos.rst
index 17aca59..7341f2c 100644
--- a/howto/code/voltha-protos.rst
+++ b/howto/code/voltha-protos.rst
@@ -3,7 +3,7 @@
 Modifying repository voltha-protos
 ==================================
 
-#. Clone repository `voltha-protos <https://gerrit.opencord.org/plugins/gitiles/voltha-protos/+/refs/heads/master>`_
+#. Clone repository `voltha-protos <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-protos/+/refs/heads/master>`_
 #. Modify structures, sources & makefiles as needed.
 #. Build, test and lint locally to validate sources.
 #. Commit changes, code review, jenins build and deploy.
@@ -14,7 +14,7 @@
 
 .. code:: bash
 
-    git clone ssh://gerrit.opencord.org:29418/voltha-protos.git
+    git clone ssh://gerrit.lfbroadband.org:29418/voltha-protos.git
     cd voltha-protos
     vi ...
 
@@ -54,23 +54,23 @@
    * - Repository
      - File(s) to edit
    * - bbsim
-     - `go.mod <https://gerrit.opencord.org/plugins/gitiles/bbsim/+/refs/heads/master/go.mod>`_
+     - `go.mod <https://gerrit.lfbroadband.org/plugins/gitiles/bbsim/+/refs/heads/master/go.mod>`_
    * - ofagent-go
-     - `go.mod <https://gerrit.opencord.org/plugins/gitiles/ofagent-go/+/refs/heads/master/go.mod>`__
+     - `go.mod <https://gerrit.lfbroadband.org/plugins/gitiles/ofagent-go/+/refs/heads/master/go.mod>`__
    * - voltctl
-     - `go.mod <https://gerrit.opencord.org/plugins/gitiles/voltctl/+/refs/heads/master/go.mod>`__
+     - `go.mod <https://gerrit.lfbroadband.org/plugins/gitiles/voltctl/+/refs/heads/master/go.mod>`__
    * - voltha-go
-     - `go.mod <https://gerrit.opencord.org/plugins/gitiles/voltha-go/+/refs/heads/master/go.mod>`__
+     - `go.mod <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-go/+/refs/heads/master/go.mod>`__
    * - voltha-go-controller
-     - `go.mod <https://gerrit.opencord.org/plugins/gitiles/voltha-go-controller/+/refs/heads/master/go.mod>`__
+     - `go.mod <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-go-controller/+/refs/heads/master/go.mod>`__
    * - voltha-lib-go
-     - `go.mod <https://gerrit.opencord.org/plugins/gitiles/voltha-lib-go/+/refs/heads/master/go.mod>`__
+     - `go.mod <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-lib-go/+/refs/heads/master/go.mod>`__
    * - voltha-openolt-adapter
-     - `go.mod <https://gerrit.opencord.org/plugins/gitiles/voltha-openolt-adapter/+/refs/heads/master/go.mod>`__
+     - `go.mod <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-openolt-adapter/+/refs/heads/master/go.mod>`__
    * - voltha-openonu-adapter-go
-     - `go.mod <https://gerrit.opencord.org/plugins/gitiles/voltha-openonu-adapter-go/+/refs/heads/master/go.mod>`__
+     - `go.mod <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-openonu-adapter-go/+/refs/heads/master/go.mod>`__
    * - voltha-system-tests
-     - `requirements.txt <https://gerrit.opencord.org/plugins/gitiles/voltha-system-tests/+/refs/heads/master/requirements.txt>`_ (virtualenv/testing)
+     - `requirements.txt <https://gerrit.lfbroadband.org/plugins/gitiles/voltha-system-tests/+/refs/heads/master/requirements.txt>`_ (virtualenv/testing)
 
 .. list-table:: Foreach external repository
    :widths: 30, 80