diff --git a/jjb/cord-test/cord-test-pipeline.yaml b/jjb/cord-test/cord-test-pipeline.yaml
deleted file mode 100644
index 73ba6fd..0000000
--- a/jjb/cord-test/cord-test-pipeline.yaml
+++ /dev/null
@@ -1,225 +0,0 @@
----
-# POD Nightly Build Pipeline Jobs
-
-- test-pipe-job-boiler-plate: &test-pipe-job-boiler-plate
-    name: test-pipe-job-boiler-plate
-
-    project-type: pipeline
-
-    sandbox: true
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-
-
-- job-parameters-plate: &job-parameters-plate
-    name: job-parameters-plate
-    <<: *test-pipe-job-boiler-plate
-
-    parameters:
-      - string:
-          name: devNodeName
-          default: '{pod}'
-          description: 'Jenkins node name of Dev Node'
-
-      - 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/{pod}.yml'
-          description: 'The deployment config file'
-
-      - string:
-          name: branch
-          default: '{branch}'
-
-      - string:
-          name: notificationEmail
-          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-          description: ''
-
-    concurrent: true
-
-- job-template:
-    name: 'build_{pod}_{branch}'
-    id: build_pod_first
-    description: |
-                  <!-- Managed by Jenkins Job Builder -->
-                  Nightly Physical POD Builds at {pod} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
-                  Created by Kailash Khalasi - kailash@opennetworking.org <br />
-                  Copyright (c) 2017 Open Networking Foundation (ONF)
-
-    <<: *job-parameters-plate
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/cord'
-            branches:
-              - '{branch}'
-
-    triggers:
-      - timed: |
-                TZ=America/Los_Angeles
-                H {time} * * *
-
-- job-template:
-    name: 'build_{pod}_{branch}'
-    id: build_pod
-    description: |
-                  <!-- Managed by Jenkins Job Builder -->
-                  Nightly Physical POD Builds at {pod} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
-                  Created by Kailash Khalasi - kailash@opennetworking.org <br />
-                  Copyright (c) 2017 Open Networking Foundation (ONF)
-
-    <<: *job-parameters-plate
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/cord'
-            branches:
-              - '{branch}'
-
-    triggers:
-      - reverse:
-          jobs: 'build-{pod}-{fromBranch}-test'
-          result: 'failure'
-
-- job-template:
-    name: 'build_{pod}_{branch}_test'
-    id: build_pod_test
-    description: |
-                  <!-- Managed by Jenkins Job Builder -->
-                  Post Tests on {pod} triggered by build_{pod}_{branch} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
-                  Created by Kailash Khalasi - kailash@opennetworking.org <br />
-                  Copyright (c) 2017 Open Networking Foundation (ONF)
-
-    branches: '{branch}'
-
-    <<: *job-parameters-plate
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-            url: '{gerrit-server-url}/cord-tester'
-            branches:
-              - '{branch}'
-
-    triggers:
-      - reverse:
-          jobs: 'build-{pod}-{branch}'
-          result: 'failure'
-
-- project:
-    name: nightly-build-pipeline
-
-    project-name: '{name}'
-
-    build-timeout: '300'
-
-    jobs:
-      - 'build_pod_first':
-          pod: 'qct-pod1'
-          branch: 'cord-4.0'
-          Jenkinsfile: 'Jenkinsfile.newBuildSystem'
-          time: '20'
-
-      - 'build_pod':
-          pod: 'qct-pod1'
-          branch: 'cord-4.1'
-          Jenkinsfile: 'Jenkinsfile.newBuildSystem'
-          fromBranch: 'cord-4.0'
-
-      - 'build_pod':
-          pod: 'qct-pod1'
-          branch: 'cord-5.0'
-          Jenkinsfile: 'Jenkinsfile.newBuildSystem'
-          fromBranch: 'cord-4.1'
-
-      - 'build_pod':
-          pod: 'qct-pod1'
-          branch: 'master'
-          Jenkinsfile: 'Jenkinsfile'
-          fromBranch: 'cord-5.0'
-
-      - 'build_pod_first':
-          pod: 'qct-pod3'
-          branch: 'cord-4.0'
-          Jenkinsfile: 'Jenkinsfile.newBuildSystem'
-          time: '20'
-
-      - 'build_pod':
-          pod: 'qct-pod3'
-          branch: 'cord-4.1'
-          Jenkinsfile: 'Jenkinsfile.newBuildSystem'
-          fromBranch: 'cord-4.0'
-
-      - 'build_pod':
-          pod: 'qct-pod3'
-          branch: 'cord-5.0'
-          Jenkinsfile: 'Jenkinsfile.newBuildSystem'
-          fromBranch: 'cord-4.1'
-
-      - 'build_pod':
-          pod: 'qct-pod3'
-          branch: 'master'
-          Jenkinsfile: 'Jenkinsfile'
-          fromBranch: 'cord-5.0'
-
-      - 'build_pod_test':
-          pod: 'qct-pod1'
-          branch: 'cord-4.0'
-          Jenkinsfile: 'Jenkinsfile-rcord'
-
-      - 'build_pod_test':
-          pod: 'qct-pod1'
-          branch: 'cord-4.1'
-          Jenkinsfile: 'Jenkinsfile-rcord'
-
-      - 'build_pod_test':
-          pod: 'qct-pod1'
-          branch: 'cord-5.0'
-          Jenkinsfile: 'Jenkinsfile-rcord'
-
-      - 'build_pod_test':
-          pod: 'qct-pod1'
-          branch: 'master'
-          Jenkinsfile: 'Jenkinsfile-rcord'
-
-      - 'build_pod_test':
-          pod: 'qct-pod3'
-          branch: 'cord-4.0'
-          Jenkinsfile: 'Jenkinsfile-rcord'
-
-      - 'build_pod_test':
-          pod: 'qct-pod3'
-          branch: 'cord-4.1'
-          Jenkinsfile: 'Jenkinsfile-rcord'
-
-      - 'build_pod_test':
-          pod: 'qct-pod3'
-          branch: 'cord-5.0'
-          Jenkinsfile: 'Jenkinsfile-rcord'
-
-      - 'build_pod_test':
-          pod: 'qct-pod3'
-          branch: 'master'
-          Jenkinsfile: 'Jenkinsfile-rcord'
-
diff --git a/jjb/cord-test/ecord-build.yaml b/jjb/cord-test/ecord-build.yaml
new file mode 100644
index 0000000..d73677e
--- /dev/null
+++ b/jjb/cord-test/ecord-build.yaml
@@ -0,0 +1,105 @@
+---
+# POD Nightly Build Pipeline E-CORD Jobs
+
+- project:
+    name: ecord-nightly-build-pipeline
+
+    project-name: '{name}'
+
+    build-timeout: '300'
+
+    jobs:
+      # qct pod 3 build jobs (ecord-global)
+      - 'build_pod_first':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-global.yml'
+         profile: 'ecord-global'
+         branch: 'cord-4.1'
+         Jenkinsfile: 'Jenkinsfile.newBuildSystem'
+         time: '20'
+
+      - 'build_pod':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-global.yml'
+         profile: 'ecord-global'
+         branch: 'cord-5.0'
+         Jenkinsfile: 'Jenkinsfile.newBuildSystem'
+         fromBranch: 'cord-4.1'
+
+      - 'build_pod':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-global.yml'
+         profile: 'ecord-global'
+         branch: 'master'
+         Jenkinsfile: 'Jenkinsfile'
+         fromBranch: 'cord-5.0'
+
+      # qct pod 3 test jobs (ecord-global)
+      - 'build_pod_test':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-global.yml'
+         profile: 'ecord-global'
+         branch: 'cord-4.1'
+         Jenkinsfile: 'Jenkinsfile-ecord-global'
+
+      - 'build_pod_test':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-global.yml'
+         profile: 'ecord-global'
+         branch: 'cord-5.0'
+         Jenkinsfile: 'Jenkinsfile-ecord-global'
+
+
+      - 'build_pod_test':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-global.yml'
+         profile: 'ecord-global'
+         branch: 'master'
+         Jenkinsfile: 'Jenkinsfile-ecord-global'
+
+      # qct pod 3 build jobs (ecord-local)
+      - 'build_pod_first':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-local.yml'
+         profile: 'ecord-local'
+         branch: 'cord-4.1'
+         Jenkinsfile: 'Jenkinsfile.newBuildSystem'
+         time: '3'
+
+      - 'build_pod':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-local.yml'
+         profile: 'ecord-local'
+         branch: 'cord-5.0'
+         Jenkinsfile: 'Jenkinsfile.newBuildSystem'
+         fromBranch: 'cord-4.1'
+
+      - 'build_pod':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-local.yml'
+         profile: 'ecord-local'
+         branch: 'master'
+         Jenkinsfile: 'Jenkinsfile'
+         fromBranch: 'cord-5.0'
+
+      # qct pod 3 test jobs (ecord-local)
+      - 'build_pod_test':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-local.yml'
+         profile: 'ecord-local'
+         branch: 'cord-4.1'
+         Jenkinsfile: 'Jenkinsfile-ecord-local'
+
+      - 'build_pod_test':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-local.yml'
+         profile: 'ecord-local'
+         branch: 'cord-5.0'
+         Jenkinsfile: 'Jenkinsfile-ecord-local'
+
+      - 'build_pod_test':
+         pod: 'qct-pod3'
+         pod_config: 'qct-pod3-ecord-local.yml'
+         profile: 'ecord-local'
+         branch: 'master'
+         Jenkinsfile: 'Jenkinsfile-ecord-local'
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
new file mode 100644
index 0000000..d38334f
--- /dev/null
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -0,0 +1,189 @@
+---
+# POD Nightly Build Pipeline Jobs
+
+- test-pipe-job-boiler-plate: &test-pipe-job-boiler-plate
+    name: test-pipe-job-boiler-plate
+
+    project-type: pipeline
+
+    sandbox: true
+
+    properties:
+      - cord-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+          artifact-num-to-keep: '{artifact-num-to-keep}'
+
+- job-template:
+    name: 'build_{profile}_{pod}_{branch}'
+    id: build_pod_first
+    description: |
+                  <!-- Managed by Jenkins Job Builder -->
+                  Nightly Physical POD Builds at {pod} using {pod_config} <br /><br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
+                  Created by Kailash Khalasi - kailash@opennetworking.org <br />
+                  Copyright (c) 2017 Open Networking Foundation (ONF)
+
+    <<: *test-pipe-job-boiler-plate
+
+    parameters:
+      - string:
+         name: devNodeName
+         default: '{pod}'
+         description: 'Jenkins node name of Dev Node'
+
+      - 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/{pod_config}'
+         description: 'The deployment config file'
+
+      - string:
+         name: branch
+         default: '{branch}'
+
+      - string:
+         name: notificationEmail
+         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+         description: ''
+
+    concurrent: true
+
+    pipeline-scm:
+      script-path: '{Jenkinsfile}'
+      scm:
+        - git:
+           url: '{gerrit-server-url}/cord'
+           branches:
+             - '{branch}'
+
+    triggers:
+       - timed: |
+                 TZ=America/Los_Angeles
+                 H {time} * * *
+
+
+- job-template:
+    name: 'build_{profile}_{pod}_{branch}'
+    id: build_pod
+    description: |
+                  <!-- Managed by Jenkins Job Builder -->
+                  Nightly Physical POD Builds at {pod} using {pod_config} <br /><br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
+                  Created by Kailash Khalasi - kailash@opennetworking.org <br />
+                  Copyright (c) 2017 Open Networking Foundation (ONF)
+
+    <<: *test-pipe-job-boiler-plate
+
+    parameters:
+      - string:
+         name: devNodeName
+         default: '{pod}'
+         description: 'Jenkins node name of Dev Node'
+
+      - 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/{pod_config}'
+         description: 'The deployment config file'
+
+      - string:
+         name: branch
+         default: '{branch}'
+
+      - string:
+         name: notificationEmail
+         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+         description: ''
+
+    concurrent: true
+
+    pipeline-scm:
+      script-path: '{Jenkinsfile}'
+      scm:
+        - git:
+           url: '{gerrit-server-url}/cord'
+           branches:
+             - '{branch}'
+
+    triggers:
+        - reverse:
+            jobs: 'build_{profile}_{pod}_{fromBranch}_test'
+            result: 'failure'
+
+
+- job-template:
+    name: 'build_{profile}_{pod}_{branch}_test'
+    id: build_pod_test
+    description: |
+                  <!-- Managed by Jenkins Job Builder -->
+                  Post Tests on {pod} triggered by build_{pod}_{branch} <br /><br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
+                  Created by Kailash Khalasi - kailash@opennetworking.org <br />
+                  Copyright (c) 2017 Open Networking Foundation (ONF)
+
+    branches: '{branch}'
+
+    <<: *test-pipe-job-boiler-plate
+
+    parameters:
+      - string:
+         name: devNodeName
+         default: '{pod}'
+         description: 'Jenkins node name of Dev Node'
+
+      - 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/{pod_config}'
+         description: 'The deployment config file'
+
+      - string:
+         name: branch
+         default: '{branch}'
+
+      - string:
+         name: notificationEmail
+         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+         description: ''
+
+    concurrent: true
+
+    pipeline-scm:
+      script-path: '{Jenkinsfile}'
+      scm:
+        - git:
+           url: '{gerrit-server-url}/cord-tester'
+           branches:
+             - '{branch}'
+
+    triggers:
+      - reverse:
+          jobs: 'build_{profile}_{pod}_{branch}'
+          result: 'failure'
diff --git a/jjb/cord-test/rcord-build.yaml b/jjb/cord-test/rcord-build.yaml
new file mode 100644
index 0000000..20795d2
--- /dev/null
+++ b/jjb/cord-test/rcord-build.yaml
@@ -0,0 +1,72 @@
+---
+# POD Nightly Build Pipeline R-CORD Jobs
+
+- project:
+    name: rcord-nightly-build-pipeline
+
+    project-name: '{name}'
+
+    build-timeout: '300'
+
+    jobs:
+      # qct pod 1 build jobs (rcord)
+      - 'build_pod_first':
+         pod: 'qct-pod1'
+         pod_config: 'qct-pod1.yml'
+         profile: 'rcord'
+         branch: 'cord-4.0'
+         Jenkinsfile: 'Jenkinsfile.newBuildSystem'
+         time: '20'
+
+      - 'build_pod':
+         pod: 'qct-pod1'
+         pod_config: 'qct-pod1.yml'
+         profile: 'rcord'
+         branch: 'cord-4.1'
+         Jenkinsfile: 'Jenkinsfile.newBuildSystem'
+         fromBranch: 'cord-4.0'
+
+      - 'build_pod':
+         pod: 'qct-pod1'
+         pod_config: 'qct-pod1.yml'
+         profile: 'rcord'
+         branch: 'cord-5.0'
+         Jenkinsfile: 'Jenkinsfile.newBuildSystem'
+         fromBranch: 'cord-4.1'
+
+      - 'build_pod':
+         pod: 'qct-pod1'
+         pod_config: 'qct-pod1.yml'
+         profile: 'rcord'
+         branch: 'master'
+         Jenkinsfile: 'Jenkinsfile'
+         fromBranch: 'cord-5.0'
+
+      # qct pod 1 test jobs
+      - 'build_pod_test':
+         pod: 'qct-pod1'
+         pod_config: 'qct-pod1.yml'
+         profile: 'rcord'
+         branch: 'cord-4.0'
+         Jenkinsfile: 'Jenkinsfile-rcord'
+
+      - 'build_pod_test':
+         pod: 'qct-pod1'
+         pod_config: 'qct-pod1.yml'
+         profile: 'rcord'
+         branch: 'cord-4.1'
+         Jenkinsfile: 'Jenkinsfile-rcord'
+
+      - 'build_pod_test':
+         pod: 'qct-pod1'
+         pod_config: 'qct-pod1.yml'
+         profile: 'rcord'
+         branch: 'cord-5.0'
+         Jenkinsfile: 'Jenkinsfile-rcord'
+
+      - 'build_pod_test':
+         pod: 'qct-pod1'
+         pod_config: 'qct-pod1.yml'
+         profile: 'rcord'
+         branch: 'master'
+         Jenkinsfile: 'Jenkinsfile-rcord'