diff --git a/jjb/cord-test/api-sanity-test.yaml b/jjb/cord-test/api-sanity-test.yaml
deleted file mode 100644
index 6259281..0000000
--- a/jjb/cord-test/api-sanity-test.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
----
-# CORD Test Pipeline jobs
-
-- test-pipe-job-boiler-plate: &test-pipe-job-boiler-plate
-    name: test-pipe-job-boiler-plate
-
-    project-type: pipeline
-
-    sandbox: true
-
-    properties:
-
-      - build-discarder:
-         num-to-keep: 20
-    gitURL: https://gerrit.opencord.org/cord-tester
-
-- test-pipe-init-procedure-plate: &test-pipe-init-procedure-plate
-    name: test-pipe-init-procedure-plate
-    project: cord-tester
-    stream: 'master'
-    jenkins-path: 'Jenkinsfile'
-
-
-- job-version-plate: &job-version-plate
-    name: job-version-plate
-    version:
-      - 'master'
-
-- job-type-plate: &job-type-plate
-    name: job-type-plate
-    type:
-      - 'all-xos-api-tests'
-
-- job-template:
-    name: '{type}-pipeline-{version}'
-    description: |
-                  <!-- Managed by Jenkins Job Builder -->
-                  This pipeline contains the test results and logs of {type} on CORD {version}. <br /><br />
-                  Created by Kailash Khalasi - kailash@opennetworking.org<br />
-                  Copyright (c) 2017 Open Networking Foundation (ONF)
-
-    <<: *test-pipe-job-boiler-plate
-
-    parameters:
-
-      - string:
-         name: GERRIT_CHANGE_NUMBER
-         default: '2831'
-         description: 'This parameter is required to manually build this pipeline job'
-
-      - string:
-         name: GERRIT_PATCHSET_NUMBER
-         default: '1'
-         description: 'This parameter is required to manually build this pipeline job'
-
-      - string:
-         name: RECEIPIENT
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
-
-      - lf-infra-parameters:
-         project: '{project}'
-         branch: '{stream}'
-         stream: '{stream}'
-         lftools-version: '<1.0.0'
-
-    concurrent: true
-
-    triggers:
-      - gerrit:
-         server-name: 'CORD Gerrit'
-         trigger-on:
-           - patchset-created-event:
-               exclude-drafts: false
-               exclude-trivial-rebase: false
-               exclude-no-code-change: false
-           - draft-published-event
-         projects:
-           - project-compare-type: PLAIN
-             project-pattern: 'cord-tester'
-             branches:
-               - branch-compare-type: ANT
-                 branch-pattern: 'master'
-
-    pipeline-scm:
-      script-path: '{jenkins-path}/{type}-JenkinsFile'
-      scm:
-        - git:
-           url: '{gitURL}'
-           branches:
-             - 'master'
-
-- project:
-    name: build-pipeline
-
-    <<: *job-type-plate
-
-    project-name: '{type}-pipeline'
-
-    build-timeout: '60'
-    build-node: 'ubuntu16.04-basebuild-1c-2g'
-
-    <<: *test-pipe-init-procedure-plate
-    <<: *job-version-plate
-
-    jobs:
-      - '{type}-pipeline-{version}'
-
diff --git a/jjb/cord-test/cord-test-pipeline.yaml b/jjb/cord-test/cord-test-pipeline.yaml
new file mode 100644
index 0000000..2d88227
--- /dev/null
+++ b/jjb/cord-test/cord-test-pipeline.yaml
@@ -0,0 +1,201 @@
+---
+# CORD Test Pipeline jobs
+
+- test-pipe-job-boiler-plate: &test-pipe-job-boiler-plate
+    name: test-pipe-job-boiler-plate
+
+    project-type: pipeline
+
+    sandbox: true
+
+    properties:
+
+      - build-discarder:
+         num-to-keep: 20
+    gitURL: https://gerrit.opencord.org/cord-tester
+
+- test-pipe-init-procedure-plate: &test-pipe-init-procedure-plate
+    name: test-pipe-init-procedure-plate
+    project: cord-tester
+    stream: 'master'
+    jenkins-path: 'Jenkinsfile'
+
+
+- job-version-plate: &job-version-plate
+    name: job-version-plate
+    version:
+      - 'master'
+
+- job-type-plate: &job-type-plate
+    name: job-type-plate
+    type:
+      - 'verify-api-tests'
+
+- job-repo-plate: &job-repo-plate
+    name: job-repo-plate
+    repo:
+      - 'xos'
+      - 'cord'
+      - 'platform-install'
+      - 'rcord'
+      - 'vrouter'
+      - 'vsg'
+      - 'vtn'
+      - 'vtr'
+      - 'fabric'
+      - 'openstack'
+      - 'chameleon'
+      - 'exampleservice'
+      - 'onos-service'
+      - 'olt-service'
+      - 'cord-tester'
+      - 'vEE'
+      - 'vEG'
+      - 'mcord'
+      - 'vspgwu'
+      - 'venb'
+      - 'vspgwc'
+      - 'vEPC'
+      - 'vMME'
+      - 'vHSS'
+
+- job-template:
+
+    name: '{type}-pipeline-{version}'
+    description: |
+                  <!-- Managed by Jenkins Job Builder -->
+                  This pipeline contains the test results and logs of {type} on CORD {version}. <br /><br />
+                  Created by Kailash Khalasi - kailash@opennetworking.org<br />
+                  Copyright (c) 2017 Open Networking Foundation (ONF)
+
+    <<: *test-pipe-job-boiler-plate
+
+    parameters:
+
+      - string:
+         name: GERRIT_CHANGE_NUMBER
+         default: '2831'
+         description: 'This parameter is required to manually build this pipeline job'
+
+      - string:
+         name: GERRIT_PATCHSET_NUMBER
+         default: '1'
+         description: 'This parameter is required to manually build this pipeline job'
+
+
+      - string:
+         name: RECEIPIENT
+         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+         description: ''
+
+      - lf-infra-parameters:
+         project: 'CordTest'
+         branch: 'master'
+         stream: 'master'
+         lftools-version: '<1.0.0'
+
+    concurrent: true
+
+    triggers:
+      - gerrit:
+         server-name: 'CORD Gerrit'
+         trigger-on:
+           - patchset-created-event:
+               exclude-drafts: false
+               exclude-trivial-rebase: false
+               exclude-no-code-change: false
+           - draft-published-event
+         projects:
+           - project-compare-type: PLAIN
+             project-pattern: 'cord-tester'
+             branches:
+               - branch-compare-type: ANT
+                 branch-pattern: 'master'
+
+    pipeline-scm:
+      script-path: '{jenkins-path}/{type}-JenkinsFile'
+      scm:
+        - git:
+           url: '{gitURL}'
+           branches:
+             - 'master'
+
+- job-template:
+    name: 'automated-nightly-build-qct4-cord-master'
+    description: |
+                  <!-- Managed by Jenkins Job Builder -->
+                  It builds nighlty a full POD using R-CORD at QCT - POD 4 <br /><br />
+                  Created by Kailash Khalasi - kailash@opennetworking.org<br />
+                  Copyright (c) 2017 Open Networking Foundation (ONF)
+
+    <<: *test-pipe-job-boiler-plate
+
+    parameters:
+
+      - 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: 'deployment-configs/qct-pod4.yml'
+         description: 'The deployment config file'
+
+      - string:
+         name: RECEIPIENT
+         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+         description: ''
+
+      - lf-infra-parameters:
+         project: 'CordTest'
+         branch: 'master'
+         stream: 'master'
+         lftools-version: '<1.0.0'
+
+    concurrent: true
+
+    triggers:
+      - timed: |
+                TZ=America/Los_Angeles
+                H 21 * * *
+
+    pipeline-scm:
+      script-path: 'build/Jenkinsfile.newBuildSystem'
+      scm:
+        - git:
+           url: 'https://gerrit.opencord.org/cord'
+           branches:
+             - 'master'
+
+- project:
+    name: build-pipeline
+
+    <<: *job-type-plate
+
+    project-name: '{type}-pipeline'
+
+    build-timeout: '60'
+    build-node: 'ubuntu16.04-basebuild-1c-2g'
+
+    <<: *test-pipe-init-procedure-plate
+    <<: *job-version-plate
+
+    jobs:
+      - '{type}-pipeline-{version}'
+
+- project:
+    name: nightly-build-pipeline
+
+    project-name: 'automated-build-pipeline'
+
+    build-timeout: '300'
+    build-node: 'qct-cord-pod-04'
+
+    jobs:
+      - 'automated-nightly-build-qct4-cord-master'