diff --git a/jjb/docker-publish.yaml b/jjb/docker-publish.yaml
index ad09132..e829892 100644
--- a/jjb/docker-publish.yaml
+++ b/jjb/docker-publish.yaml
@@ -95,7 +95,7 @@
       - string:
           name: maintainers
           default: '{maintainers}'
-          description: "The person that sould be notified if this job fails"
+          description: "The person that should be notified if this job fails"
 
       - string:
           name: extraEnvironmentVars
diff --git a/jjb/make-unit.yaml b/jjb/make-unit.yaml
index 51a1569..f81d714 100644
--- a/jjb/make-unit.yaml
+++ b/jjb/make-unit.yaml
@@ -48,6 +48,7 @@
             UNIT_TEST_TARGETS={unit-test-targets}
             UNIT_TEST_KEEP_GOING={unit-test-keep-going}
             GOPROXY=https://proxy.golang.org
+            TEST_PROJECT={project}
       - shell: !include-raw-escape: shell/make-unit.sh
 
     publishers:
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 907de39..7d336ba 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -260,23 +260,6 @@
           pipeline-file: 'omec-reuse-scan.groovy'
           build-node: 'ubuntu18.04-basebuild-1c-2g'
 
-# for upf
-- project:
-    name: upf
-    project: '{name}'
-
-    github-organization: 'omec-project'
-    github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
-    github_pr_org_list:
-      - 'omec-project'
-    registry: 'registry.aetherproject.org/omecproject'
-    registry-proxy: 'registry.aetherproject.org/proxy/omecproject'
-
-    jobs:
-      - 'omec-fossa':
-          pipeline-file: 'omec-fossa-scan.groovy'
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-
 # Combined pipeline
 - job-template:
     id: 'omec-combined'
