diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index a8764d8..9e38942 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -556,99 +556,6 @@
                  TZ=America/Los_Angeles
                  H {time} * * *
 
-
-- job-template:
-    name: 'build_{config-pod}_seba_release_{release}_microcharts'
-    id: build_pod_manual_release_micro
-    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/cord-test-pipeline.yaml <br />
-                  Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
-                  Copyright (c) 2018 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: oltDebVersion
-         default: '{oltDebVersion}'
-         description: 'OLT Software version to install'
-
-      - string:
-         name: branch
-         default: '{branch}'
-
-      - 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"
-
-      - 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"
-
-    concurrent: true
-
-    pipeline-scm:
-      script-path: '{Jenkinsfile}'
-      scm:
-        - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
-
 - job-template:
     name: 'build_{config-pod}_seba_release_{release}_test'
     id: build_pod_release_test
diff --git a/jjb/cord-test/seba-release.yaml b/jjb/cord-test/seba-release.yaml
index 161ad3a..041162f 100644
--- a/jjb/cord-test/seba-release.yaml
+++ b/jjb/cord-test/seba-release.yaml
@@ -73,10 +73,28 @@
          branch: 'cord-6.1'
          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
 
-      # flex OCP POD with olt/onu - release 1.0 test job
+      # flex OCP POD with olt/onu - release 2.0 test job
       - 'build_pod_release_test':
          testvm: 'qa-testvm-pod'
          config-pod: 'flex-ocp-cord'
          release: '2.0'
          branch: 'master'
          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+
+      # flex OCP pod with olt/onu : using voltha latest(master)
+      - 'build_pod_release':
+         testvm: 'qa-testvm-pod'
+         config-pod: 'flex-ocp-cord'
+         release: '2.0-microcharts'
+         branch: 'master'
+         Jenkinsfile: 'Jenkinsfile-attworkflow-build'
+         oltDebVersion: 'openolt-master.deb'
+         time: '7'
+
+      # flex OCP test job - release 2.0 test job
+      - 'build_pod_release_test':
+         testvm: 'qa-testvm-pod'
+         config-pod: 'flex-ocp-cord'
+         release: '2.0-microcharts'
+         branch: 'master'
+         Jenkinsfile: 'Jenkinsfile-attworkflow-test'