diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
index 45c6c10..b1156c4 100644
--- a/jjb/cord-test/att-workflow.yaml
+++ b/jjb/cord-test/att-workflow.yaml
@@ -17,7 +17,6 @@
          branch: 'master'
          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
          oltDebVersion: 'openolt-master.deb'
-         configurePod: true
 
       # onlab pod1 build
       - 'build_pod_timer':
@@ -27,10 +26,10 @@
          branch: 'master'
          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
          oltDebVersion: 'openolt-master.deb'
-         configurePod: true
          time: '3'
+         disabled: true
 
-     # onlab pod1 test job
+    # onlab pod1 test job
       - 'build_pod_test':
          testvm: 'onf-build'
          config-pod: 'onlab-pod1-qa'
@@ -46,7 +45,6 @@
          branch: 'master'
          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
          oltDebVersion: 'openolt-master.deb'
-         configurePod: true
 
     # flex pod1 with olt/onu
       - 'build_pod_timer':
@@ -56,7 +54,6 @@
          branch: 'master'
          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
          oltDebVersion: 'openolt-master.deb'
-         configurePod: true
          time: '4'
 
     # flex pod1 with olt/onu - voltha 1.6 branch
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index b7ae876..68629c3 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -76,15 +76,20 @@
          default: '{profile}'
          description: 'Profile in which this job installs'
 
+      - string:
+         name: notificationEmail
+         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+         description: ''
+
       - 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'
-         description: ''
+      - bool:
+            name: reinstallOlt
+            default: true
+            description: "Re-install olt software bringing up CORD"
 
       - bool:
           name: installBBSim
@@ -173,6 +178,21 @@
           default: true
           description: "Configure POD via TOSCA post build"
 
+      - bool:
+            name: reinstallOlt
+            default: true
+            description: "Re-install olt software bringing up CORD"
+
+      - bool:
+          name: installBBSim
+          default: false
+          description: "Install the BBSim container"
+
+      - string:
+          name: onuNumber
+          default: '16'
+          description: "Onus per PonPort"
+
       - string:
          name: notificationEmail
          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'