diff --git a/jjb/onf-make-unit-test.yaml b/jjb/onf-make-unit-test.yaml
new file mode 100644
index 0000000..801914a
--- /dev/null
+++ b/jjb/onf-make-unit-test.yaml
@@ -0,0 +1,106 @@
+---
+# Makefile based unit test
+
+- job-template:
+    id: 'onf-make-unit-test'
+    name: 'onf-make-unit-test-{test-repo}'
+    test-repo: '{test-repo}'
+
+    description: |
+      Created by {id} job-template from ci-management/jjb/onf-make-unit-test.yaml<br/>
+      Runs make with the following unit tests targets - '{unit-test-targets}'
+
+    triggers:
+      - cord-infra-gerrit-trigger-patchset:
+          gerrit-server-name: '{gerrit-server-name}'
+          project-regexp: '^{project}$'
+          branch-regexp: '{branch-regexp}'
+          dependency-jobs: '{dependency-jobs}'
+          file-include-regexp: '{all-files-regexp}'
+
+    properties:
+      - cord-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+          artifact-num-to-keep: '{artifact-num-to-keep}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    scm:
+      - cord-infra-gerrit-scm:
+          git-url: '$GIT_URL/$GERRIT_PROJECT'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '$GERRIT_BRANCH'
+          submodule-recursive: 'false'
+          choosing-strategy: gerrit
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          basedir: '{project}'
+
+    node: '{build-node}'
+    project-type: freestyle
+    concurrent: true
+
+    builders:
+      - inject:
+          properties-content: |
+            DEST_GOPATH={dest-gopath}
+            UNIT_TEST_TARGETS={unit-test-targets}
+            UNIT_TEST_KEEP_GOING={unit-test-keep-going}
+            GOPROXY=https://proxy.golang.org
+            TEST_PROJECT={test-repo}
+      - shell: !include-raw-verbatim: shell/get-onf-make-patch.sh
+      - shell: !include-raw-verbatim: shell/make-unit.sh
+
+    publishers:
+      - junit:
+          results: "**/*results.xml,**/*report.xml"
+          allow-empty-results: '{junit-allow-empty-results}'
+# NOTE: circa 2020-04-11, the Jenkins xUnit plugin version 3.x.x changed the
+# config XML to not be JJB compatible, replacing the previous XML <types> tag
+# with a <tools> tag.
+#
+# Temporarily switch to using raw XML to configure xUnit.
+#
+# The following xunit and XML should be equivalent, except that the variable
+# `xunit-skip-if-no-test-files` is assumed to always be true.
+#
+#     - xunit:
+#         types:
+#           - gtest:
+#               pattern: "**/*xunit.xml"
+#               deleteoutput: false
+#               skip-if-no-test-files: '{xunit-skip-if-no-test-files}'
+#
+      - raw:
+          xml: |
+            <xunit plugin="xunit">
+              <tools>
+                <GoogleTestType>
+                  <pattern>**/*xunit.xml</pattern>
+                  <failIfNotNew>true</failIfNotNew>
+                  <deleteOutputFiles>false</deleteOutputFiles>
+                  <skipNoTestFiles>True</skipNoTestFiles>
+                  <stopProcessingIfError>true</stopProcessingIfError>
+                </GoogleTestType>
+              </tools>
+              <thresholds/>
+              <thresholdMode>1</thresholdMode>
+              <extraConfiguration>
+                <testTimeMargin>3000</testTimeMargin>
+              </extraConfiguration>
+            </xunit>
+      - cobertura:
+          report-file: "**/*coverage.xml"
+          targets:
+            - files:
+                healthy: 80
+                unhealthy: 0
+                failing: 0
+            - method:
+                healthy: 50
+                unhealthy: 0
+                failing: 0
+
+# [EOF]
diff --git a/jjb/onf-make/onf-make.yaml b/jjb/onf-make/onf-make.yaml
new file mode 100644
index 0000000..8888a83
--- /dev/null
+++ b/jjb/onf-make/onf-make.yaml
@@ -0,0 +1,74 @@
+---
+
+- project:
+    name: onf-make-tests
+
+    project-name: '{name}'
+    project: 'onf-make'
+    manualBranch: ''
+    olts: 1
+    onus: 1
+    pons: 1
+    withAlarms: true
+    make-target-failtest: bbsim-failurescenarios
+    make-target-errortest: bbsim-errorscenarios
+    make-target-alarmtest: bbsim-alarms-kind
+    make-target-multipleolt: bbsim-multiolt-kind
+    make-target-1t4gemtest: 1t4gem-openonu-go-adapter-test
+    make-target-1t8gemtest: 1t8gem-openonu-go-adapter-test
+    make-target-reconciletest: reconcile-openonu-go-adapter-test-att
+    make-target-reconciledttest: reconcile-openonu-go-adapter-test-dt
+    make-target-reconciletttest: reconcile-openonu-go-adapter-test-tt
+
+    jobs:
+      - 'voltha-make-test':
+          name: 'onf-make-voltha-dt-fttb-test-bbsim-master'
+          code-branch: 'master'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
+          testTargets: |
+            - target: sanity-kind-dt-fttb
+              workflow: dt-fttb
+              flags: ""
+              teardown: true
+              logging: true
+
+      - 'voltha-make-test':
+          name: 'onf-make-voltha-sanity-test-multi-runs'
+          code-branch: 'master'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
+          testTargets: |
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'onf-make-unit-test':
+          test-repo: 'bbsim'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          branch-regexp: '^master$'
+          dest-gopath: "github.com/opencord"
+          unit-test-targets: 'lint sca test'
+          unit-test-keep-going: 'false'
+
+# [EOF]
diff --git a/jjb/pipeline/voltha/physical-build.groovy b/jjb/pipeline/voltha/physical-build.groovy
index e9f3818..6ed3a8f 100755
--- a/jjb/pipeline/voltha/physical-build.groovy
+++ b/jjb/pipeline/voltha/physical-build.groovy
@@ -120,6 +120,13 @@
       steps {
         timeout(20) {
           installVoltctl("${branch}")
+
+          sh """
+          sed -i -e "s/server: .*/server: voltha-${cluster}:443/" \
+              -e "s/kvstore: .*/kvstore: voltha-infra-${cluster}:443/" \
+              /home/jenkins/.volt/config
+          """
+
           script {
             // if we're downloading a voltha-helm-charts patch, then install from a local copy of the charts
             def localCharts = false
diff --git a/jjb/pipeline/xos-core.groovy b/jjb/pipeline/xos-core.groovy
index a5cfe0c..6913b46 100644
--- a/jjb/pipeline/xos-core.groovy
+++ b/jjb/pipeline/xos-core.groovy
@@ -202,7 +202,7 @@
             reportFileName: 'RobotLogs/report*.html',
             unstableThreshold: 0]);
          archiveArtifacts artifacts: '*.log'
-         step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "kailash@opennetworking.org, onf-bat-admin@opennetworking.org", sendToIndividuals: false])
+         step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "kailash@opennetworking.org, releng+voltha-build@linuxfoundation.org", sendToIndividuals: false])
 
     }
   }
