diff --git a/jjb/pipeline/voltha-scale-matrix.groovy b/jjb/pipeline/voltha-scale-matrix.groovy
index 5aa4b3e..83bd7f4 100644
--- a/jjb/pipeline/voltha-scale-matrix.groovy
+++ b/jjb/pipeline/voltha-scale-matrix.groovy
@@ -12,6 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+topologies = [
+  ['onu': 1, 'pon': 1],
+  ['onu': 2, 'pon': 1],
+  ['onu': 2, 'pon': 2],
+]
+
 pipeline {
 
   agent {
@@ -21,7 +27,17 @@
       timeout(time: 30, unit: 'MINUTES')
   }
   environment {
+    JENKINS_NODE_COOKIE="dontKillMe" // do not kill processes after the build is done
+    KUBECONFIG="$HOME/.kube/config"
+    VOLTCONFIG="$HOME/.volt/config"
+    SCHEDULE_ON_CONTROL_NODES="yes"
 
+    WITH_SIM_ADAPTERS="no"
+    WITH_RADIUS="yes"
+    WITH_BBSIM="yes"
+    LEGACY_BBSIM_INDEX="no"
+    DEPLOY_K8S="no"
+    CONFIG_SADIS="external"
   }
 
   stages {
@@ -104,17 +120,13 @@
       }
     }
     stage('Deploy and test') {
-      repeat_deploy_and_test(topologies)
+      steps {
+          repeat_deploy_and_test(topologies)
+      }
     }
   }
 }
 
-topologies = [
-  {'onu': 1, 'pon': 1},
-  {'onu': 2, 'pon': 1},
-  {'onu': 2, 'pon': 2},
-]
-
 def repeat_deploy_and_test(list) {
     for (int i = 0; i < list.size(); i++) {
         sh "echo Setting up with ${list[i]['pon']}x${list[i]['onu']}"
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 3bce1f4..4c85388 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -601,6 +601,8 @@
     # default values
     release: master
     build-node: 'voltha-scale'
+    volthaSystemTestsChange: ''
+    kindVolthaChange: ''
 
     project-type: pipeline
     concurrent: false
@@ -617,3 +619,13 @@
           name: buildNode
           default: '{build-node}'
           description: 'Name of the Jenkins node to run the job on'
+
+      - 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: kindVolthaChange
+          default: '{kindVolthaChange}'
+          description: 'Download a change for gerrit in the kind-voltha repo, example value: "refs/changes/32/19132/1"'