diff --git a/jjb/cord-test/mcord-build.yaml b/jjb/cord-test/mcord-build.yaml
index 7500fde..f90f2ed 100644
--- a/jjb/cord-test/mcord-build.yaml
+++ b/jjb/cord-test/mcord-build.yaml
@@ -1,34 +1,46 @@
 ---
-# POD Nightly Build Pipeline M-CORD Jobs
+# MCORD 6.0 Build+Test job on Single-Node
 
 - project:
-    name: mcord-nightly-build-pipeline
+    name: mcord-build
 
     project-name: '{name}'
 
-    build-timeout: '300'
-
     jobs:
-      # qct pod 4 build jobs (mcord)
-      - 'build_pod_manual':
-         pod: 'qct-pod4'
-         pod_config: 'qct-pod4-mcord.yml'
-         profile: 'mcord'
-         branch: 'cord-4.1'
-         Jenkinsfile: 'Jenkinsfile.newBuildSystem'
+      - 'mcord_build_test'
 
-      # onf pod build job (mcord)
-      - 'build_pod_manual':
-         pod: 'onf-mcord-dev'
-         pod_config: 'onlab-mcord-cavium-pod1.yml'
-         profile: 'mcord'
-         branch: 'cord-5.0'
-         Jenkinsfile: 'Jenkinsfile.MCORDBuildSystem'
+- job-template:
+    id: mcord_build_test
+    name: 'mcord_build_test'
+    description: |
+      Created by {id} job-template from ci-management/jjb/mcord-build.yaml
 
-      # qct pod 4 test jobs
-      - 'build_pod_manual_test':
-         pod: 'qct-pod4'
-         pod_config: 'qct-pod4-mcord.yml'
-         profile: 'mcord'
-         branch: 'cord-4.1'
-         Jenkinsfile: 'Jenkinsfile-mcord'
+    properties:
+      - cord-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+          artifact-num-to-keep: '{artifact-num-to-keep}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    parameters:
+      - string:
+          name: executorNode
+          default: 'flex-ocp-mcord'
+          description: 'Name of the Jenkins node to run the job on'
+
+      - string:
+         name: notificationEmail
+         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+         description: 'List of email recipients'
+
+    project-type: pipeline
+    concurrent: false
+
+    dsl: !include-raw-escape: ../pipeline/mcord-deployment.groovy
+
+    triggers:
+        - reverse:
+            jobs: 'deploy-node-maas'