diff --git a/jjb/shell/get-onf-make-patch.sh b/jjb/shell/get-onf-make-patch.sh
new file mode 100755
index 0000000..ab360bb
--- /dev/null
+++ b/jjb/shell/get-onf-make-patch.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# get-onf-make-patch.sh - Pull the patch of onf-make that triggered the job
+# for testing
+
+ONF_MAKE_SUBDIR="lf/onf-make"
+PROJECT="${TEST_PROJECT:-}"
+REPO="https://gerrit.opencord.org/$PROJECT"
+
+cd $WORKSPACE
+git clone "$REPO" "$PROJECT"
+cd "$PROJECT"
+git submodule update --init
+
+REPO="https://gerrit.opencord.org/onf-make"
+
+pushd "$ONF_MAKE_SUBDIR"
+git fetch "$REPO" "$GERRIT_REFSPEC" && git checkout FETCH_HEAD
+popd
diff --git a/jjb/shell/make-unit.sh b/jjb/shell/make-unit.sh
index 9a69b60..ac0bd6e 100755
--- a/jjb/shell/make-unit.sh
+++ b/jjb/shell/make-unit.sh
@@ -20,13 +20,13 @@
 # when not running under Jenkins, use current dir as workspace, a blank project
 # name
 WORKSPACE=${WORKSPACE:-.}
-GERRIT_PROJECT=${GERRIT_PROJECT:-}
+TEST_PROJECT="${TEST_PROJECT:-}"
 
 # Fixes to for golang projects to support GOPATH
 # If $DEST_GOPATH is not an empty string:
 # - create GOPATH within WORKSPACE, and destination directory within
 # - set PATH to include $GOPATH/bin and the system go binaries
-# - move project from $WORKSPACE/$GERRIT_PROJECT to new location in $GOPATH
+# - move project from $WORKSPACE/$TEST_PROJECT to new location in $GOPATH
 # - start tests within that directory
 
 DEST_GOPATH=${DEST_GOPATH:-}
@@ -34,10 +34,10 @@
   export GOPATH=${GOPATH:-$WORKSPACE/go}
   mkdir -p "$GOPATH/src/$DEST_GOPATH"
   export PATH=$PATH:/usr/lib/go-1.12/bin:/usr/local/go/bin:$GOPATH/bin
-  test_path="$GOPATH/src/$DEST_GOPATH/$GERRIT_PROJECT"
-  mv "$WORKSPACE/$GERRIT_PROJECT" "$test_path"
+  test_path="$GOPATH/src/$DEST_GOPATH/$TEST_PROJECT"
+  mv "$WORKSPACE/$TEST_PROJECT" "$test_path"
 else
