diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 192e4df..2526400 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -319,29 +319,29 @@
           profile: 'Default'
 
 
-      # Berlin pod with olt/onu - Released versions Default tech profile and timer based job
+      # Berlin pod with olt/onu - master versions Default tech profile and timer based job
       - 'build_voltha_pod_release':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod'
-          release: 'release'
+          release: 'master'
           branch: 'master'
           onos-version: '2.2'
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
           oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
           configurePod: true
-          released: true
+          released: false
           profile: 'Default'
           with-kind: true
           time: '9'
 
 
-      # Berlin POD test job - released versions: uses tech profile on voltha branch
+      # Berlin POD test job - master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod'
-          release: 'release'
+          release: 'master'
           branch: 'master'
-          released: true
+          released: false
           test-repo: 'voltha-system-tests'
           profile: 'Default'
diff --git a/jjb/pipeline/voltha-scale-measurements.groovy b/jjb/pipeline/voltha-scale-measurements.groovy
index 0033d3a..ae01f94 100644
--- a/jjb/pipeline/voltha-scale-measurements.groovy
+++ b/jjb/pipeline/voltha-scale-measurements.groovy
@@ -25,13 +25,14 @@
     stage('set-description') {
       steps {
         script {
-          currentBuild.description = "${onuPerPon} ONU x ${ponPorts} PON - BBSIM Delay ${BBSIMdelay}"
+          currentBuild.description = "$BUILD_TIMESTAMP"
         }
       }
     }
     stage('cleanup') {
       steps {
         sh '''
+          rm -rf voltha-devices.txt onos-ports.txt total-time.txt onu-activation.txt
           for hchart in \$(helm list -q | grep -E -v 'docker-registry|cord-kafka|etcd-operator');
           do
               echo "Purging chart: \${hchart}"
@@ -54,11 +55,18 @@
       steps {
         sh '''
           helm install -n onos onf/onos --set images.onos.repository=voltha/voltha-onos --set images.onos.tag=4.0.1
-          helm install -n voltha onf/voltha -f /home/cord/voltha-scale/voltha-values.yaml
-          helm install -n openolt onf/voltha-adapter-openolt -f /home/cord/voltha-scale/voltha-values.yaml
-          helm install -n openonu onf/voltha-adapter-openonu -f /home/cord/voltha-scale/voltha-values.yaml
 
-          helm install -n bbsim onf/bbsim --set pon=${ponPorts},onu=${onuPerPon},auth=${bbsimAuth},dhcp=${bbsimDhcp},delay=${BBSIMdelay}
+          IFS=: read -r volthaRepo volthaTag <<< ${volthaImg}
+          helm install -n voltha onf/voltha -f /home/cord/voltha-scale/voltha-values.yaml --set images.voltha.repository=${volthaRepo},images.voltha.tag=${volthaTag}
+
+          IFS=: read -r openoltAdapterRepo openoltAdapterTag <<< ${openoltAdapterImg}
+          helm install -n openolt onf/voltha-adapter-openolt -f /home/cord/voltha-scale/voltha-values.yaml --set images.adapter_open_olt.repository=${openoltAdapterRepo},images.adapter_open_olt.tag=${openoltAdapterTag}
+
+          IFS=: read -r openonuAdapterRepo openonuAdapterTag <<< ${openonuAdapterImg}
+          helm install -n openonu onf/voltha-adapter-openonu -f /home/cord/voltha-scale/voltha-values.yaml --set images.adapter_open_olt.repository=${openonuAdapterRepo},images.adapter_open_olt.tag=${openonuAdapterTag}
+
+          IFS=: read -r bbsimRepo bbsimTag <<< ${bbsimImg}
+          helm install -n bbsim onf/bbsim --set pon=${ponPorts},onu=${onuPerPon},auth=${bbsimAuth},dhcp=${bbsimDhcp},delay=${BBSIMdelay},images.bbsim.repository=${bbsimRepo},images.bbsim.tag=${bbsimTag}
           helm install -n radius onf/freeradius
 
           if [ ! -z ${bbsimImg} ];
@@ -173,7 +181,7 @@
       plot([
         csvFileName: 'plot-onu-activation.csv',
         csvSeries: [[displayTableFlag: false, exclusionValues: '', file: 'onu-activation.txt', inclusionFlag: 'OFF', url: ''], [displayTableFlag: false, exclusionValues: '', file: 'total-time.txt', inclusionFlag: 'OFF', url: '']],
-        group: 'Voltha-Scale-Numbers', numBuilds: '100', style: 'line', title: 'Time (${BBSIMdelay} Delay)', yaxis: 'Time (s)'
+        group: 'Voltha-Scale-Numbers', numBuilds: '100', style: 'line', title: "Time (${BBSIMdelay}s Delay)", yaxis: 'Time (s)', useDescr: true
       ])
       script {
         sh '''
@@ -193,4 +201,4 @@
       '''
     }
   }
-}
+}
\ No newline at end of file
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index f150d04..9309bbe 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -216,12 +216,12 @@
 
       - string:
           name: bbsimImg
-          default:
+          default: 'voltha/bbsim:master'
           description: 'Custom image selection for BBSIM (repo:tag)'
 
       - string:
           name: volthaImg
-          default:
+          default: 'voltha/voltha-rw-core:master'
           description: 'Custom image selection for VOLTHA (repo:tag)'
 
     project-type: pipeline
@@ -323,14 +323,24 @@
 
       - string:
           name: bbsimImg
-          default:
+          default: voltha/bbsim:master
           description: 'Custom image selection for BBSIM (repo:tag)'
 
       - string:
           name: volthaImg
-          default:
+          default: voltha/voltha-rw-core:master
           description: 'Custom image selection for VOLTHA (repo:tag)'
 
+      - string:
+          name: openoltAdapterImg
+          default: voltha/voltha-openolt-adapter:master
+          description: 'Custom image selection for Openolt Adapter (repo:tag)'
+
+      - string:
+          name: openonuAdapterImg
+          default: voltha/voltha-openonu-adapter:master
+          description: 'Custom image selection for Openonu Adapter (repo:tag)'
+
     project-type: pipeline
     concurrent: false