diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 9e286d0..2cd24ad 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -960,6 +960,6 @@
 
     triggers:
       - reverse:
-          jobs: 'build_{config-pod}_voltha_{release}'
+          jobs: 'build_{config-pod}_{profile}_voltha_{release}'
           result: 'success'
 
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 08e5ae2..36454d2 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -11,17 +11,6 @@
     jobs:
       # flex OCP pod with olt/onu - release voltha master build job
       - 'build_pod_manual':
-          testvm: 'onf-build'
-          config-pod: 'onlab-pd1'
-          release: 'master'
-          branch: 'master'
-          test-repo: 'voltha-system-tests'
-          Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
-          oltDebVersion: 'openolt-seba-2.0.deb'
-          profile: '1T4GEM'
-
-      # onlab pod1 OCP pod with olt/onu - release voltha master build job
-      - 'build_pod_manual':
           testvm: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
           release: 'master'
@@ -29,7 +18,18 @@
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           oltDebVersion: 'openolt-seba-2.0.deb'
-          profile: 'multipleGem'
+          profile: '1T4GEM'
+
+      # onlab pod1 OCP pod with olt/onu - testing BAL3.1 release voltha master build job
+      - 'build_pod_manual':
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1'
+          release: 'master'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
+          oltDebVersion: 'openolt_asfvolt16.deb'
+          profile: '1T4GEM-bal31'
 
       # flex pod1 test job - using voltha branch
       - 'build_pod_test':
@@ -40,7 +40,7 @@
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-test'
 
-      # flex OCP pod with olt/onu - timer based job
+      # flex OCP pod with olt/onu - Default tech profile and timer based job
       - 'build_voltha_pod_release':
           testvm: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
@@ -52,15 +52,37 @@
           configurePod: true
           profile: 'Default'
 
-      # flex pod1 test job - using voltha branch
+      # flex pod1 test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           testvm: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
           release: 'master'
           branch: 'master'
           test-repo: 'voltha-system-tests'
-          Jenkinsfile: 'Jenkinsfile-voltha-test'
           profile: 'Default'
+          Jenkinsfile: 'Jenkinsfile-voltha-test'
+
+      # flex OCP pod with olt/onu - uses 1TCONT/4GEMs tech profile on voltha - timer based job
+      - 'build_voltha_pod_release':
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: 'master'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-build'
+          oltDebVersion: 'openolt-seba-2.0.deb'
+          configurePod: true
+          profile: '1T4GEM'
+
+      # flex pod1 test job - test job uses 1TCONT/4GEMs tech profile - using voltha branch
+      - 'build_voltha_pod_test':
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: 'master'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          profile: '1T4GEM'
+          Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # Menlo DEMO-POD
       - 'build_pod_manual':
@@ -72,4 +94,4 @@
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           oltDebVersion: 'openolt-seba-2.0.deb'
           configurePod: true
-          profile: 'multipleGem'
+          profile: '1T4GEM'
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 1922dbd..25b2281 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -29,7 +29,7 @@
     archive-artifacts: ''
 
     # build timeout (minutes)
-    build-timeout: 10
+    build-timeout: 20
 
     # timed trigger defaults, crontab syntax
     # H = random value hashed by name of job
@@ -85,7 +85,7 @@
 
     # matching repos that should be version tagged by the version-tag job
     # (basically the same as imagebuilder projects + helm charts + tools
