diff --git a/jjb/cord-test/seba-release.yaml b/jjb/cord-test/seba-release.yaml
index 041162f..1fb2a82 100644
--- a/jjb/cord-test/seba-release.yaml
+++ b/jjb/cord-test/seba-release.yaml
@@ -27,6 +27,14 @@
          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
          oltDebVersion: 'openolt-master.deb'
 
+      # onlab pod1 test job - release 2.0 test job
+      - 'build_pod_release_test':
+         testvm: 'onf-build'
+         config-pod: 'onlab-pod1'
+         release: '2.0'
+         branch: 'master'
+         Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+
       # onlab pod2 build
       - 'build_pod_manual_release':
          testvm: 'onf-build'
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 97942e2..0b951ba 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -23,7 +23,7 @@
     label "${params.executorNode}"
   }
   options {
-      timeout(time: 120, unit: 'MINUTES')
+      timeout(time: 90, unit: 'MINUTES')
   }
 
   stages {
@@ -67,6 +67,7 @@
     }
 
     stage('Build Images') {
+      when { expression { return params.buildImages } }
       steps {
         sh """
            cd $WORKSPACE/voltha/${gerritProject}/
@@ -76,6 +77,7 @@
     }
 
     stage('Push Images') {
+      when { expression { return params.buildImages } }
       steps {
         sh '''
            export GOROOT=/usr/local/go
@@ -91,8 +93,8 @@
     }
     stage('Deploy Voltha') {
       steps {
-        sh """
-           HELM_FLAG="--set defaults.image_tag=voltha-2.1 "
+        sh '''
+           HELM_FLAG="--set defaults.image_tag=voltha-2.1,wpa_wait=10,dhcp_wait=10 "
 
            if [ "${gerritProject}" = "voltha-go" ]; then
              HELM_FLAG+="-f $WORKSPACE/voltha-system-tests/tests/data/ci-test.yaml"
@@ -110,10 +112,24 @@
              HELM_FLAG+="--set images.bbsim.tag=citest,images.bbsim.pullPolicy=Never"
            fi
 
-           cd kind-voltha/
+           if [ "${gerritProject}" = "voltha-api-server" ]; then
+             HELM_FLAG+="--set images.afrouter.tag=citest,images.afrouter.pullPolicy=Never,images.afrouterd.tag=citest,images.afrouterd.pullPolicy=Never"
+           fi
+
+           if [ "${gerritProject}" = "voltha-helm-charts" ]; then
+             export CHART_PATH=$WORKSPACE/voltha/voltha-helm-charts
+             export VOLTHA_CHART=\$CHART_PATH/voltha
+             export VOLTHA_ADAPTER_OPEN_OLT_CHART=\$CHART_PATH/voltha-adapter-openolt
+             export VOLTHA_ADAPTER_OPEN_ONU_CHART=\$CHART_PATH/voltha-adapter-openonu
+             helm dep update \$VOLTHA_CHART
+             helm dep update \$VOLTHA_ADAPTER_OPEN_OLT_CHART
+             helm dep update \$VOLTHA_ADAPTER_OPEN_ONU_CHART
+           fi
+
+           cd $WORKSPACE/kind-voltha/
            echo \$HELM_FLAG
            EXTRA_HELM_FLAGS=\$HELM_FLAG VOLTHA_LOG_LEVEL=DEBUG TYPE=minimal WITH_RADIUS=y WITH_BBSIM=y INSTALL_ONOS_APPS=y CONFIG_SADIS=y FANCY=0 ./voltha up
-           """
+           '''
       }
     }
 
@@ -183,3 +199,4 @@
     }
   }
 }
+
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index da1390a..39d879d 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -20,9 +20,11 @@
       - 'make-unit-test':
           build-node: 'ubuntu16.04-basebuild-1c-2g'
           dest-gopath: "github.com/opencord"
-          unit-test-targets: 'lint sca test docker-build'
+          unit-test-targets: 'lint test docker-build'
           unit-test-keep-going: 'true'
           junit-allow-empty-results: true
+      - 'voltha-patch-test':
+         pipeline: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-api-server-jobs'
@@ -31,9 +33,3 @@
           build-timeout: 30
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag'
-
-- job-group:
-    name: 'voltha-api-server-system-tests'
-    jobs:
-      - 'voltha-patch-test':
-         pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/verify/voltha-bbsim.yaml b/jjb/verify/voltha-bbsim.yaml
index 4ef56b4..00a2d59 100644
--- a/jjb/verify/voltha-bbsim.yaml
+++ b/jjb/verify/voltha-bbsim.yaml
@@ -23,7 +23,8 @@
           junit-allow-empty-results: true
           build-node: 'ubuntu16.04-basebuild-1c-2g'
       - 'voltha-patch-test':
-         pipeline: 'voltha-bbsim-tests.groovy'
+          buildImages: true
+          pipeline: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-bbsim-jobs'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 42a2c6d..1cfea15 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -10,8 +10,6 @@
           branch-regexp: '{all-branches-regexp}'
       - 'publish-voltha-go-jobs':
           branch-regexp: '{all-branches-regexp}'
-      - 'voltha-go-system-tests':
-          branch-regexp: '{voltha-stablization-branch}'
 
 - job-group:
     name: 'verify-voltha-go-jobs'
@@ -31,6 +29,9 @@
           name-extension: "-tests"
           unit-test-targets: 'test'
           unit-test-keep-going: 'true'
+      - 'voltha-patch-test':
+          buildImages: true
+          pipeline: 'voltha-bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-go-jobs'
@@ -39,9 +40,3 @@
           build-timeout: 30
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag'
-
-- job-group:
-    name: 'voltha-go-system-tests'
-    jobs:
-      - 'voltha-patch-test':
-         pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index 50b1399..e8c8b7c 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -17,4 +17,8 @@
           dependency-jobs: 'verify_voltha-helm-charts_licensed'
       - 'verify-helm-lint':
           dependency-jobs: 'verify_voltha-helm-charts_tag-collision'
+      - 'voltha-patch-test':
+          build-timeout: 20
+          buildImages: false
+          pipeline: 'voltha-bbsim-tests.groovy'
 
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 3f9790d..64be69c 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -45,4 +45,5 @@
     name: 'voltha-openolt-adapter-system-tests'
     jobs:
       - 'voltha-patch-test':
-         pipeline: 'voltha-bbsim-tests.groovy'
+          buildImages: true
+          pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/verify/voltha-openonu-adapter.yaml b/jjb/verify/voltha-openonu-adapter.yaml
index 8c41c58..e504dfa 100644
--- a/jjb/verify/voltha-openonu-adapter.yaml
+++ b/jjb/verify/voltha-openonu-adapter.yaml
@@ -37,4 +37,5 @@
     name: 'voltha-openonu-adapter-system-tests'
     jobs:
       - 'voltha-patch-test':
-         pipeline: 'voltha-bbsim-tests.groovy'
+          buildImages: true
+          pipeline: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 34e39c9..253ad0c 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -205,6 +205,11 @@
           default: '-e notready'
           description: 'test tags'
 
+      - bool:
+         name: buildImages
+         default: {buildImages}
+         description: 'Build modified voltha components'
+
     project-type: pipeline
     concurrent: true