diff --git a/.gitmodules b/.gitmodules
index c0cb8ec..17cc7a6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,4 +9,4 @@
 	url = https://github.com/lfit/releng-common-packer.git
 [submodule "lf/onf-make"]
 	path = lf/onf-make
-	url = http://gerrit.opencord.org/onf-make
+	url = http://gerrit.lfbroadband.org/onf-make
diff --git a/.gitreview b/.gitreview
index 74ed635..928ea49 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=gerrit.opencord.org
+host=gerrit.lfbroadband.org
 port=29418
 project=ci-management.git
 defaultremote=origin
diff --git a/README.md b/README.md
index a554489..6ccd5f6 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 The best way to work with this repo is to check it out with `repo`, per these
 instructions: [Downloading testing and QA
-repositories](https://guide.opencord.org/master/developer/getting_the_code.html#testing-and-qa-repositories)
+repositories](https://guide.lfbroadband.org/master/developer/getting_the_code.html#testing-and-qa-repositories)
 
 > NOTE: This repo uses git submodules. If you get an error like this when
 > testing:
@@ -165,9 +165,9 @@
 
 > NOTE: Future builds won't automatically use the new AMI - you have to
 > manually set the instance `AMI ID` on jenkins in [Global
-> Config](https://jenkins.opencord.org/configure) > Cloud > Amazon EC2.
+> Config](https://jenkins.lfbroadband.org/configure) > Cloud > Amazon EC2.
 > The new AMI ID can be found near the end of the logs of the run of
-> [ci-management-packer-merge-<ostype>-basebuild](https://jenkins.opencord.org/job/ci-management-packer-merge-ubuntu-16.04-basebuild/).
+> [ci-management-packer-merge-<ostype>-basebuild](https://jenkins.lfbroadband.org/job/ci-management-packer-merge-ubuntu-16.04-basebuild/).
 
 ### Finding source AMI images
 
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index a285d98..9a5bf90 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -60,15 +60,15 @@
 
     # The most frequently used type of Build Executor. Name is per the LF global-jjb.
     # See build node types under "Cloud > Amazon EC2" at
-    #  https://jenkins.opencord.org/configure
+    #  https://jenkins.lfbroadband.org/configure
     build-node: 'ubuntu18.04-basebuild-1c-1g'
 
     # CORD Gerrit server definition, set in configuration
     gerrit-server-name: 'CORD Gerrit'
 
     # URL for Gerrit server, for use with `repo`
-    gerrit-server-url: 'https://gerrit.opencord.org'
-    gerrit-server-ssh-url: 'ssh://jenkins@gerrit.opencord.org:29418'
+    gerrit-server-url: 'https://gerrit.lfbroadband.org'
+    gerrit-server-ssh-url: 'ssh://jenkins@gerrit.lfbroadband.org:29418'
 
     # name of the manifest git repos used with the `repo` cli tool
     cord-repo-manifest: manifest.git
diff --git a/jjb/pipeline/bbsim-validation.groovy b/jjb/pipeline/bbsim-validation.groovy
index 0706a07..02ea921 100644
--- a/jjb/pipeline/bbsim-validation.groovy
+++ b/jjb/pipeline/bbsim-validation.groovy
@@ -76,7 +76,7 @@
            #!/usr/bin/env bash
            set -eu -o pipefail
 
-           git clone https://gerrit.opencord.org/pod-configs
+           git clone https://gerrit.lfbroadband.org/pod-configs
            pushd cord/helm-charts
 
            helm install -f examples/kafka-single.yaml --version 0.13.3 -n cord-kafka incubator/kafka
diff --git a/jjb/pipeline/kubespray-install.groovy b/jjb/pipeline/kubespray-install.groovy
index 89a1124..e6cdf0c 100644
--- a/jjb/pipeline/kubespray-install.groovy
+++ b/jjb/pipeline/kubespray-install.groovy
@@ -25,7 +25,7 @@
       steps {
         sh '''
             pushd $WORKSPACE
-            git clone https://gerrit.opencord.org/automation-tools
+            git clone https://gerrit.lfbroadband.org/automation-tools
             popd
             '''
             }
diff --git a/jjb/pipeline/mcord-build-test.groovy b/jjb/pipeline/mcord-build-test.groovy
index 8d2269e..6eaa658 100644
--- a/jjb/pipeline/mcord-build-test.groovy
+++ b/jjb/pipeline/mcord-build-test.groovy
@@ -74,7 +74,7 @@
     stage ('Checkout Automation-Tools Repo') {
       steps {
         script {
-          sh (script: "ssh -oStrictHostKeyChecking=no -i ~/.ssh/cord ubuntu@${node_ip} 'mkdir ~/cord; cd ~/cord/; git clone https://gerrit.opencord.org/automation-tools'", returnStdout: true)
+          sh (script: "ssh -oStrictHostKeyChecking=no -i ~/.ssh/cord ubuntu@${node_ip} 'mkdir ~/cord; cd ~/cord/; git clone https://gerrit.lfbroadband.org/automation-tools'", returnStdout: true)
           }
       }
     }
@@ -115,7 +115,7 @@
     stage ('Test MCORD') {
       steps {
         script {
-          sh "ssh -oStrictHostKeyChecking=no -i ~/.ssh/cord ubuntu@${node_ip} 'cd ~/cord/; git clone https://gerrit.opencord.org/mcord; cd mcord/test; ansible-playbook -i localhost, -c local mcord-cavium-test-playbook.yml 1>&2'"
+          sh "ssh -oStrictHostKeyChecking=no -i ~/.ssh/cord ubuntu@${node_ip} 'cd ~/cord/; git clone https://gerrit.lfbroadband.org/mcord; cd mcord/test; ansible-playbook -i localhost, -c local mcord-cavium-test-playbook.yml 1>&2'"
           }
        }
     }
diff --git a/jjb/pipeline/onos-app-release.groovy b/jjb/pipeline/onos-app-release.groovy
index 9132e66..c15d617 100644
--- a/jjb/pipeline/onos-app-release.groovy
+++ b/jjb/pipeline/onos-app-release.groovy
@@ -53,7 +53,7 @@
 }
 
 // -----------------------------------------------------------------------
-// https://jenkins.opencord.org/job/onos-app-release/285/consoleFull
+// https://jenkins.lfbroadband.org/job/onos-app-release/285/consoleFull
 // -----------------------------------------------------------------------
 void git_debug(String name) {
     enter(name)
@@ -137,7 +137,7 @@
     echo "Job triggered by " + userId
     // FIXME: supply Jenkins-owned known_hosts file via config_file_provider
     //  https://jenkins.io/doc/pipeline/steps/config-file-provider/
-    sh 'ssh-keyscan -H -t rsa -p 29418 gerrit.opencord.org >> ~/.ssh/known_hosts'
+    sh 'ssh-keyscan -H -t rsa -p 29418 gerrit.lfbroadband.org >> ~/.ssh/known_hosts'
 
     sh 'git config --global user.name "Jenkins"'
     sh 'git config --global user.email "do-not-reply@opennetworking.org"'
@@ -153,9 +153,9 @@
     cleanWs()
 
     sshagent (credentials: ['gerrit-jenkins-user']) {
-      git branch: branch, url: 'ssh://jenkins@gerrit.opencord.org:29418/' + appRepo, credentialsId: 'gerrit-jenkins-user'
+      git branch: branch, url: 'ssh://jenkins@gerrit.lfbroadband.org:29418/' + appRepo, credentialsId: 'gerrit-jenkins-user'
 
-      sh 'gitdir=$(git rev-parse --git-dir) && scp -p -P 29418 jenkins@gerrit.opencord.org:hooks/commit-msg ${gitdir}/hooks/'
+      sh 'gitdir=$(git rev-parse --git-dir) && scp -p -P 29418 jenkins@gerrit.lfbroadband.org:hooks/commit-msg ${gitdir}/hooks/'
     }
   }
 
diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index 271de1d..d8b50b9 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -24,7 +24,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
     $class: 'GitSCMSource',
-    remote: 'https://gerrit.opencord.org/ci-management.git'
+    remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 //------------------//
@@ -236,7 +236,7 @@
 
             sh(label  : 'Deploy common infrastructure',
                script : """
-    helm repo add onf https://charts.opencord.org
+    helm repo add onf https://charts.lfbroadband.org
     helm repo update
 
     echo -e "\nwithMonitoring=[$withMonitoring]"
diff --git a/jjb/pipeline/voltha/device-management-mock-tests.groovy b/jjb/pipeline/voltha/device-management-mock-tests.groovy
index 90519c0..c4f3da3 100644
--- a/jjb/pipeline/voltha/device-management-mock-tests.groovy
+++ b/jjb/pipeline/voltha/device-management-mock-tests.groovy
@@ -17,7 +17,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 def localCharts = false
diff --git a/jjb/pipeline/voltha/dmi-build-and-test.groovy b/jjb/pipeline/voltha/dmi-build-and-test.groovy
index bcb5eb8..0e08a23 100755
--- a/jjb/pipeline/voltha/dmi-build-and-test.groovy
+++ b/jjb/pipeline/voltha/dmi-build-and-test.groovy
@@ -23,7 +23,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 def infraNamespace = "infra"
diff --git a/jjb/pipeline/voltha/physical-build.groovy b/jjb/pipeline/voltha/physical-build.groovy
index 2be2567..8a83a6b 100755
--- a/jjb/pipeline/voltha/physical-build.groovy
+++ b/jjb/pipeline/voltha/physical-build.groovy
@@ -28,7 +28,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 // -----------------------------------------------------------------------
diff --git a/jjb/pipeline/voltha/software-upgrades.groovy b/jjb/pipeline/voltha/software-upgrades.groovy
index 19b8a6e..1467e30 100755
--- a/jjb/pipeline/voltha/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/software-upgrades.groovy
@@ -28,7 +28,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 // -----------------------------------------------------------------------
@@ -79,12 +79,12 @@
 def get_voltha_comp_versions(component, base_deploy_tag) {
     def comp_test_tag = sh(
         // script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=1 | sed 's/v//'",
-        script: "git ls-remote --refs --tags https://gerrit.opencord.org/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=1 | sed 's/v//'",
+        script: "git ls-remote --refs --tags https://gerrit.lfbroadband.org/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=1 | sed 's/v//'",
         returnStdout: true
     ).trim()
     def comp_deploy_tag = sh(
         // script: "git ls-remote --refs --tags https://github.com/opencord/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=2 | head -n 1 | sed 's/v//'",
-        script: "git ls-remote --refs --tags https://gerrit.opencord.org/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=2 | head -n 1 | sed 's/v//'",
+        script: "git ls-remote --refs --tags https://gerrit.lfbroadband.org/${component} | cut --delimiter='/' --fields=3 | tr '-' '~' | sort --version-sort | tail --lines=2 | head -n 1 | sed 's/v//'",
         returnStdout: true
     ).trim()
     def comp_deploy_major = comp_deploy_tag.substring(0, comp_deploy_tag.indexOf('.'))
diff --git a/jjb/pipeline/voltha/tucson-build-and-test.groovy b/jjb/pipeline/voltha/tucson-build-and-test.groovy
index 043db84..f98e191 100644
--- a/jjb/pipeline/voltha/tucson-build-and-test.groovy
+++ b/jjb/pipeline/voltha/tucson-build-and-test.groovy
@@ -18,7 +18,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 def infraNamespace = "infra"
 def volthaNamespace = "voltha"
@@ -169,7 +169,7 @@
       steps {
         script {
           sh returnStdout: false, script: """
-              helm repo add cord https://charts.opencord.org
+              helm repo add cord https://charts.lfbroadband.org
               helm repo update
               if helm version -c --short|grep v2 -q; then
                 helm install -n voltha-kafka-dump cord/voltha-kafka-dump
diff --git a/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy
index ec2c00c..4446e3b 100644
--- a/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy
@@ -18,7 +18,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 node {
@@ -51,7 +51,7 @@
         checkout([
           $class: 'GitSCM',
           userRemoteConfigs: [[
-            url: "https://gerrit.opencord.org/voltha-system-tests",
+            url: "https://gerrit.lfbroadband.org/voltha-system-tests",
             refspec: "${volthaSystemTestsChange}"
           ]],
           branches: [[ name: "${branch}", ]],
@@ -65,7 +65,7 @@
           sh(script:"""
             if [ '${volthaSystemTestsChange}' != '' ] ; then
               cd $WORKSPACE/voltha-system-tests;
-              git fetch https://gerrit.opencord.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+              git fetch https://gerrit.lfbroadband.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
             fi
             """)
         }
diff --git a/jjb/pipeline/voltha/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-physical-functional-tests.groovy
index 4cebe54..7ebe427 100644
--- a/jjb/pipeline/voltha/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-physical-functional-tests.groovy
@@ -25,7 +25,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 def infraNamespace = "infra"
@@ -57,7 +57,7 @@
         checkout([
           $class: 'GitSCM',
           userRemoteConfigs: [[
-            url: "https://gerrit.opencord.org/voltha-system-tests",
+            url: "https://gerrit.lfbroadband.org/voltha-system-tests",
             refspec: "${volthaSystemTestsChange}"
           ]],
           branches: [[ name: "${branch}", ]],
@@ -71,7 +71,7 @@
           sh(script:"""
             if [ '${volthaSystemTestsChange}' != '' ] ; then
               cd $WORKSPACE/voltha-system-tests;
-              git fetch https://gerrit.opencord.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+              git fetch https://gerrit.lfbroadband.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
             fi
             """)
         }
diff --git a/jjb/pipeline/voltha/voltha-physical-soak-dt-tests.groovy b/jjb/pipeline/voltha/voltha-physical-soak-dt-tests.groovy
index 6420a81..c34381a 100644
--- a/jjb/pipeline/voltha/voltha-physical-soak-dt-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-physical-soak-dt-tests.groovy
@@ -18,7 +18,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 node {
@@ -52,7 +52,7 @@
         checkout([
           $class: 'GitSCM',
           userRemoteConfigs: [[
-            url: "https://gerrit.opencord.org/voltha-system-tests",
+            url: "https://gerrit.lfbroadband.org/voltha-system-tests",
             refspec: "${volthaSystemTestsChange}"
           ]],
           branches: [[ name: "${branch}", ]],
@@ -66,7 +66,7 @@
           sh(script:"""
             if [ '${volthaSystemTestsChange}' != '' ] ; then
               cd $WORKSPACE/voltha-system-tests;
-              git fetch https://gerrit.opencord.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+              git fetch https://gerrit.lfbroadband.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
             fi
             """)
         }
diff --git a/jjb/pipeline/voltha/voltha-scale-lwc-test.groovy b/jjb/pipeline/voltha/voltha-scale-lwc-test.groovy
index df049cb..3ab82f9 100644
--- a/jjb/pipeline/voltha/voltha-scale-lwc-test.groovy
+++ b/jjb/pipeline/voltha/voltha-scale-lwc-test.groovy
@@ -17,7 +17,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 // [TODO] fix path, achilles heel for testing.
@@ -86,7 +86,7 @@
               helmTeardown(["default", "voltha1", "voltha-infra"])
             }
             sh returnStdout: false, script: '''
-              helm repo add onf https://charts.opencord.org
+              helm repo add onf https://charts.lfbroadband.org
               helm repo update
 
               # remove all persistent volume claims
diff --git a/jjb/pipeline/voltha/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha/voltha-scale-multi-stack.groovy
index 7ea3737..3835636 100755
--- a/jjb/pipeline/voltha/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha/voltha-scale-multi-stack.groovy
@@ -27,7 +27,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 pipeline {
@@ -61,7 +61,7 @@
             helmTeardown(namespaces)
           }
           sh returnStdout: false, script: '''
-            helm repo add onf https://charts.opencord.org
+            helm repo add onf https://charts.lfbroadband.org
             helm repo update
 
             # remove all persistent volume claims
diff --git a/jjb/pipeline/voltha/voltha-scale-test.groovy b/jjb/pipeline/voltha/voltha-scale-test.groovy
index 635b525..59c7998 100644
--- a/jjb/pipeline/voltha/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/voltha-scale-test.groovy
@@ -17,7 +17,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 // this function generates the correct parameters for ofAgent
@@ -90,7 +90,7 @@
               helmTeardown(["default", "voltha1", "infra"])
             }
             sh returnStdout: false, script: '''
-              helm repo add onf https://charts.opencord.org
+              helm repo add onf https://charts.lfbroadband.org
               helm repo update
 
               # remove all persistent volume claims
diff --git a/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
index 4470390..74e6d34 100644
--- a/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
@@ -25,7 +25,7 @@
 library identifier: 'cord-jenkins-libraries@master',
     retriever: modernSCM([
       $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
+      remote: 'https://gerrit.lfbroadband.org/ci-management.git'
 ])
 
 node {
@@ -58,7 +58,7 @@
         checkout([
           $class: 'GitSCM',
           userRemoteConfigs: [[
-            url: "https://gerrit.opencord.org/voltha-system-tests",
+            url: "https://gerrit.lfbroadband.org/voltha-system-tests",
             refspec: "${volthaSystemTestsChange}"
           ]],
           branches: [[ name: "${branch}", ]],
@@ -72,7 +72,7 @@
           sh(script:"""
             if [ '${volthaSystemTestsChange}' != '' ] ; then
               cd $WORKSPACE/voltha-system-tests;
-              git fetch https://gerrit.opencord.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+              git fetch https://gerrit.lfbroadband.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
             fi
             """)
         }
diff --git a/jjb/shell/get-onf-make-patch.sh b/jjb/shell/get-onf-make-patch.sh
index ab360bb..fd43263 100755
--- a/jjb/shell/get-onf-make-patch.sh
+++ b/jjb/shell/get-onf-make-patch.sh
@@ -19,14 +19,14 @@
 
 ONF_MAKE_SUBDIR="lf/onf-make"
 PROJECT="${TEST_PROJECT:-}"
-REPO="https://gerrit.opencord.org/$PROJECT"
+REPO="https://gerrit.lfbroadband.org/$PROJECT"
 
 cd $WORKSPACE
 git clone "$REPO" "$PROJECT"
 cd "$PROJECT"
 git submodule update --init
 
-REPO="https://gerrit.opencord.org/onf-make"
+REPO="https://gerrit.lfbroadband.org/onf-make"
 
 pushd "$ONF_MAKE_SUBDIR"
 git fetch "$REPO" "$GERRIT_REFSPEC" && git checkout FETCH_HEAD
diff --git a/jjb/shell/github-release.sh b/jjb/shell/github-release.sh
index 913792f..ae45074 100755
--- a/jjb/shell/github-release.sh
+++ b/jjb/shell/github-release.sh
@@ -247,7 +247,7 @@
 ##   o SCRIPT_VERSION => git changeset for repo:ci-managment
 ##   o echo "library version: ${env."library.libName.version"}"
 # -----------------------------------------------------------------------
-# 14:18:38   > git fetch --no-tags --progress -- https://gerrit.opencord.org/ci-management.git +refs/heads/*:refs/remotes/origin/* # timeout=10
+# 14:18:38   > git fetch --no-tags --progress -- https://gerrit.lfbroadband.org/ci-management.git +refs/heads/*:refs/remotes/origin/* # timeout=10
 # 14:18:39  Checking out Revision 50f6e0b97f449b32d32ec0e02d59642000351847 (master)
 # -----------------------------------------------------------------------
 function full_banner()
diff --git a/jjb/shell/helm-lint.sh b/jjb/shell/helm-lint.sh
index 05ec1ad..1234807 100644
--- a/jjb/shell/helm-lint.sh
+++ b/jjb/shell/helm-lint.sh
@@ -17,10 +17,10 @@
 
 helm repo add stable https://charts.helm.sh/stable
 helm repo add rook-release https://charts.rook.io/release
-helm repo add cord https://charts.opencord.org
+helm repo add cord https://charts.lfbroadband.org
 
 ## Clone tool chain
-git clone ssh://jenkins@gerrit.opencord.org:29418/helm-repo-tools.git
+git clone ssh://jenkins@gerrit.lfbroadband.org:29418/helm-repo-tools.git
 ./helm-repo-tools/helmlint.sh clean
 echo "*.lock" >> .gitignore
 
@@ -33,7 +33,7 @@
 git config --global user.name "Jenkins"
 
 # Check for chart version conflicts by building the repo (don't upload)
-git clone "ssh://jenkins@gerrit.opencord.org:29418/$OLD_REPO_DIR.git"
+git clone "ssh://jenkins@gerrit.lfbroadband.org:29418/$OLD_REPO_DIR.git"
 
 ./helm-repo-tools/helmrepo.sh   # [TODO] make ???
 
diff --git a/jjb/shell/jflint.sh b/jjb/shell/jflint.sh
index cef7b91..392a561 100755
--- a/jjb/shell/jflint.sh
+++ b/jjb/shell/jflint.sh
@@ -9,7 +9,7 @@
 
 set -e -u -o pipefail
 
-JENKINS_URL=https://jenkins.opencord.org/
+JENKINS_URL=https://jenkins.lfbroadband.org/
 JF_LIST=()
 
 JF_FAIL=0
diff --git a/jjb/shell/publish-helm-repo.sh b/jjb/shell/publish-helm-repo.sh
index f7e1ba7..40b7101 100644
--- a/jjb/shell/publish-helm-repo.sh
+++ b/jjb/shell/publish-helm-repo.sh
@@ -8,7 +8,7 @@
 echo "git version: $(git --version)"
 
 # Variables used in this and child scripts
-export PUBLISH_URL="charts.opencord.org"
+export PUBLISH_URL="charts.lfbroadband.org"
 export OLD_REPO_DIR="cord-charts-repo"
 export NEW_REPO_DIR="chart_repo"
 
@@ -17,15 +17,15 @@
 git config --global user.name "Jenkins"
 
 # Checkout 'cord-charts-repo' repo that contains updated charts
-git clone "ssh://jenkins@gerrit.opencord.org:29418/$OLD_REPO_DIR.git"
+git clone "ssh://jenkins@gerrit.lfbroadband.org:29418/$OLD_REPO_DIR.git"
 
 # Clone the `helm-repo-tools` which contains scripts
-git clone ssh://jenkins@gerrit.opencord.org:29418/helm-repo-tools.git
+git clone ssh://jenkins@gerrit.lfbroadband.org:29418/helm-repo-tools.git
 
 # Setup helm and external repos
 helm repo add stable https://charts.helm.sh/stable
 helm repo add rook-release https://charts.rook.io/release
-helm repo add cord https://charts.opencord.org
+helm repo add cord https://charts.lfbroadband.org
 helm repo add elastic  https://helm.elastic.co
 helm repo add kiwigrid https://kiwigrid.github.io
 
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index b8c96c9..7906dba 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -328,7 +328,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
diff --git a/jjb/templates/versioning.yaml b/jjb/templates/versioning.yaml
index e21d447..09b0e8f 100644
--- a/jjb/templates/versioning.yaml
+++ b/jjb/templates/versioning.yaml
@@ -19,7 +19,7 @@
 #    released, the correct action is to make a new fixed version, not try to
 #    fix the released version
 #
-# For reference: https://jira.opencord.org/browse/CORD-3117
+# For reference: https://lf-broadband.atlassian.net/browse/CORD-3117
 
 - job-template:
     id: tag-check
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 1ac917c..1366fd1 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1261,7 +1261,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
@@ -1435,7 +1435,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
@@ -1611,7 +1611,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
@@ -1784,7 +1784,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
@@ -1846,7 +1846,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index d06c578..8fb5c82 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -779,7 +779,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index ceb9d06..44e9fb4 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -69,7 +69,7 @@
 
       - string:
           name: helmRepoUrl
-          default: 'https://charts.opencord.org'
+          default: 'https://charts.lfbroadband.org'
           description: 'URL where helm-charts are published'
 
       - string:
@@ -256,7 +256,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
@@ -306,7 +306,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
@@ -334,7 +334,7 @@
     <<: *voltha-pipe-job-boiler-plate
     pipeline-script: 'voltha/voltha-physical-functional-tests.groovy'
     pipeline-branch: 'master'
-    manifest-url: 'https://gerrit.opencord.org/voltha-test-manifest.git'
+    manifest-url: 'https://gerrit.lfbroadband.org/voltha-test-manifest.git'
     manifest-branch: 'master'
 
     oltAdapterAppLabel: 'adapter-open-olt'
@@ -459,7 +459,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
@@ -486,7 +486,7 @@
     <<: *voltha-pipe-job-boiler-plate
     pipeline-script: 'voltha/playground/voltha-physical-functional-tests.groovy'
     pipeline-branch: 'master'
-    manifest-url: 'https://gerrit.opencord.org/voltha-test-manifest.git'
+    manifest-url: 'https://gerrit.lfbroadband.org/voltha-test-manifest.git'
     manifest-branch: 'master'
 
     oltAdapterAppLabel: 'adapter-open-olt'
@@ -611,7 +611,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
@@ -639,7 +639,7 @@
     <<: *voltha-pipe-job-boiler-plate
     pipeline-script: 'voltha/voltha-physical-functional-tests.groovy'
     pipeline-branch: 'master'
-    manifest-url: 'https://gerrit.opencord.org/voltha-test-manifest.git'
+    manifest-url: 'https://gerrit.lfbroadband.org/voltha-test-manifest.git'
     manifest-branch: 'master'
 
     oltAdapterAppLabel: 'adapter-open-olt'
@@ -757,7 +757,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
@@ -785,7 +785,7 @@
     <<: *voltha-pipe-job-boiler-plate
     pipeline-script: 'voltha/voltha-physical-functional-tests.groovy'
     pipeline-branch: 'master'
-    manifest-url: 'https://gerrit.opencord.org/voltha-test-manifest.git'
+    manifest-url: 'https://gerrit.lfbroadband.org/voltha-test-manifest.git'
     manifest-branch: 'master'
 
     oltAdapterAppLabel: 'adapter-open-olt'
@@ -908,7 +908,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
@@ -1011,7 +1011,7 @@
 
       - string:
           name: helmRepoUrl
-          default: 'https://charts.opencord.org'
+          default: 'https://charts.lfbroadband.org'
           description: 'URL where helm-charts are published'
 
       - string:
@@ -1151,7 +1151,7 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://gerrit.opencord.org/ci-management
+            url: https://gerrit.lfbroadband.org/ci-management
             branches:
               - origin/{pipeline-branch}
       script-path: jjb/pipeline/{pipeline-script}
diff --git a/lf/config.mk b/lf/config.mk
index 41a8093..56389b0 100644
--- a/lf/config.mk
+++ b/lf/config.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.include.version = 1.1
 # ONF.confg.mk                  = 1.5
 # -----------------------------------------------------------------------
diff --git a/lf/local/commands/include.mk b/lf/local/commands/include.mk
index 72c06d0..45eb0dd 100644
--- a/lf/local/commands/include.mk
+++ b/lf/local/commands/include.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2024 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/bin/compare_sandbox_makefiles.sh b/makefiles/bin/compare_sandbox_makefiles.sh
index f415beb..8d830af 100755
--- a/makefiles/bin/compare_sandbox_makefiles.sh
+++ b/makefiles/bin/compare_sandbox_makefiles.sh
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2024 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/commands/include.mk b/makefiles/commands/include.mk
index e2d3ccd..a71f23f 100644
--- a/makefiles/commands/include.mk
+++ b/makefiles/commands/include.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2024 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/consts.mk b/makefiles/consts.mk
index 4be106a..aac7d2f 100644
--- a/makefiles/consts.mk
+++ b/makefiles/consts.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2024 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/gerrit/include.mk b/makefiles/gerrit/include.mk
index 614ab79..96ffbf5 100644
--- a/makefiles/gerrit/include.mk
+++ b/makefiles/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/include.mk b/makefiles/include.mk
index 96f35db..78d38a3 100644
--- a/makefiles/include.mk
+++ b/makefiles/include.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2024 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/lint/include.mk b/makefiles/lint/include.mk
index d550079..5ecc0bd 100644
--- a/makefiles/lint/include.mk
+++ b/makefiles/lint/include.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2024 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.2
 # -----------------------------------------------------------------------
 
diff --git a/makefiles/lint/yaml/.yamllint b/makefiles/lint/yaml/.yamllint
index db8c14d..67e734e 100644
--- a/makefiles/lint/yaml/.yamllint
+++ b/makefiles/lint/yaml/.yamllint
@@ -31,7 +31,7 @@
     max: 160
 
 # -----------------------------------------------------------------------
-# .. seealso: https://gerrit.opencord.org/plugins/gitiles/
+# .. seealso: https://gerrit.lfbroadband.org/plugins/gitiles/
 #             helm-repo-tools/+/refs/heads/master/yamllint.conf
 # -----------------------------------------------------------------------
 #
diff --git a/makefiles/targets/include.mk b/makefiles/targets/include.mk
index 35f07be..d9b62b5 100644
--- a/makefiles/targets/include.mk
+++ b/makefiles/targets/include.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2024 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/targets/test/include.mk b/makefiles/targets/test/include.mk
index d0bdede..221bc08 100644
--- a/makefiles/targets/test/include.mk
+++ b/makefiles/targets/test/include.mk
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: 2024 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/virtualenv.mk b/makefiles/virtualenv.mk
index a400edf..9ccec0e 100644
--- a/makefiles/virtualenv.mk
+++ b/makefiles/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
 # -----------------------------------------------------------------------
 
diff --git a/test/bats/README.md b/test/bats/README.md
index 56b47e1..1338a25 100644
--- a/test/bats/README.md
+++ b/test/bats/README.md
@@ -4,9 +4,9 @@
 check_repo_tags.bats
 --------------------
 
-- SRC: [jjb/pipeline/voltha/software-upgrades.groovy](https://gerrit.opencord.org/plugins/gitiles/ci-management/+/refs/heads/master/jjb/pipeline/voltha/software-upgrades.groovy#80)
-- TST: [test/bats/check_repo_tags.bats](https://gerrit.opencord.org/plugins/gitiles/ci-management/+/refs/heads/master/test/bats/check_repo_tags.bats)
-- LIB: [test/bats/utils/check_repo_tags.sh](https://gerrit.opencord.org/plugins/gitiles/ci-management/+/refs/heads/master/test/bats/utils/check_repo_tags.sh#31)
+- SRC: [jjb/pipeline/voltha/software-upgrades.groovy](https://gerrit.lfbroadband.org/plugins/gitiles/ci-management/+/refs/heads/master/jjb/pipeline/voltha/software-upgrades.groovy#80)
+- TST: [test/bats/check_repo_tags.bats](https://gerrit.lfbroadband.org/plugins/gitiles/ci-management/+/refs/heads/master/test/bats/check_repo_tags.bats)
+- LIB: [test/bats/utils/check_repo_tags.sh](https://gerrit.lfbroadband.org/plugins/gitiles/ci-management/+/refs/heads/master/test/bats/utils/check_repo_tags.sh#31)
 
 Unit test check_repo_tags.bats will exercise (git ls-remote) logic inlined within the software-upgrades.groovy script.  The test will gather a list of tagnames from the gerrit and github repositories then compare the lists for differences.
 
diff --git a/test/bats/check_repo_tags.bats b/test/bats/check_repo_tags.bats
index 6470393..445deb6 100755
--- a/test/bats/check_repo_tags.bats
+++ b/test/bats/check_repo_tags.bats
@@ -97,7 +97,7 @@
 
         # local component='voltha-openonu-adapter-go'
         declare -a gerrit=()
-        gather_comp_deploy gerrit "http://gerrit.opencord.org/${component}"
+        gather_comp_deploy gerrit "http://gerrit.lfbroadband.org/${component}"
 
         declare -a github=()
         gather_comp_deploy gerrit "http://github.com/opencord/${component}"
@@ -162,7 +162,7 @@
 
         # local component='voltha-openonu-adapter-go'
         declare -a gerrit=()
-        gather_comp_test gerrit "http://gerrit.opencord.org/${component}"
+        gather_comp_test gerrit "http://gerrit.lfbroadband.org/${component}"
 
         declare -a github=()
         gather_comp_test gerrit "http://github.com/opencord/${component}"
diff --git a/vars/getVolthaCode.groovy b/vars/getVolthaCode.groovy
index 4230b9e..db3198f 100644
--- a/vars/getVolthaCode.groovy
+++ b/vars/getVolthaCode.groovy
@@ -96,7 +96,7 @@
             // However, the gerritProject is overridden, so that we can pull
             // in another repo and run the tests to make sure that they work
             // with the code changes to onf-make.
-            repo_project = "https://gerrit.opencord.org/${cfg.gerritProject}"
+            repo_project = "https://gerrit.lfbroadband.org/${cfg.gerritProject}"
 
             checkout([
                 $class: 'GitSCM',
@@ -120,7 +120,7 @@
         }
         else if (!(cfg.gerritProject in frequent_repos))
         {
-            repo_project = "https://gerrit.opencord.org/${cfg.gerritProject}"
+            repo_project = "https://gerrit.lfbroadband.org/${cfg.gerritProject}"
 
             checkout([
                 $class: 'GitSCM',
@@ -154,7 +154,7 @@
 ** Clone voltha-system-tests
 ** -----------------------------------------------------------------------
 """)
-        repo_vst = 'https://gerrit.opencord.org/voltha-system-tests'
+        repo_vst = 'https://gerrit.lfbroadband.org/voltha-system-tests'
 
         checkout([
             $class: 'GitSCM',
@@ -182,7 +182,7 @@
 
             sh("""
         pushd "$WORKSPACE/${cfg.gerritProject}"
-        git fetch https://gerrit.opencord.org/${cfg.gerritProject} ${cfg.gerritRefspec} && git checkout FETCH_HEAD
+        git fetch https://gerrit.lfbroadband.org/${cfg.gerritProject} ${cfg.gerritRefspec} && git checkout FETCH_HEAD
 
         echo "Currently on commit: \n"
         git log -1 --oneline
@@ -199,7 +199,7 @@
     stage('Clone voltha-helm-charts')
     {
         enter("Clone voltha-helm-charts @ BRANCH=[${cfg.branch}]")
-        repo_vhc = 'https://gerrit.opencord.org/voltha-helm-charts'
+        repo_vhc = 'https://gerrit.lfbroadband.org/voltha-helm-charts'
 
         checkout([
             $class: 'GitSCM',
@@ -224,7 +224,7 @@
             enter('cfg.gerritProject == voltha-helm-charts')
             sh """
         pushd "$WORKSPACE/${cfg.gerritProject}"
-        git fetch "https://gerrit.opencord.org/${cfg.gerritProject}" ${cfg.gerritRefspec} && git checkout FETCH_HEAD
+        git fetch "https://gerrit.lfbroadband.org/${cfg.gerritProject}" ${cfg.gerritRefspec} && git checkout FETCH_HEAD
 
         echo "Currently on commit: \n"
         git log -1 --oneline
diff --git a/vars/volthaDeploy.groovy b/vars/volthaDeploy.groovy
index af013c7..01a51d7 100644
--- a/vars/volthaDeploy.groovy
+++ b/vars/volthaDeploy.groovy
@@ -117,7 +117,7 @@
 
     sh(label  : 'Configure helm repo',
        script : """
-helm repo add onf https://charts.opencord.org
+helm repo add onf https://charts.lfbroadband.org
 helm repo update
 """)