diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index e6809d6..1434069 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -426,6 +426,7 @@
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
           profile: '1T8GEM'
+          in-band-management: true
           time: '10'
 
 
@@ -439,6 +440,7 @@
           branch: 'master'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
+          in-band-management: true
           power-switch: True
           pipeline-script: 'voltha-dt-physical-functional-tests-openonu-go.groovy'
 
@@ -597,31 +599,36 @@
           profile: 'Default'
           Jenkinsfile: 'Jenkinsfile-voltha-test'
 
-      # Berlin pod with olt/onu - master versions Default tech profile and timer based job
+      # Berlin pod with olt/onu - master versions timer based job , two OLTs
       - 'build_voltha_pod_release_timer':
           build-node: 'dt-berlin-community-pod'
-          config-pod: 'dt-berlin-pod'
+          config-pod: 'dt-berlin-pod-multi-olt'
           release: 'master'
           branch: 'master'
+          name-extension: '_DT'
+          work-flow: 'DT'
           num-of-openonu: '2'
           num-of-onos: '3'
           num-of-atomix: '3'
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
-          profile: 'Default'
+          profile: '1T8GEM'
           time: '13'
 
 
       # Berlin POD test job - master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           build-node: 'dt-berlin-community-pod'
-          config-pod: 'dt-berlin-pod'
+          config-pod: 'dt-berlin-pod-multi-olt'
           release: 'master'
           branch: 'master'
+          name-extension: '_DT'
+          work-flow: 'DT'
           test-repo: 'voltha-system-tests'
-          profile: 'Default'
+          profile: '1T8GEM'
           power-switch: True
+          pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
 
      # Berlin pod with olt/onu - voltha-2.5 Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
@@ -767,7 +774,7 @@
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
           power-switch: True
-          pipeline-script: 'voltha-dt-physical-functional-tests-openonu-go.groovy'
+          pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
 
      # Berlin pod with gpon olt/onu - voltha-2.4 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index c4e7a59..b83b3b3 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -177,14 +177,16 @@
       // includes monitoring, kafka, etcd
       steps {
         sh '''
-        helm install kafka incubator/kafka --set replicas=${kafkaReplicas} --set persistence.enabled=false \
+        helm repo add bitnami https://charts.bitnami.com/bitnami
+        helm install kafka bitnami/kafka --set replicaCount=${kafkaReplicas} --set persistence.enabled=false \
           --set zookeeper.replicaCount=${kafkaReplicas} --set zookeeper.persistence.enabled=false \
           --set prometheus.kafka.enabled=true,prometheus.operator.enabled=true,prometheus.jmx.enabled=true,prometheus.operator.serviceMonitor.namespace=default
 
         # the ETCD chart use "auth" for resons different than BBsim, so strip that away
         ETCD_FLAGS=$(echo ${extraHelmFlags} | sed -e 's/--set auth=false / /g') | sed -e 's/--set auth=true / /g'
+        ETCD_FLAGS+=" --set auth.rbac.enabled=false,persistence.enabled=false,statefulset.replicaCount=${etcdReplicas}"
         ETCD_FLAGS+=" --set memoryMode=${inMemoryEtcdStorage} "
-        helm install -f $WORKSPACE/kind-voltha/values.yaml --set replicas=${etcdReplicas} etcd incubator/etcd $ETCD_FLAGS
+        helm install -f $WORKSPACE/kind-voltha/values.yaml --set replicas=${etcdReplicas} etcd bitnami/etcd $ETCD_FLAGS
 
         if [ ${withMonitoring} = true ] ; then
           helm install nem-monitoring cord/nem-monitoring \
@@ -354,7 +356,7 @@
           if [ ${withMibTemplate} = true ] ; then
             rm -f BBSM-12345123451234512345-00000000000001-v1.json
             wget https://raw.githubusercontent.com/opencord/voltha-openonu-adapter/master/templates/BBSM-12345123451234512345-00000000000001-v1.json
-            cat BBSM-12345123451234512345-00000000000001-v1.json | kubectl exec -it \$(kubectl get pods -l app=etcd | awk 'NR==2{print \$1}') -- etcdctl put service/voltha/omci_mibs/templates/BBSM/12345123451234512345/00000000000001
+            cat BBSM-12345123451234512345-00000000000001-v1.json | kubectl exec -it \$(kubectl get pods |grep etcd | awk 'NR==1{print \$1}') -- etcdctl put service/voltha/omci_mibs/templates/BBSM/12345123451234512345/00000000000001
           fi
 
           if [ ${withPcap} = true ] ; then
diff --git a/jjb/verify/voltha-eponolt-adapter.yaml b/jjb/verify/voltha-eponolt-adapter.yaml
new file mode 100644
index 0000000..8574be8
--- /dev/null
+++ b/jjb/verify/voltha-eponolt-adapter.yaml
@@ -0,0 +1,32 @@
+---
+# verification jobs for 'voltha-eponolt-adapter' repo
+
+- project:
+    name: voltha-eponolt-adapter
+    project: '{name}'
+
+    jobs:
+      - 'verify-voltha-eponolt-adapter-jobs':
+          branch-regexp: '{all-branches-regexp}'
+      - 'publish-voltha-eponolt-adapter-jobs':
+          branch-regexp: '{all-branches-regexp}'
+
+- job-group:
+    name: 'verify-voltha-eponolt-adapter-jobs'
+    jobs:
+      - 'verify-licensed'
+      - 'tag-collision-reject':
+          dependency-jobs: 'verify_voltha-eponolt-adapter_licensed'
+      - 'make-unit-test':
+          dest-gopath: "github.com/opencord"
+          unit-test-targets: 'lint sca test'
+          unit-test-keep-going: 'true'
+
+- job-group:
+    name: 'publish-voltha-eponolt-adapter-jobs'
+    jobs:
+      - 'docker-publish':
+          build-timeout: 30
+          docker-repo: 'voltha'
+          dependency-jobs: 'version-tag'
+          extraEnvironmentVars: BUILD_PROFILED=true
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 00bfd35..c55dabd 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -16,7 +16,20 @@
     jobs:
       - 'verify-licensed'
       - 'tag-collision-reject'
-      - 'make-unit-test'
+      - 'make-unit-test':
+          dest-gopath: "github.com/opencord"
+          name-extension: "-lint"
+          unit-test-targets: 'lint sca'
+          unit-test-keep-going: 'true'
+          junit-allow-empty-results: true
+          build-node: 'ubuntu16.04-basebuild-2c-4g'
+      - 'make-unit-test':
+          dest-gopath: "github.com/opencord"
+          name-extension: "-tests"
+          unit-test-targets: 'test'
+          unit-test-keep-going: 'true'
+          junit-allow-empty-results: true
+          build-node: 'ubuntu16.04-basebuild-2c-4g'
       - 'voltha-patch-test':
           pipeline-script: 'voltha-openonu-go-tests.groovy'
 
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index f271b34..85386ee 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -43,10 +43,6 @@
           withIgmp: false
           openonuAdapterReplicas: 1
           openonuAdapterImg: voltha/voltha-openonu-adapter-go:master
-          onosImg: andreacampanella/voltha-onos:olt-meter-removal-master
-          ofAgentImg: andreacampanella/voltha-ofagent-go:meter-log
-          rwCoreImg: andreacampanella/voltha-rw-core:meter-log
-          withPcap: true
           extraHelmFlags: '--set use_openonu_adapter_go=true,authRetry=true,dhcpRetry=true'
 
       # this job will be used to test custom images without disrupting tests on master