diff --git a/Jenkinsfile.newBuildSystem b/Jenkinsfile.newBuildSystem
index 984eb46..0b09d32 100644
--- a/Jenkinsfile.newBuildSystem
+++ b/Jenkinsfile.newBuildSystem
@@ -19,24 +19,14 @@
 deployment_config = null;
 pod_config = null;
 
-node ('master') {
-    checkout changelog: false, poll: false, scm: [$class: 'RepoScm', currentBranch: true, manifestBranch: params.branch, manifestRepositoryUrl: "${manifestUrl}", quiet: true]
-
-    stage ("Generate and Copy Manifest file") {
-        sh returnStdout: true, script: 'repo manifest -r -o ' + filename
-        sh returnStdout: true, script: 'cp ' + filename + ' ' + env.JENKINS_HOME + '/tmp'
-    }
-
-    stage ("Parse deployment configuration file") {
-        sh returnStdout: true, script: 'rm -rf ${configRepoBaseDir}'
-        sh returnStdout: true, script: 'git clone -b ${branch} ${configRepoUrl}'
-        deployment_config = readYaml file: "${configRepoBaseDir}${configRepoFile}"
-        pod_config = readYaml file: "${configRepoBaseDir}${deployment_config.pod_config.file_name}"
-    }
-}
-
-node ("${deployment_config.dev_node.name}") {
+node ("${devNodeName}") {
     timeout (time: 240) {
+        stage ("Parse deployment configuration file") {
+            sh returnStdout: true, script: 'rm -rf ${configRepoBaseDir}'
+            sh returnStdout: true, script: 'git clone -b ${branch} ${configRepoUrl}'
+            deployment_config = readYaml file: "${configRepoBaseDir}${configRepoFile}"
+            pod_config = readYaml file: "${configRepoBaseDir}${deployment_config.pod_config.file_name}"
+        }
         stage ('Remove old head node from known hosts') {
             sh "ssh-keygen -R ${deployment_config.head.ip}"
         }