-  test_path="$WORKSPACE/$GERRIT_PROJECT"
+  test_path="$WORKSPACE/$TEST_PROJECT"
 fi
 
 # Use "test" as the default target, can be a space separated list
@@ -47,7 +47,7 @@
 UNIT_TEST_KEEP_GOING=${UNIT_TEST_KEEP_GOING:-false}
 
 if [ ! -f "$test_path/Makefile" ]; then
-  echo "Makefile not found at $test_path!"
+  echo "Makefile not found at ${test_path}/Makefile"
   exit 1
 else
   pushd "$test_path"
diff --git a/jjb/verify/att-workflow-driver.yaml b/jjb/verify/att-workflow-driver.yaml
index a1cab88..2e5255b 100644
--- a/jjb/verify/att-workflow-driver.yaml
+++ b/jjb/verify/att-workflow-driver.yaml
@@ -23,7 +23,7 @@
     name: 'publish-att-workflow-driver-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org, andy@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org, andy@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index 25a66e9..f49e61a 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -77,7 +77,7 @@
     name: 'publish-bbsim-sadis-server-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index a5a8f55..1104b64 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -129,7 +129,7 @@
     name: 'publish-bbsim-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag_wildcard'
       - 'github-release':
diff --git a/jjb/verify/fabric-crossconnect.yaml b/jjb/verify/fabric-crossconnect.yaml
index 0cfa9e8..8e57de0 100644
--- a/jjb/verify/fabric-crossconnect.yaml
+++ b/jjb/verify/fabric-crossconnect.yaml
@@ -22,7 +22,7 @@
     name: 'publish-fabric-crossconnect-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index 4263699..a444977 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -23,7 +23,7 @@
     name: 'publish-fabric-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
index 82e080c..60ef0da 100644
--- a/jjb/verify/olt-service.yaml
+++ b/jjb/verify/olt-service.yaml
@@ -22,7 +22,7 @@
     name: 'publish-olt-service-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
index 1b15eab..cc40715 100644
--- a/jjb/verify/rcord.yaml
+++ b/jjb/verify/rcord.yaml
@@ -23,7 +23,7 @@
     name: 'publish-rcord-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/tt-workflow-driver.yaml b/jjb/verify/tt-workflow-driver.yaml
index 4eced6c..cd0325a 100644
--- a/jjb/verify/tt-workflow-driver.yaml
+++ b/jjb/verify/tt-workflow-driver.yaml
@@ -21,7 +21,7 @@
     name: 'publish-tt-workflow-driver-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org, andy@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org, andy@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/voltha-northbound-bbf-adapter.yaml b/jjb/verify/voltha-northbound-bbf-adapter.yaml
index c16d7d7..6c994e9 100644
--- a/jjb/verify/voltha-northbound-bbf-adapter.yaml
+++ b/jjb/verify/voltha-northbound-bbf-adapter.yaml
@@ -51,7 +51,7 @@
     name: 'publish-voltha-northbound-bbf-adapter-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
index 2d3d5b8..d70d0c0 100644
--- a/jjb/verify/vrouter.yaml
+++ b/jjb/verify/vrouter.yaml
@@ -21,7 +21,7 @@
     name: 'publish-vrouter-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/xos-gui.yaml b/jjb/verify/xos-gui.yaml
index 0d4bf60..54ecd4b 100644
--- a/jjb/verify/xos-gui.yaml
+++ b/jjb/verify/xos-gui.yaml
@@ -41,7 +41,7 @@
     name: 'publish-xos-gui-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/xos-rest-gw.yaml b/jjb/verify/xos-rest-gw.yaml
index 909e75f..8754779 100644
--- a/jjb/verify/xos-rest-gw.yaml
+++ b/jjb/verify/xos-rest-gw.yaml
@@ -41,7 +41,7 @@
     name: 'publish-xos-rest-gw-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/xos-tosca.yaml b/jjb/verify/xos-tosca.yaml
