diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
index 2cd21aa..a90abe1 100644
--- a/jjb/cord-test/att-workflow.yaml
+++ b/jjb/cord-test/att-workflow.yaml
@@ -15,7 +15,7 @@
          profile: 'att-workflow'
          branch: 'master'
          scenario: ''
-         Jenkinsfile: 'Jenkinsfile-att-workflow'
+         Jenkinsfile: 'Jenkinsfile-attworkflow-build'
          oltDebVersion: 'openolt-master.deb'
 
     # flex pod1 with olt/onu
@@ -25,5 +25,5 @@
          profile: 'att-workflow'
          branch: 'master'
          scenario: ''
-         Jenkinsfile: 'Jenkinsfile-attworkflow'
+         Jenkinsfile: 'Jenkinsfile-attworkflow-build'
          oltDebVersion: 'openolt-master.deb'
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 5918318..279ae96 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -15,7 +15,7 @@
 
 
 - job-template:
-    name: 'build_{profile}_{testvm}_{scenario}_{branch}'
+    name: 'build_{profile}_{config-pod}_{scenario}_{branch}'
     id: build_pod_manual
     description: |
                   <!-- Managed by Jenkins Job Builder -->
@@ -53,6 +53,11 @@
          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'
@@ -66,6 +71,11 @@
          name: branch
          default: '{branch}'
 
+      - bool:
+          name: configurePod
+          default: true
+          description: "Configure POD via TOSCA post build"
+
       - string:
          name: notificationEmail
          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
@@ -120,6 +130,11 @@
          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'
@@ -138,6 +153,11 @@
          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
          description: ''
 
+      - bool:
+          name: configurePod
+          default: true
+          description: "Configure POD via TOSCA post build"
+
     concurrent: true
 
     pipeline-scm:
diff --git a/jjb/cord-test/rcord-lite.yaml b/jjb/cord-test/rcord-lite.yaml
index ac13c7b..92d0dee 100644
--- a/jjb/cord-test/rcord-lite.yaml
+++ b/jjb/cord-test/rcord-lite.yaml
@@ -13,10 +13,10 @@
       - 'build_pod_timer':
          testvm: 'qa-testvm-pod'
          config-pod: 'flex-onf-pod1'
-         profile: 'rcord-lite'
-         scenario: ''
+         profile: 'rcord'
+         scenario: 'topdown'
          branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-rcordlite'
+         Jenkinsfile: 'Jenkinsfile-rcordlite-topdown-build'
          oltDebVersion: 'openolt-1.4.deb'
          time: '20'
          day: '0-31/1'
@@ -25,10 +25,10 @@
       - 'build_pod_timer':
          testvm: 'qa-testvm-pod'
          config-pod: 'flex-pod1-olt'
-         profile: 'rcord-lite'
+         profile: 'rcord'
          branch: 'cord-6.0'
          scenario: 'zerotouch'
-         Jenkinsfile: 'Jenkinsfile-rcordlite-zerotouch'
+         Jenkinsfile: 'Jenkinsfile-rcordlite-zerotouch-build'
          oltDebVersion: 'openolt-1.4.deb'
          time: '0'
          day: '1-31/2'
@@ -37,10 +37,10 @@
       - 'build_pod_timer':
          testvm: 'qa-testvm-pod'
          config-pod: 'flex-pod1-olt'
-         profile: 'rcord-lite'
+         profile: 'rcord'
          branch: 'cord-6.0'
          scenario: 'topdown'
-         Jenkinsfile: 'Jenkinsfile-rcordlite-topdown'
+         Jenkinsfile: 'Jenkinsfile-rcordlite-topdown-build'
          oltDebVersion: 'openolt-1.4.deb'
          time: '0'
          day: '2-30/2'
@@ -49,11 +49,11 @@
       - 'build_pod_timer':
          testvm: 'qa-testvm-pod'
          config-pod: 'flex-pod1-olt'
-         profile: 'rcord-lite'
+         profile: 'rcord'
          branch: 'master'
          scenario: 'zerotouch'
-         Jenkinsfile: 'Jenkinsfile-rcordlite-zerotouch'
-         oltDebVersion: 'openolt-master.deb'
+         Jenkinsfile: 'Jenkinsfile-rcordlite-zerotouch-build'
+         oltDebVersion: 'openolt-master'
          time: '1'
          day: '1-31/2'
 
@@ -61,22 +61,22 @@
       - 'build_pod_timer':
          testvm: 'qa-testvm-pod'
          config-pod: 'flex-pod1-olt'
-         profile: 'rcord-lite'
+         profile: 'rcord'
          branch: 'master'
          scenario: 'topdown'
-         Jenkinsfile: 'Jenkinsfile-rcordlite-topdown'
-         oltDebVersion: 'openolt-master.deb'
+         Jenkinsfile: 'Jenkinsfile-rcordlite-topdown-build'
+         oltDebVersion: 'openolt-master'
          time: '1'
          day: '2-30/2'
 
-     # qct pod1 kubernetes build jobs (rcord lite)
+     # qct pod1 kubernetes build jobs (rcord lite topdown)
       - 'build_pod_timer':
          testvm: 'qct-pod1'
          config-pod: 'qct-pod1'
-         profile: 'rcord-lite'
+         profile: 'rcord'
          branch: 'master'
-         scenario: ''
-         Jenkinsfile: 'Jenkinsfile-rcordlite'
+         scenario: 'topdown'
+         Jenkinsfile: 'Jenkinsfile-rcordlite-topdown-build'
          oltDebVersion: 'openolt-1.4.deb'
          time: '0'
          day: '*'
@@ -85,10 +85,10 @@
       - 'build_pod_timer':
          testvm: 'flex-pod2'
          config-pod: 'flex-ocp-pod2'
-         profile: 'rcord-lite'
-         scenario: ''
+         profile: 'rcord'
+         scenario: 'topdown'
          branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-rcordlite'
+         Jenkinsfile: 'Jenkinsfile-rcordlite-topdown-build'
          oltDebVersion: 'openolt-1.4.deb'
          time: '30'
          day: '0-31/1'