diff --git a/makefiles-orig/bin/compare_sandbox_makefiles.sh b/makefiles-orig/bin/compare_sandbox_makefiles.sh
index 6075386..9e72c39 100755
--- a/makefiles-orig/bin/compare_sandbox_makefiles.sh
+++ b/makefiles-orig/bin/compare_sandbox_makefiles.sh
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
 # SPDX-License-Identifier: Apache-2.0
 # -----------------------------------------------------------------------
-# https://gerrit.opencord.org/plugins/gitiles/onf-make
+# https://gerrit.lfbroadband.org/plugins/gitiles/onf-make
 # ONF.makefile.version = 1.0
 # -----------------------------------------------------------------------
 # Intent: This script is used to bulk refactor and merge makefile changes
diff --git a/makefiles-orig/commands/include.mk b/makefiles-orig/commands/include.mk
index 01fa145..655653d 100644
--- a/makefiles-orig/commands/include.mk
+++ b/makefiles-orig/commands/include.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
 # SPDX-License-Identifier: Apache-2.0
 # -----------------------------------------------------------------------
-# https://gerrit.opencord.org/plugins/gitiles/onf-make
+# https://gerrit.lfbroadband.org/plugins/gitiles/onf-make
 # ONF.makefile.version = 1.0
 # -----------------------------------------------------------------------
 
diff --git a/makefiles-orig/consts.mk b/makefiles-orig/consts.mk
index 8961b3a..dae88a5 100644
--- a/makefiles-orig/consts.mk
+++ b/makefiles-orig/consts.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
 # SPDX-License-Identifier: Apache-2.0
 # -----------------------------------------------------------------------
-# https://gerrit.opencord.org/plugins/gitiles/onf-make
+# https://gerrit.lfbroadband.org/plugins/gitiles/onf-make
 # ONF.makefile.version = 1.0
 # -----------------------------------------------------------------------
 
diff --git a/makefiles-orig/gerrit/include.mk b/makefiles-orig/gerrit/include.mk
index 5ae76a4..07fac58 100644
--- a/makefiles-orig/gerrit/include.mk
+++ b/makefiles-orig/gerrit/include.mk
@@ -23,18 +23,18 @@
 # -----------------------------------------------------------------------
 # -----------------------------------------------------------------------
 replication-status:
-	ssh gerrit.opencord.org replication list --detail
+	ssh gerrit.lfbroadband.org replication list --detail
 
 # -----------------------------------------------------------------------
 # NOTE: Gerrit ssh targets assume use of ~/.ssh config files
 #       port, login, etc are 
 # -----------------------------------------------------------------------
-# % ssh -p 29418 <username>@gerrit.opencord.org replication list --detail
-# % ssh gerrit.opencord.org replication list --detail
+# % ssh -p 29418 <username>@gerrit.lfbroadband.org replication list --detail
+# % ssh gerrit.lfbroadband.org replication list --detail
 # -----------------------------------------------------------------------
-# Host gerrit.opencord.org
-#  Hostname gerrit.opencord.org
-#  IdentityFile ~/.ssh/gerrit.opencord.org/{ssh_keyfile}
+# Host gerrit.lfbroadband.org
+#  Hostname gerrit.lfbroadband.org
+#  IdentityFile ~/.ssh/gerrit.lfbroadband.org/{ssh_keyfile}
 #  IdentitiesOnly yes
 #  AddKeysToAgent yes
 #  Port 29418
diff --git a/makefiles-orig/include.mk b/makefiles-orig/include.mk
index 7b983c1..358882e 100644
--- a/makefiles-orig/include.mk
+++ b/makefiles-orig/include.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2017-2023 Open Networking Foundation (ONF) and the ONF Contributors
 # SPDX-License-Identifier: Apache-2.0
 # -----------------------------------------------------------------------
-# https://gerrit.opencord.org/plugins/gitiles/onf-make
+# https://gerrit.lfbroadband.org/plugins/gitiles/onf-make
 # ONF.makefiles.include.version = 1.1
 # -----------------------------------------------------------------------
 
diff --git a/makefiles-orig/lint/groovy/include.mk b/makefiles-orig/lint/groovy/include.mk
index 61719a8..f69fb84 100644
--- a/makefiles-orig/lint/groovy/include.mk
+++ b/makefiles-orig/lint/groovy/include.mk
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # -----------------------------------------------------------------------
-# https://gerrit.opencord.org/plugins/gitiles/onf-make
+# https://gerrit.lfbroadband.org/plugins/gitiles/onf-make
 # ONF.makefiles.lint.groovy.version = 1.1.1 (+local edits)
 # -----------------------------------------------------------------------
 
diff --git a/makefiles-orig/lint/include.mk b/makefiles-orig/lint/include.mk
index 7977da1..791883f 100644
--- a/makefiles-orig/lint/include.mk
+++ b/makefiles-orig/lint/include.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
 # SPDX-License-Identifier: Apache-2.0
 # -----------------------------------------------------------------------
-# https://gerrit.opencord.org/plugins/gitiles/onf-make
+# https://gerrit.lfbroadband.org/plugins/gitiles/onf-make
 # ONF.makefile.version = 1.1
 # -----------------------------------------------------------------------
 
diff --git a/makefiles-orig/lint/shell.mk b/makefiles-orig/lint/shell.mk
index 3c33bb2..64a5cf2 100644
--- a/makefiles-orig/lint/shell.mk
+++ b/makefiles-orig/lint/shell.mk
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # -----------------------------------------------------------------------
-# https://gerrit.opencord.org/plugins/gitiles/onf-make
+# https://gerrit.lfbroadband.org/plugins/gitiles/onf-make
 # ONF.makefile.version = 1.0
 # -----------------------------------------------------------------------
 
diff --git a/makefiles-orig/targets/test/include.mk b/makefiles-orig/targets/test/include.mk
index a706bfd..164ba9a 100644
--- a/makefiles-orig/targets/test/include.mk
+++ b/makefiles-orig/targets/test/include.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
 # SPDX-License-Identifier: Apache-2.0
 # -----------------------------------------------------------------------
-# https://gerrit.opencord.org/plugins/gitiles/onf-make
+# https://gerrit.lfbroadband.org/plugins/gitiles/onf-make
 # ONF.makefile.version = 1.0
 # -----------------------------------------------------------------------
 
diff --git a/makefiles-orig/virtualenv.mk b/makefiles-orig/virtualenv.mk
index 44939c9..217347a 100644
--- a/makefiles-orig/virtualenv.mk
+++ b/makefiles-orig/virtualenv.mk
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # -----------------------------------------------------------------------
-# https://gerrit.opencord.org/plugins/gitiles/onf-make
+# https://gerrit.lfbroadband.org/plugins/gitiles/onf-make
 # ONF.makefile.version = 1.2
 # -----------------------------------------------------------------------