index 221cc78..9d90822 100644
--- a/jjb/verify/xos-tosca.yaml
+++ b/jjb/verify/xos-tosca.yaml
@@ -41,7 +41,7 @@
     name: 'publish-xos-tosca-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org, scottb@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org, scottb@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index 5d02a5d..64d40bc 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -63,7 +63,7 @@
           pypi-index: 'pypi'
           dependency-jobs: 'version-tag_wildcard'
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           build-timeout: 30
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 7ca459f..ad40e75 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1999,6 +1999,182 @@
                 - compare-type: REG_EXP
                   pattern: '{all-files-regexp}'
 
+- job-template:
+    id: 'voltha-make-test'
+    name: '{name}'
+    #build-node: 'ubuntu18.04-basebuild-4c-8g'
+    build-node: 'ubuntu18.04-basebuild-8c-15g'
+    pipeline-script: 'voltha/bbsim-tests.groovy'
+    pipeline-branch: 'master'
+    override-branch: '$GERRIT_BRANCH'
+    sandbox: true
+    build-timeout: 20
+    timeout: 50
+    olts: 1
+    registry:  mirror.registry.opennetworking.org
+    logLevel: 'INFO'
+    test-project: 'voltha-go'
+    volthaSystemTestsChange: ''
+    volthaHelmChartsChange: ''
+    extraHelmFlags: ''
+    enableMacLearning: false
+    withMonitoring: false
+    robot-args: ''
+    branch-regexp: '{all-branches-regexp}'
+    testTargets: |
+      - target: sanity-kind-att
+        workflow: att
+        flags: ""
+        teardown: true
+        logging: true
+      - target: sanity-kind-dt
+        workflow: dt
+        flags: ""
+        teardown: true
+        logging: true
+      - target: sanity-kind-tt
+        workflow: tt
+        flags: ""
+        teardown: true
+        logging: true
+
+    description: |
+      <!-- Managed by Jenkins Job Builder -->
+      Created by {id} job-template from ci-management/jjb/voltha-e2e.yaml  <br /><br />
+      E2E Validation for Voltha 2.X
+
+    properties:
+      - onf-infra-volthadevs-permissions
+      - cord-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+          artifact-num-to-keep: '{artifact-num-to-keep}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    parameters:
+      - string:
+          name: buildNode
+          default: '{build-node}'
+          description: 'Name of the Jenkins node to run the job on'
+
+      - string:
+          name: gerritProject
+          default: '{test-project}'
+          description: 'Name of the Gerrit project'
+
+      - string:
+          name: gerritRefspec
+          default: 'refs/heads/master'
+          description: 'PatchSet REFSPEC in Gerrit, example value: "refs/changes/79/18779/13"'
+
+      - string:
+          name: extraHelmFlags
+          default: '{extraHelmFlags}'
+          description: 'Helm flags to pass to every helm command'
+
+      # applicable for voltha-2.9 (excluding) onwards
+      - bool:
+          name: enableMacLearning
+          default: '{enableMacLearning}'
+          description: "Deploy and test with ONOS Mac-Learning app"
+
+      - string:
+          name: extraRobotArgs
+          default: '{robot-args}'
+          description: 'Arguments to pass to robot'
+
+      - string:
+          name: volthaSystemTestsChange
+          default: '{volthaSystemTestsChange}'
+          description: 'Download a change for gerrit in the voltha-system-tests repo, example value: "refs/changes/79/18779/13"'
+
+      - string:
+          name: volthaHelmChartsChange
+          default: '{volthaHelmChartsChange}'
+          description: 'Download a change for gerrit in the voltha-helm-charts repo, example value: "refs/changes/79/18779/13"'
+
+      - string:
+          name: branch
+          default: '{override-branch}'
+          description: 'Name of the branch to use'
+
+      # test configuration
+      # this is a parameter to drive the test execution, VOLTHA is redeployed each time with
+      # the provided configuration and then the make target is invoked,
+      # example value (has to be valid YAML):
+      # testTargets: |
+      #   - target: 1t1gem-openonu-go-adapter-test
+      #     workflow: att
+      #     flags: ""
+      #     teardown: true
+      #     logging: true
+      - text:
+          name: testTargets
+          default: '{testTargets}'
+          description: 'Test configuration, see the ci-management job definition for more info'
+
+      - string:
+          name: timeout
+          default: '{timeout}'
+          description: 'Timeout of pipeline job [minutes]'
+
+      - string:
+          name: olts
+          default: '{olts}'
+          description: 'How many BBSim instances to run'
+
+      - string:
+          name: registry
+          default: '{registry}'
+          description: 'Which registry to use (amazon vs menlo)'
+
+      - bool:
+          name: withMonitoring
+          default: '{withMonitoring}'
+          description: 'Option to install Prometheus'
+
+      - string:
+          name: logLevel
+          default: '{logLevel}'
+          description: 'Log level for all the components'
+
+    project-type: pipeline
+    concurrent: true
+
+    pipeline-scm:
+      scm:
+        - git:
+            url: https://gerrit.opencord.org/ci-management
+            branches:
+              - origin/{pipeline-branch}
+      script-path: jjb/pipeline/{pipeline-script}
+
+    triggers:
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          dependency-jobs: '{dependency-jobs}'
+          silent-start: true
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: true
+                exclude-trivial-rebase: false
+                exclude-no-code-change: true
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: '(?i)^.*recheck$'
+          projects:
+            - project-compare-type: REG_EXP
+              project-pattern: '^{project}$'
+              branches:
+                - branch-compare-type: REG_EXP
+                  branch-pattern: '{branch-regexp}'
+              file-paths:
+                - compare-type: REG_EXP
+                  pattern: '{all-files-regexp}'
+
 # POD Per Patchset Pipeline Jobs
 # to use these parameters in a job: `<<: *voltha-physical-patchset-parameters`
 - _voltha-physical-patchset-parameters: &voltha-physical-patchset-parameters
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 4786047..07735e4 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -732,7 +732,7 @@
           name: 'voltha-scale-measurements-lwc-dt-512'
           pipeline-script: 'voltha/voltha-scale-lwc-test.groovy'
           pipeline-branch: 'master'
