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/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'