-    version-tag-projects-regexp: '^(xos.*|.*helm-charts|automation-tools|cord-tester|chameleon|rcord|mcord|ecord|acordion|addressmanager|epc-service|exampleservice|fabric|fabric-crossconnect|globalxos|hippie-oss|hss_db|hypercache|internetemulator|kubernetes-service|monitoring|olt-service|onos-service|openstack|progran|sdn-controller|simpleexampleservice|templateservice|vEE|vEG|vBBU|venb|vHSS|vMME|vnaas|vPGWC|vPGWU|vrouter|vsg|vsg-hw|vSGW|vSM|vspgwc|vspgwu|vtn-service|vtr|att-workflow-driver|tt-workflow-driver|ves-agent|voltha-bbsim|openolt|sadis-server|kafka-topic-exporter|pyvoltha||plyxproto|voltha-protos|alpine-grpc-base|cordctl|voltha-go|voltha-onos|device-management|cord-workflow.*|voltha-system-tests|openairinterface|omec-.*|bbsim|omci-sim|ponsim|pppoel2relay|voltha-api-server|aaa|config|dhcpl2relay|igmp|igmpproxy|kafka-onos|mcast|olt|sadis|vtn|voltha-.*-adapter|voltha-lib-go)$'
+    version-tag-projects-regexp: '^(xos.*|.*helm-charts|automation-tools|cord-tester|chameleon|rcord|mcord|ecord|acordion|addressmanager|epc-service|exampleservice|fabric|fabric-crossconnect|globalxos|hippie-oss|hss_db|hypercache|internetemulator|kubernetes-service|monitoring|olt-service|onos-service|openstack|progran|sdn-controller|simpleexampleservice|templateservice|vEE|vEG|vBBU|venb|vHSS|vMME|vnaas|vPGWC|vPGWU|vrouter|vsg|vsg-hw|vSGW|vSM|vspgwc|vspgwu|vtn-service|vtr|att-workflow-driver|tt-workflow-driver|ves-agent|voltha-bbsim|openolt|sadis-server|kafka-topic-exporter|pyvoltha||plyxproto|voltha-protos|alpine-grpc-base|cordctl|voltha-go|voltha-onos|device-management|cord-workflow.*|voltha-system-tests|openairinterface|omec-.*|bbsim|omci-sim|ponsim|pppoel2relay|voltha-api-server|aaa|config|dhcpl2relay|igmp|igmpproxy|kafka-onos|mcast|olt|sadis|vtn|voltha-.*-adapter|voltha-lib-go|voltha-python-base)$'
 
     # PyPI related publishing variables
     #
diff --git a/jjb/verify/mcast.yaml b/jjb/verify/mcast.yaml
index be99a4d..329e415 100644
--- a/jjb/verify/mcast.yaml
+++ b/jjb/verify/mcast.yaml
@@ -16,6 +16,7 @@
           branch-regexp: '^(mcast-1.4)$'
           jdk-distribution: 'java-1.8.0-amazon-corretto'
           name-extension: '-jdk8'
+          junit-allow-empty-results: true
 
 - job-group:
     name: 'mcast-jobs-common'
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index c00b9f0..736fa69 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -20,7 +20,7 @@
       - 'make-unit-test':
           build-node: 'ubuntu16.04-basebuild-2c-4g'
           dest-gopath: "github.com/opencord"
-          unit-test-targets: 'lint sca test docker-build'
+          unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'true'
           junit-allow-empty-results: true
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-python-base.yaml b/jjb/verify/voltha-python-base.yaml
new file mode 100644
index 0000000..ce03fb3
--- /dev/null
+++ b/jjb/verify/voltha-python-base.yaml
@@ -0,0 +1,30 @@
+---
+# verification jobs for 'voltha-python-base' repo
+
+- project:
+    name: voltha-python-base
+    project: '{name}'
+
+    jobs:
+      - 'verify-voltha-python-base-jobs':
+          branch-regexp: '{all-branches-regexp}'
+      - 'publish-voltha-python-base-jobs'
+
+- job-group:
+    name: 'verify-voltha-python-base-jobs'
+    jobs:
+      - 'verify-licensed'
+      - 'tag-collision-reject':
+          dependency-jobs: 'verify_voltha-python-base_licensed'
+      - 'make-unit-test':
+          build-timeout: 30
+          unit-test-targets: 'docker-build'
+          junit-allow-empty-results: true
+
+- job-group:
+    name: 'publish-voltha-python-base-jobs'
+    jobs:
+      - 'docker-publish':
+          build-timeout: 30
+          docker-repo: 'voltha'
+          dependency-jobs: 'version-tag'