-          build-node: 'berlin-community-pod-2'
+          build-node: 'jenkins-worker-02.berlin-lab'
           time-trigger: "H H * * *"
           disable-job: true
           withMonitoring: true
@@ -752,7 +752,7 @@
           name: 'voltha-scale-measurements-lwc-dt-256'
           pipeline-script: 'voltha/voltha-scale-lwc-test.groovy'
           pipeline-branch: 'master'
-          build-node: 'berlin-community-pod-2'
+          build-node: 'jenkins-worker-02.berlin-lab'
           time-trigger: "H H * * *"
           disable-job: true
           withMonitoring: true
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 3f26acd..36e1140 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -58,6 +58,11 @@
           description: 'The config file'
 
       - string:
+          name: cluster
+          default: '{cluster}'
+          description: 'Name of the cluster'
+
+      - string:
           name: profile
           default: '{profile}'
           description: 'Technology Profile pushed to the ETCD'
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index ca6e064..ecaf270 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -29,8 +29,9 @@
       # -----------------------------------------------------------------------
       # Berlin pod with olt/onu - master versions timer based job , two OLTs
       - 'build_voltha_pod_release_timer':
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-multi-olt'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: true
           name-extension: '_DT'
           work-flow: 'DT'
@@ -43,8 +44,9 @@
       # Berlin POD test job - master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 360
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-multi-olt'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: true
           release: 'master'
           branch: 'master'
@@ -58,8 +60,9 @@
 
       # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-gpon'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: false
           name-extension: '_DT'
           work-flow: 'DT'
@@ -72,8 +75,9 @@
       # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 330
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-gpon'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: false
           name-extension: '_DT'
           work-flow: 'DT'
