diff --git a/jjb/cord-test/mcord-build.yaml b/jjb/cord-test/mcord-build.yaml
deleted file mode 100644
index 1892dbe..0000000
--- a/jjb/cord-test/mcord-build.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-# MCORD 6.0 Build+Test job on Single-Node
-
-- project:
-    name: mcord-build
-
-    project-name: '{name}'
-
-    jobs:
-      - 'mcord_build_test'
-
-- job-template:
-    id: mcord_build_test
-    name: 'mcord_build_test'
-    description: |
-      Created by {id} job-template from ci-management/jjb/mcord-build.yaml
-
-    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: branch
-         default: 'master'
-         description: 'Branch to pull'
-
-      - string:
-         name: configRepoUrl
-         default: 'https://gerrit.opencord.org/pod-configs'
-         description: 'The URL of the POD configs repository'
-
-      - string:
-         name: configRepoBaseDir
-         default: 'pod-configs/'
-         description: 'The directory inside the POD configs repository'
-
-      - string:
-         name: configRepoFile
-         default: 'kubernetes-configs/flex-ocp-mcord.yml'
-         description: 'The deployment config file'
-
-      - string:
-          name: executorNode
-          default: 'qa-testvm-pod2'
-          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-build-test.groovy
-
-    triggers:
-       - timed: |
-                 TZ=America/Los_Angeles
-                 H 6 * * *
diff --git a/jjb/cord-test/mcord.yaml b/jjb/cord-test/mcord.yaml
new file mode 100644
index 0000000..588bbb2
--- /dev/null
+++ b/jjb/cord-test/mcord.yaml
@@ -0,0 +1,18 @@
+---
+# POD Build Pipeline Jobs for MCORD
+
+- project:
+    name: mcord-build-job
+
+    project-name: '{name}'
+
+    build-timeout: '300'
+
+    jobs:
+      # onlab pod1 build
+      - 'build_mcord_pod_manual':
+         testvm: 'onf-build'
+         config-pod: 'onlab-pod1'
+         profile: 'mcord'
+         branch: 'master'
+         Jenkinsfile: 'Jenkinsfile-mcord-build'
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 81cb3f6..f2be4cc 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -778,3 +778,81 @@
       - reverse:
           jobs: 'build_{config-pod}_seba_release_{release}_microcharts'
           result: 'success'
+
+
+- job-template:
+    name: 'build_{profile}_{config-pod}_{branch}_manual'
+    id: build_mcord_pod_manual
+    description: |
+                  <!-- Managed by Jenkins Job Builder -->
+                  Manual Build on POD {config-pod} using {Jenkinsfile} <br /><br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
+                  Created by QA (Kailash Khalasi - kailash@opennetworking.org ) <br />
+                  Copyright (c) 2019 Open Networking Foundation (ONF)
+
+    <<: *test-pipe-job-boiler-plate
+
+    parameters:
+      - string:
+         name: TestNodeName
+         default: '{testvm}'
+         description: 'Jenkins node name of TestVM Node'
+
+      - string:
+         name: cordRepoUrl
+         default: '{gerrit-server-url}'
+         description: 'The URL of the CORD Project repository'
+
+      - string:
+         name: configBaseDir
+         default: 'pod-configs'
+         description: 'The directory inside the POD configs repository'
+
+      - string:
+         name: configDeploymentDir
+         default: 'deployment-configs'
+         description: 'The deployment configs folder'
+
+      - string:
+         name: configKubernetesDir
+         default: 'kubernetes-configs'
+         description: 'The kubernetes config folder'
+
+      - string:
+         name: configToscaDir
+         default: 'tosca-configs'
+         description: 'The tosca config folder'
+
+      - string:
+         name: configFileName
+         default: '{config-pod}'
+         description: 'The config file'
+
+      - string:
+         name: branch
+         default: '{branch}'
+
+      - string:
+         name: profile
+         default: '{profile}'
+         description: 'Profile in which this job installs'
+
+      - string:
+         name: notificationEmail
+         default: 'luca@opennetworking.org, teo@opennetworking.org, weiyu@opennetworking.org'
+         description: ''
+
+      - bool:
+          name: configurePod
+          default: false
+          description: "Configure POD via TOSCA post build"
+
+    concurrent: true
+
+    pipeline-scm:
+      script-path: '{Jenkinsfile}'
+      scm:
+        - git:
+           url: '{gerrit-server-url}/cord-tester'
+           branches:
+             - '{branch}'