diff --git a/Jenkinsfile/verify-api-tests-JenkinsFile b/JenkinsFile-verify-api-tests
similarity index 98%
rename from Jenkinsfile/verify-api-tests-JenkinsFile
rename to JenkinsFile-verify-api-tests
index aef6a5c..09884eb 100644
--- a/Jenkinsfile/verify-api-tests-JenkinsFile
+++ b/JenkinsFile-verify-api-tests
@@ -15,7 +15,7 @@
 PROFILE="null"
 CORE_CONTAINER="null"
 
-node ('ubuntu16.04-basebuild-4c-8g') {
+node ("${buildNode}") {
     stage('Config') {
         sh """
         rm -rf ~/cord/
diff --git a/Jenkinsfile-attworkflow-build b/Jenkinsfile-attworkflow-build
index e74f113..13c3b2f 100644
--- a/Jenkinsfile-attworkflow-build
+++ b/Jenkinsfile-attworkflow-build
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (100) {
         try {
             stage ("Parse deployment configuration file") {
diff --git a/Jenkinsfile-attworkflow-build-released-ver b/Jenkinsfile-attworkflow-build-released-ver
index 3842658..7e47780 100644
--- a/Jenkinsfile-attworkflow-build-released-ver
+++ b/Jenkinsfile-attworkflow-build-released-ver
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (100) {
         try {
             stage ("Parse deployment configuration file") {
diff --git a/Jenkinsfile-attworkflow-test b/Jenkinsfile-attworkflow-test
index a1fed4f..58bdcf2 100644
--- a/Jenkinsfile-attworkflow-test
+++ b/Jenkinsfile-attworkflow-test
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (200) {
         try {
             stage ("Parse deployment configuration file") {
diff --git a/Jenkinsfile-comac-release-build b/Jenkinsfile-comac-release-build
index b21e665..e98a61c 100644
--- a/Jenkinsfile-comac-release-build
+++ b/Jenkinsfile-comac-release-build
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (100) {
         try {
             // Start Jenkins steps from here
@@ -408,4 +408,4 @@
         }
         echo "RESULT: ${currentBuild.result}"
     }
-}
\ No newline at end of file
+}
diff --git a/Jenkinsfile-mcord-license-check b/Jenkinsfile-mcord-license-check
index 3dcfff1..e2b4c3e 100644
--- a/Jenkinsfile-mcord-license-check
+++ b/Jenkinsfile-mcord-license-check
@@ -12,7 +12,7 @@
 
 repos = params.repos.split(",")
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (100) {
         try {
             stage ("Cleanup") {
diff --git a/Jenkinsfile-mcord-local-build b/Jenkinsfile-mcord-local-build
index af41935..717ede2 100644
--- a/Jenkinsfile-mcord-local-build
+++ b/Jenkinsfile-mcord-local-build
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (100) {
         try {
             stage ("Parse deployment configuration file") {
diff --git a/Jenkinsfile-mcord-release-build b/Jenkinsfile-mcord-release-build
index f6aa928..70336fa 100644
--- a/Jenkinsfile-mcord-release-build
+++ b/Jenkinsfile-mcord-release-build
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
   timeout (100) {
     try {
       stage ("Parse deployment configuration files") {
diff --git a/Jenkinsfile-mcord-remote-build b/Jenkinsfile-mcord-remote-build
index b24a47d..b244ef2 100644
--- a/Jenkinsfile-mcord-remote-build
+++ b/Jenkinsfile-mcord-remote-build
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (100) {
         try {
             stage ("Parse deployment configuration file") {
diff --git a/Jenkinsfile-rcordlite-control-plane b/Jenkinsfile-rcordlite-control-plane
index 52f1226..efa5fd5 100644
--- a/Jenkinsfile-rcordlite-control-plane
+++ b/Jenkinsfile-rcordlite-control-plane
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (time: 240) {
         stage ("Parse deployment configuration file") {
             sh returnStdout: true, script: 'rm -rf ${configRepoBaseDir}'
diff --git a/Jenkinsfile-rcordlite-topdown-build b/Jenkinsfile-rcordlite-topdown-build
index 6923c58..ccc0fe5 100644
--- a/Jenkinsfile-rcordlite-topdown-build
+++ b/Jenkinsfile-rcordlite-topdown-build
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (100) {
         try {
             stage ("Parse deployment configuration file") {
diff --git a/Jenkinsfile-rcordlite-topdown-test b/Jenkinsfile-rcordlite-topdown-test
index 01bcab4..be051a0 100644
--- a/Jenkinsfile-rcordlite-topdown-test
+++ b/Jenkinsfile-rcordlite-topdown-test
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (100) {
         try {
             stage ("Parse deployment configuration file") {
diff --git a/Jenkinsfile-rcordlite-zerotouch-build b/Jenkinsfile-rcordlite-zerotouch-build
index 5af58ed..53907fb 100644
--- a/Jenkinsfile-rcordlite-zerotouch-build
+++ b/Jenkinsfile-rcordlite-zerotouch-build
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (100) {
         try {
             stage ("Parse deployment configuration file") {
diff --git a/Jenkinsfile-rcordlite-zerotouch-test b/Jenkinsfile-rcordlite-zerotouch-test
index a965985..f3dfe45 100644
--- a/Jenkinsfile-rcordlite-zerotouch-test
+++ b/Jenkinsfile-rcordlite-zerotouch-test
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-node ("${TestNodeName}") {
+node ("${buildNode}") {
     timeout (100) {
         try {
             stage ("Parse deployment configuration file") {