@@ -88,8 +92,9 @@
       # -----------------------------------------------------------------------
       # Berlin pod with gpon olt/onu - master 1T4GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-gpon-fttb'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: true
           withFttb: true
           name-extension: '_DT'
@@ -102,8 +107,9 @@
       # Berlin POD test job - master versions: uses 1T4GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 330
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-gpon-fttb'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: true
           withFttb: true
           name-extension: '_DT'
@@ -118,8 +124,9 @@
 
       # Berlin pod with zyxel gpon olt/onu - master 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
-          build-node: 'berlin-community-pod-2'
+          build-node: 'jenkins-worker-02.berlin-lab'
           config-pod: 'berlin-community-pod-2-gpon-zyxel'
+          cluster: 'pod-2.berlin-lab.lfbroadband.org'
           disable-job: true
           name-extension: '_DT'
           work-flow: 'DT'
@@ -136,8 +143,9 @@
 
       # Berlin POD test job - zyxel gpon master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
-          build-node: 'berlin-community-pod-2'
+          build-node: 'jenkins-worker-02.berlin-lab'
           config-pod: 'berlin-community-pod-2-gpon-zyxel'
+          cluster: 'pod-2.berlin-lab.lfbroadband.org'
           disable-job: true
           release: 'master'
           branch: 'master'
@@ -151,8 +159,9 @@
 
       # Berlin pod with zyxel xgspon olt/onu - master 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
-          build-node: 'berlin-community-pod-2'
+          build-node: 'jenkins-worker-02.berlin-lab'
           config-pod: 'berlin-community-pod-2-xgspon-zyxel'
+          cluster: 'pod-2.berlin-lab.lfbroadband.org'
           disable-job: true
           name-extension: '_DT'
           work-flow: 'DT'
@@ -169,8 +178,9 @@
 
       # Berlin POD test job - zyxel xgsgpon master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
-          build-node: 'berlin-community-pod-2'
+          build-node: 'jenkins-worker-02.berlin-lab'
           config-pod: 'berlin-community-pod-2-xgspon-zyxel'
+          cluster: 'pod-2.berlin-lab.lfbroadband.org'
           disable-job: true
           release: 'master'
           branch: 'master'
@@ -184,8 +194,9 @@
 
       # TT workflow on Zyxel XGSPON OLT at Berlin pod - build job
       - 'build_voltha_pod_release_timer':
-          build-node: 'berlin-community-pod-2'
+          build-node: 'jenkins-worker-02.berlin-lab'
           config-pod: 'berlin-community-pod-2-xgspon-zyxel'
+          cluster: 'pod-2.berlin-lab.lfbroadband.org'
           disable-job: true
           release: 'master'
           branch: 'master'
@@ -199,8 +210,9 @@
 
       # TT workflow on Zyxel XGSPON OLT at Berlin pod - test job
       - 'build_voltha_pod_test':
-          build-node: 'berlin-community-pod-2'
+          build-node: 'jenkins-worker-02.berlin-lab'
           config-pod: 'berlin-community-pod-2-xgspon-zyxel'
+          cluster: 'pod-2.berlin-lab.lfbroadband.org'
           disable-job: true
           release: 'master'
           branch: 'master'
@@ -216,8 +228,9 @@
 
       # [CORD-3256] TT workflow on XGSPON OLT at Berlin pod - build job
       - 'build_voltha_pod_release_timer':
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-gpon'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: true
           release: 'master'
           branch: 'master'
@@ -231,8 +244,9 @@
 
       # [CORD-3256] TT workflow on GPON OLT at Berlin pod - test job
       - 'build_voltha_pod_test':
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-gpon'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: true
           release: 'master'
           branch: 'master'
@@ -248,8 +262,9 @@
 
       # TT workflow on Zyxel GPON OLT at Berlin pod - build job (playground)
       - 'build_voltha_pod_release_timer_playground':
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-gpon'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: true
           release: 'master'
           branch: 'master'
