diff --git a/jjb/maven.yaml b/jjb/maven.yaml
index ac461dc..162209f 100644
--- a/jjb/maven.yaml
+++ b/jjb/maven.yaml
@@ -138,3 +138,4 @@
           settings: 'cord-apps-maven-settings'
           settings-type: cfp
           goals: '-Prelease clean deploy'
+          maven-version: '{maven-version}'
diff --git a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
index 5fb1278..d86aac9 100644
--- a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
+++ b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
@@ -103,6 +103,7 @@
              echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
              source "$WORKSPACE/kind-voltha/releases/${branch}"
            else
+             export INFRA_NS="infra"
              echo "on master, using default settings for kind-voltha"
            fi
 
diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index 14d84b0..e0b65d3 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -325,7 +325,7 @@
           # sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 log:set DEBUG org.onosproject.mcast
           # sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 log:set DEBUG org.opencord.igmpproxy
           # sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 log:set DEBUG org.opencord.olt
-          sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 log:set DEBUG org.onosproject.net.flowobjective.impl.FlowObjectiveManager
+          # sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 log:set DEBUG org.onosproject.net.flowobjective.impl.FlowObjectiveManager
 
           kubectl exec \$(kubectl get pods | grep -E "bbsim[0-9]" | awk 'NR==1{print \$1}') -- bbsimctl log ${logLevel.toLowerCase()} false
 
@@ -486,7 +486,7 @@
       }
       steps {
         sh returnStdout: false, script: """
-          sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 log:set DEBUG org.onosproject.store.group.impl
+          # sshpass -e ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 30115 karaf@127.0.0.1 log:set DEBUG org.onosproject.store.group.impl
         """
         sh '''
           set +e
diff --git a/jjb/verify/osam.yaml b/jjb/verify/osam.yaml
index 4473e36..a09a43d 100644
--- a/jjb/verify/osam.yaml
+++ b/jjb/verify/osam.yaml
@@ -91,6 +91,7 @@
       - maven-target:
           goals: "test"
           pom: "pom.xml"
+          maven-version: '{maven-version}'
 
     publishers:
       - postbuildscript:
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 7788cf1..606c3bc 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -64,7 +64,6 @@
           withIgmp: false
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml'
           onosImg: andreacampanella/voltha-onos:olt-group-pkt-req-mcast-fix
-          bbsimImg: matteoscandolo/bbsim:gemport
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-dt-subscribers'
@@ -81,7 +80,6 @@
           withDhcp: false
           withIgmp: false
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml '
-          bbsimImg: matteoscandolo/bbsim:gemport
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers'
@@ -101,7 +99,6 @@
           atomixReplicas: 3
           extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.rw_core.core_timeout=60s --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml '
           onosImg: andreacampanella/voltha-onos:olt-group-pkt-req-mcast-fix
-          bbsimImg: matteoscandolo/bbsim:gemport
 
       # multi-stack jobs
       - 'voltha-scale-measurements':
@@ -181,7 +178,7 @@
           withIgmp: false
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
           release: voltha-2.7
-          bbsimImg: matteoscandolo/bbsim:gemport
+          bbsimImg: ''
           rwCoreImg: ''
           ofAgentImg: ''
           openoltAdapterImg: ''
@@ -206,7 +203,7 @@
           withIgmp: false
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
           release: voltha-2.7
-          bbsimImg: matteoscandolo/bbsim:gemport
+          bbsimImg: ''
           rwCoreImg: ''
           ofAgentImg: ''
           openoltAdapterImg: ''
@@ -231,7 +228,7 @@
           withIgmp: true
           extraHelmFlags: '--set defaults.rw_core.timeout=30s '
           release: voltha-2.7
-          bbsimImg: matteoscandolo/bbsim:gemport
+          bbsimImg: ''
           rwCoreImg: ''
           ofAgentImg: ''
           openoltAdapterImg: ''
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 607b2bf..6091b84 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -371,6 +371,31 @@
           pipeline-script: 'voltha-physical-soak-dt-tests.groovy'
           time-trigger: "H H */3 * *"
 
+        # Berlin pod with olt/onu - master versions timer based job , two OLTs
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-certification-pod'
+          config-pod: 'menlo-certification-pod-radisys-gpon'
+          disable-job: false
+          reinstall-olt: false
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM-unencrypted'
+          time: '1'
+
+          # Berlin POD test job - master versions: uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'menlo-certification-pod'
+          config-pod: 'menlo-certification-pod-radisys-gpon'
+          disable-job: false
+          release: 'master'
+          branch: 'master'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM-unencrypted'
+          power-switch: false
+          pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
+
       # Berlin pod with olt/onu - master versions timer based job , two OLTs
       - 'build_voltha_pod_release_timer':
           build-node: 'dt-berlin-community-pod'
diff --git a/packer/provision/onf-playbook.yaml b/packer/provision/onf-playbook.yaml
index c69e00c..a30a228 100644
--- a/packer/provision/onf-playbook.yaml
+++ b/packer/provision/onf-playbook.yaml
@@ -229,6 +229,26 @@
         path: /usr/local/bin/hadolint
         mode: 0755
 
+    - name: Download github-release
+      get_url:
+        url: "https://github.com/github-release/github-release/releases/download/v0.10.0/linux-amd64-github-release.bz2"
+        checksum: "sha256:b360af98188c5988314d672bb604efd1e99daae3abfb64d04051ee17c77f84b6"
+        dest: /tmp/github-release.bz2
+
+
+    # Unarchive target doesn't support the bz2 format
+    - name: Unarchive github-release
+      shell:
+        cmd: |
+          bzip2 -d /tmp/github-release.bz2
+
+    - name: Install github-release binary
+      copy:
+        src: /tmp/github-release
+        dest: /usr/local/bin/github-release
+        mode: "0755"
+        remote_src: yes
+
     - name: Recursively remove download files and folders
       file:
         path: "{{ item }}"
@@ -240,4 +260,3 @@
         - /tmp/protobuf.zip
         - /tmp/pandoc.deb
         - /tmp/repo.b64
-        - /tmp/golang_1.16.3.tar.gz