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/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/github-release.sh b/jjb/shell/github-release.sh
index fe206ac..8cbd044 100755
--- a/jjb/shell/github-release.sh
+++ b/jjb/shell/github-release.sh
@@ -42,20 +42,12 @@
 ##--------------------##
 ##---]  INCLUDES  [---##
 ##--------------------##
-source "$libdir/help.sh"
-source "$libdir/parse-args.sh"
-
-## -----------------------------------------------------------------------
-## Uncomment to activate
-## -----------------------------------------------------------------------
-# declare -g -i debug
-
-# Debug arguments
-# declare -i -g argv_gen_version=1
-# declare -i -g draft_release=1
-
-declare -a -g ARGV=()           # Capture args to minimize globals and arg passing
-[[ $# -gt 0 ]] && ARGV=("$@")
+# If running locally, we can include help and parse-args. However, when run as
+# part of a CI build, these files are not included nor necessary.
+if [[ -d $libdir ]]; then
+    # source "$libdir/help.sh"  "usage" function is never called
+    source "$libdir/parse-args.sh"
+fi
 
 declare -g scratch              # temp workspace for downloads
 
@@ -153,7 +145,7 @@
 
     # shellcheck disable=SC2119
     do_logout
-    
+
     return
 }
 trap sigtrap EXIT
@@ -1103,7 +1095,9 @@
 iam="${0##*/}"
 
 full_banner
-parse_args "$@"
+if [[ $(type -t "parse_args" 2>/dev/null) == "function" ]]; then
+    parse_args "$@"
+fi
 init
 install_gh_binary
 
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-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 a680ffd..ecaf270 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -31,6 +31,7 @@
       - 'build_voltha_pod_release_timer':
           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'
@@ -45,6 +46,7 @@
           timeout: 360
           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'
@@ -60,6 +62,7 @@
       - 'build_voltha_pod_release_timer':
           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'
@@ -74,6 +77,7 @@
           timeout: 330
           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'
@@ -90,6 +94,7 @@
       - 'build_voltha_pod_release_timer':
           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'
@@ -104,6 +109,7 @@
           timeout: 330
           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'
@@ -120,6 +126,7 @@
       - 'build_voltha_pod_release_timer':
           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'
@@ -138,6 +145,7 @@
       - 'build_voltha_pod_test':
           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'
@@ -153,6 +161,7 @@
       - 'build_voltha_pod_release_timer':
           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'
@@ -171,6 +180,7 @@
       - 'build_voltha_pod_test':
           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'
@@ -186,6 +196,7 @@
       - 'build_voltha_pod_release_timer':
           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'
@@ -201,6 +212,7 @@
       - 'build_voltha_pod_test':
           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'
@@ -218,6 +230,7 @@
       - 'build_voltha_pod_release_timer':
           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'
@@ -233,6 +246,7 @@
       - 'build_voltha_pod_test':
           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'
@@ -250,6 +264,7 @@
       - 'build_voltha_pod_release_timer_playground':
           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'
@@ -265,6 +280,7 @@
       - 'build_voltha_pod_test_playground':
           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'
@@ -282,6 +298,7 @@
       - 'build_voltha_pod_release_timer':
           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'
@@ -304,6 +321,7 @@
           timeout: 390
           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'
@@ -321,6 +339,7 @@
       - 'verify_voltha_pod_dmi_test':
           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'