@@ -263,8 +278,9 @@
 
       # TT workflow on Zyxel XGSPON OLT at Berlin pod - test job (playground)
       - 'build_voltha_pod_test_playground':
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-gpon'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: true
           release: 'master'
           branch: 'master'
@@ -280,8 +296,9 @@
 
       # Berlin pod with adtran gpon olt/onu - master 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-gpon-adtran'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: true
           name-extension: '_DT'
           work-flow: 'DT'
@@ -302,8 +319,9 @@
       # Berlin POD adtran test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 390
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-gpon-adtran'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: true
           release: 'master'
           branch: 'master'
@@ -319,8 +337,9 @@
       # -----------------------------------------------------------------------
       # Berlin pod with adtran gpon olt/onu - 1T8GEM tech profile and timer based job
       - 'verify_voltha_pod_dmi_test':
-          build-node: 'berlin-community-pod-1'
+          build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-gpon-adtran'
+          cluster: 'pod-1.berlin-lab.lfbroadband.org'
           disable-job: true
           name-extension: '_DT'
           work-flow: 'DT'
diff --git a/vars/getVolthaCode.groovy b/vars/getVolthaCode.groovy
index aecb30d..4230b9e 100644
--- a/vars/getVolthaCode.groovy
+++ b/vars/getVolthaCode.groovy
@@ -76,8 +76,8 @@
             'voltha-helm-charts',
         ]
 
-        // We are always downloading those repos, if the patch under test is in one of those
-        // just checkout the patch, no need to clone it again
+        // We are always downloading those repos, if the patch under test is in
+        // one of those just checkout the patch, no need to clone it again
         if (cfg.gerritProject == '')
         {
             // Revisit:
@@ -88,6 +88,36 @@
             // checkout during an error condition.
             // Case: when cfg= is invalid due to a jenkins hiccup.
         }
+        else if (params.GERRIT_PROJECT == "onf-make")
+        {
+            // When testing onf-make, the tests are kicked off from the onf-make
+            // repo, so the GERRIT_PROJECT and GERRIT_PATCHSET_REVISION params
+            // will carry the data of what we want the submodule to be.
+            // 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}"
+
+            checkout([
+                $class: 'GitSCM',
+                userRemoteConfigs: [[ url:repo_project ]],
+                branches: [[ name: "${cfg.branch}", ]],
+                extensions: [
+                    [$class: 'WipeWorkspace'],
+                    [$class: 'RelativeTargetDirectory', relativeTargetDir: "${cfg.gerritProject}"],
+                    [$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
+                    submodule(recursiveSubmodules: true, reference: "${params.GERRIT_PATCHSET_REVISION}"),
+                ],
+            ])
+
+            sh("""pushd $WORKSPACE/${cfg.gerritProject}
+                  git fetch "$repo_project" ${cfg.gerritRefspec} && git checkout FETCH_HEAD
+
+                  echo "Currently on commit: \n"
+                  git log -1 --oneline
+                  popd
+               """)
+        }
         else if (!(cfg.gerritProject in frequent_repos))
         {
             repo_project = "https://gerrit.opencord.org/${cfg.gerritProject}"
@@ -103,14 +133,13 @@
                 ],
             ])
 
-            sh("""
-        pushd $WORKSPACE/${cfg.gerritProject}
-        git fetch "$repo_project" ${cfg.gerritRefspec} && git checkout FETCH_HEAD
+            sh("""pushd $WORKSPACE/${cfg.gerritProject}
+                  git fetch "$repo_project" ${cfg.gerritRefspec} && git checkout FETCH_HEAD
 
-        echo "Currently on commit: \n"
-        git log -1 --oneline
-        popd
-      """)
+                  echo "Currently on commit: \n"
+                  git log -1 --oneline
+                  popd
+               """)
         }
     }