diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 642f738..a33fc59 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -103,7 +103,7 @@
           branch: 'master'
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
-          oltDebVersion: 'openolt_asfvolt16.deb'
+          oltDebVersion: 'openolt_asfvolt16_old.deb'
           configurePod: true
           released: true
           profile: 'Default'
@@ -141,6 +141,29 @@
           test-repo: 'voltha-system-tests'
           profile: 'Default'
 
+      # Menlo pod with olt/onu - Default tech profile and timer based job
+      - 'build_voltha_pod_release':
+          testvm: 'menlo-demo-pod'
+          config-pod: 'onf-demo-pod'
+          release: 'release'
+          branch: 'master'
+          released: true
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
+          oltDebVersion: 'openolt_asfvolt16_old.deb'
+          configurePod: true
+          profile: 'Default'
+          time: '2'
+
+      # Menlo pod test job - uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          testvm: 'menlo-demo-pod'
+          config-pod: 'onf-demo-pod'
+          release: 'release'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          profile: 'Default'
+
       # Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
       - 'build_voltha_pod_release':
           testvm: 'menlo-demo-pod'
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index e2faef3..d5ecedb 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -90,6 +90,8 @@
              kubectl -n voltha wait pod -lapp=bbsim --for condition=Ready --timeout=60s # VOL-2342
              http -a karaf:karaf --ignore-stdin DELETE http://localhost:8181/onos/v1/applications/org.opencord.dhcpl2relay/active > /dev/null  # VOL-2343
              http -a karaf:karaf --ignore-stdin  POST  http://localhost:8181/onos/v1/applications/org.opencord.dhcpl2relay/active > /dev/null  # VOL-2343
+             http -a karaf:karaf --ignore-stdin DELETE http://localhost:8181/onos/v1/applications/org.opencord.aaa/active > /dev/null  # VOL-2363
+             http -a karaf:karaf --ignore-stdin  POST  http://localhost:8181/onos/v1/applications/org.opencord.aaa/active > /dev/null  # VOL-2363
              sleep 10
            done
            '''
diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index e212118..759013f 100644
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -197,10 +197,11 @@
       go install ./protoc-gen-go
     popd
 
-    # install repo
-    REPO_SHA256SUM="394d93ac7261d59db58afa49bb5f88386fea8518792491ee3db8baab49c3ecda"
-    curl -o /tmp/repo 'https://gerrit.opencord.org/gitweb?p=repo.git;a=blob_plain;f=repo;hb=refs/heads/stable'
-    echo "$REPO_SHA256SUM  /tmp/repo" | sha256sum -c -
+    # install repo launcher v1.13.8
+    REPO_B64_SHA256SUM="ac7058283b4e2b51db31a79632c3e2f809d8f6270217d280fcc52f1325e69960"
+    curl -o /tmp/repo.b64 'https://gerrit.googlesource.com/git-repo/+/refs/tags/v1.13.8/repo?format=TEXT'
+    echo "$REPO_B64_SHA256SUM  /tmp/repo.b64" | sha256sum -c -
+    base64 --decode /tmp/repo.b64 > /tmp/repo
     mv /tmp/repo /usr/local/bin/repo
     chmod a+x /usr/local/bin/repo