diff --git a/jjb/cord-macros.yaml b/jjb/cord-macros.yaml
index e16096f..05dd931 100644
--- a/jjb/cord-macros.yaml
+++ b/jjb/cord-macros.yaml
@@ -56,23 +56,6 @@
             GERRIT_PATCHSET_NUMBER={patchset-number}
       - shell: !include-raw-escape: shell/repopatch.sh
 
-# sonarqube-ongoing-coverage
-- builder:
-    name: cord-infra-sonarqube
-    builders:
-      - inject:
-          properties-content: |
-            SONAR_PREP_COMMANDS={sonar-prep-commands}
-      - shell: !include-raw-escape: shell/sonarprep.sh
-      - sonar:
-          sonar-name: 'sonar.opencord.org'
-          java-opts: '-Xmx1280m'
-          properties: |
-            sonar.sources=.
-            sonar.projectKey={project}_$GERRIT_BRANCH
-            sonar.python.pylint=/usr/local/bin/pylint
-            sonar.java.binaries={sonar-java-binaries}
-
 # trigger on gerrit patchsets and actions
 # docs: https://docs.openstack.org/infra/jenkins-job-builder/triggers.html#triggers.gerrit
 - trigger:
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 7adb5af..79a6694 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -603,6 +603,7 @@
       - 'build_voltha_pod_release_timer':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod'
+          'disable-job': true
           release: '2.5'
           branch: 'voltha-2.5'
           num-of-openonu: '2'
@@ -620,6 +621,7 @@
       - 'build_voltha_pod_test':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod'
+          'disable-job': true
           release: '2.5'
           branch: 'voltha-2.5'
           test-repo: 'voltha-system-tests'
@@ -691,6 +693,7 @@
       - 'build_voltha_pod_release_timer':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-gpon'
+          'disable-job': true
           release: '2.5'
           branch: 'voltha-2.5'
           num-of-openonu: '2'
@@ -710,6 +713,7 @@
       - 'build_voltha_pod_test':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-gpon'
+          'disable-job': true
           name-extension: '_DT'
           work-flow: 'DT'
           release: '2.5'
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 4e65fa8..e0280db 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -141,10 +141,6 @@
     docs-ssh-host: 'guide.opencord.org'
     docs-ssh-host-key: 'guide.opencord.org,52.9.82.207 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFHwOY3/8GucdKzBngH/FC08nHac/RJ/OheZp2+5EpOPXZG9zQW2YUbXH5A9pO76lI5CG3z3+huG62xEGo99UQU='
 
-    # For running Sonarqube configuration - see sonar.yaml for more info
-    sonar-prep-commands: ''
-    sonar-java-binaries: ''
-
     # siab helm-charts
     siab-projects-regexp: '^(xos-core/.*|xos-profiles/seba-services/.*|xos-profiles/base-kubernetes/.*|xos-profiles/ponsim-pod/.*|workflows/att-workflow/.*|voltha/.*|onos/.*|mininet/.*|configs/seba-ponsim.yaml)$'
 
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 2c783b4..51640fb 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -34,6 +34,7 @@
           build-node: 'omec-ci'
           cp-context: 'dev-central-gcp'
           dp-context: 'dev-edge-onf-menlo'
+          log-since: '1h'
       - 'omec-postmerge':
           project: '{name}'
           build-node: 'omec-ci'
@@ -914,6 +915,11 @@
           default: '{dp-context}'
           description: 'K8S context for omec data plane.'
 
+      - string:
+          name: logSince
+          default: '{log-since}'
+          description: 'Only upload logs newer than a relative duration e.g. 1h'
+
     concurrent: false
 
     pipeline-scm:
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index dd782cc..dbc60c8 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -23,7 +23,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 240, unit: 'MINUTES')
+    timeout(time: 340, unit: 'MINUTES')
   }
 
   environment {
diff --git a/jjb/pipeline/voltha-openonu-go-tests.groovy b/jjb/pipeline/voltha-openonu-go-tests.groovy
index 57f8c3b..447a087 100755
--- a/jjb/pipeline/voltha-openonu-go-tests.groovy
+++ b/jjb/pipeline/voltha-openonu-go-tests.groovy
@@ -198,6 +198,38 @@
       }
     }
 
+    stage('Run MIB Upload Tests') {
+      environment {
+        ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/openonu-go-MIB"
+      }
+      steps {
+        sh '''
+           cd $WORKSPACE/kind-voltha/
+           #source $NAME-env.sh
+           WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+
+           export EXTRA_HELM_FLAGS+="--set use_openonu_adapter_go=true,log_agent.enabled=False ${extraHelmFlags} "
+
+           export EXTRA_HELM_FLAGS+="--set bbsim.pon=2,bbsim.onu=2,bbsim.controlledActivation=only-onu "
+
+           IMAGES="adapter_open_onu_go"
+
+           for I in \$IMAGES
+           do
+             EXTRA_HELM_FLAGS+="--set images.\$I.tag=citest,images.\$I.pullPolicy=Never "
+           done
+
+           DEPLOY_K8S=n ./voltha up
+
+           mkdir -p $ROBOT_LOGS_DIR
+           export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
+           export TARGET_DEFAULT=mib-upload-templating-openonu-go-adapter-test
+
+           make -C $WORKSPACE/voltha-system-tests \$TARGET_DEFAULT || true
+        '''
+      }
+    }
+
     stage('DT workflow') {
       environment {
         ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/DTWorkflow"
@@ -300,7 +332,6 @@
            '''
       }
     }
-
   }
   post {
     always {
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index db45816..d2d0126 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -492,7 +492,7 @@
         printf '%s\n' $(kubectl get pods -l app=onos-onos-classic -o=jsonpath="{.items[*]['metadata.name']}") | xargs -I# bash -c "kubectl cp #:${karafHome}/data/log/karaf.log $LOG_FOLDER/#.log" || true
 
         # get radius logs out of the container
-        kubectl cp $(kubectl get pods -l app=radius --no-headers  | awk '{print $1}'):/var/log/freeradius/radius.log ~/radius.logs
+        kubectl cp $(kubectl get pods -l app=radius --no-headers  | awk '{print $1}'):/var/log/freeradius/radius.log $LOG_FOLDER//radius.log || true
       '''
       // dump all the BBSim(s) ONU information
       sh '''
diff --git a/jjb/shell/sonarprep.sh b/jjb/shell/sonarprep.sh
deleted file mode 100755
index 772ef20..0000000
--- a/jjb/shell/sonarprep.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# sonarprep.sh - prep project for running sonarqube
-set -e -o pipefail
-
-# run build commands if not blank
-if [ ! -z "$SONAR_PREP_COMMANDS" ]
-then
-  echo "# Running SONAR_PREP_COMMANDS: '$SONAR_PREP_COMMANDS'"
-  $SONAR_PREP_COMMANDS
-else
-  echo "# No preparation commands set in SONAR_PREP_COMMANDS"
-fi
-
-echo "# pylint version"
-pylint --version
-
diff --git a/jjb/sonar.yaml b/jjb/sonar.yaml
deleted file mode 100644
index 7ec590c..0000000
--- a/jjb/sonar.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
----
-# Sonarqube coverage tests
-#
-# There are two kinds of tests:
-#
-#  - coverage_{project}_sonarqube - run after merge to give an idea of ongoing code health
-#  - verify_{project}_sonarqube - run on patchsets, invoked in the verify/*.yaml
-#
-# JJB module docs:
-#  https://docs.openstack.org/infra/jenkins-job-builder/builders.html?highlight=sonar#builders.sonar
-#
-# Sonarqube docs:
-#  https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
-#  https://docs.sonarqube.org/display/SCAN/Advanced+SonarQube+Scanner+Usages
-#
-# Variables:
-#  sonar-java-binaries - paths to Java bytecodefiles for SonarQube to analyze. Defaults to "".
-#                        See: https://docs.sonarqube.org/display/PLUG/Java+Plugin+and+Bytecode
-#  sonar-prep-commands - shell commands to run before SonarScanner is run, frequently used to
-#                        build java bytecode. Defaults to "" (nothing run)
-#
-
-- project:
-    name: 'sonarqube-ongoing-coverage'
-
-    jobs:
-      - 'sonarqube-coverage':
-          branch-regexp: '{supported-branches-regexp}'
-          project:
-            - 'cord'
-            - 'ecord'
-            - 'maas'
-            - 'mcord'
-            - 'platform-install'
-            - 'rcord'
-            - 'xos'
-            - 'xos-gui'
-
-# run ongoing coverage tests on merged patchsets
-- job-template:
-    id: sonarqube-coverage
-    name: 'coverage_{project}_sonarqube'
-    description: |
-      Created by sonarqube-coverage job-template from ci-management/jjb/sonar.yaml
-
-    triggers:
-      - cord-infra-gerrit-trigger-merge:
-          gerrit-server-name: '{gerrit-server-name}'
-          project-regexp: '^{project}$'
-          branch-regexp: '{branch-regexp}'
-          dependency-jobs: '{dependency-jobs}'
-          file-include-regexp: '{all-files-regexp}'
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    scm:
-      - lf-infra-gerrit-scm:
-          git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: ''
-          branch: '$GERRIT_BRANCH'
-          submodule-disable: '{submodule-disable}'
-          submodule-recursive: 'false'
-          submodule-timeout: '{submodule-timeout}'
-          choosing-strategy: 'gerrit'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    node: 'ubuntu16.04-basebuild-1c-2g'
-    project-type: freestyle
-    concurrent: true
-
-    builders:
-      - 'cord-infra-sonarqube':
-          project: '{project}'
-          sonar-prep-commands: '{sonar-prep-commands}'
-          sonar-java-binaries: '{sonar-java-binaries}'
-
-# run Sonarqube as a verification jobs on individual patchsets
-- job-template:
-    id: verify-sonarqube
-    name: 'verify_{project}_sonarqube'
-    description: |
-      Created by verify-sonarqube job-template from ci-management/jjb/sonar.yaml
-
-    triggers:
-      - cord-infra-gerrit-trigger-patchset:
-          gerrit-server-name: '{gerrit-server-name}'
-          project-regexp: '^{project}$'
-          branch-regexp: '{branch-regexp}'
-          dependency-jobs: '{dependency-jobs}'
-          file-include-regexp: '{code-files-regexp}'
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    scm:
-      - lf-infra-gerrit-scm:
-          git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-disable: '{submodule-disable}'
-          submodule-recursive: 'false'
-          submodule-timeout: '{submodule-timeout}'
-          choosing-strategy: gerrit
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    node: 'ubuntu16.04-basebuild-1c-2g'
-    project-type: freestyle
-    concurrent: true
-
-    builders:
-      - 'cord-infra-sonarqube':
-          project: '{project}'
-          sonar-prep-commands: '{sonar-prep-commands}'
-          sonar-java-binaries: '{sonar-java-binaries}'
-
diff --git a/jjb/verify/abstract-olt.yaml b/jjb/verify/abstract-olt.yaml
index 2dcff94..3aab818 100644
--- a/jjb/verify/abstract-olt.yaml
+++ b/jjb/verify/abstract-olt.yaml
@@ -13,10 +13,8 @@
     name: 'verify-abstract-olt-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_abstract-olt_licensed'
       - 'abstract-olt-tests':
-          dependency-jobs: 'verify_abstract-olt_sonarqube'
+          dependency-jobs: 'verify_abstract-olt_licensed'
 
 - job-template:
     id: 'abstract-olt-tests'
diff --git a/jjb/verify/acordion.yaml b/jjb/verify/acordion.yaml
index 3f2ca21..6132772 100644
--- a/jjb/verify/acordion.yaml
+++ b/jjb/verify/acordion.yaml
@@ -15,9 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_acordion_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_acordion_tag-collision'
-#     - 'xos-unit-test':
-#         dependency-jobs: 'verify_acordion_sonarqube'
-#     - 'api-test':
-#         dependency-jobs: 'verify_acordion_unit-test'
diff --git a/jjb/verify/addressmanager.yaml b/jjb/verify/addressmanager.yaml
index 5ef30c7..7e41601 100644
--- a/jjb/verify/addressmanager.yaml
+++ b/jjb/verify/addressmanager.yaml
@@ -15,7 +15,5 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_addressmanager_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_addressmanager_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_addressmanager_sonarqube'
+          dependency-jobs: 'verify_addressmanager_tag-collision'
diff --git a/jjb/verify/att-workflow-driver.yaml b/jjb/verify/att-workflow-driver.yaml
index ff3282e..522b5fa 100644
--- a/jjb/verify/att-workflow-driver.yaml
+++ b/jjb/verify/att-workflow-driver.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_att-workflow-driver_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_att-workflow-driver_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_att-workflow-driver_sonarqube'
+          dependency-jobs: 'verify_att-workflow-driver_tag-collision'
       - 'xos-service-upgrade':
           dependency-jobs: 'verify_att-workflow-driver-unit-test'
 
diff --git a/jjb/verify/cord.yaml b/jjb/verify/cord.yaml
index 21ba362..cb5574e 100644
--- a/jjb/verify/cord.yaml
+++ b/jjb/verify/cord.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'verify-ansible-lint':
           dependency-jobs: 'verify_cord_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_cord_ansible-lint'
diff --git a/jjb/verify/dt-workflow-driver.yaml b/jjb/verify/dt-workflow-driver.yaml
index 1f7c02d..14e2669 100644
--- a/jjb/verify/dt-workflow-driver.yaml
+++ b/jjb/verify/dt-workflow-driver.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_dt-workflow-driver_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_dt-workflow-driver_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_dt-workflow-driver_sonarqube'
+          dependency-jobs: 'verify_dt-workflow-driver_tag-collision'
       - 'xos-service-upgrade':
           dependency-jobs: 'verify_dt-workflow-driver-unit-test'
 
diff --git a/jjb/verify/ecord.yaml b/jjb/verify/ecord.yaml
index fd0f78d..e4d4778 100644
--- a/jjb/verify/ecord.yaml
+++ b/jjb/verify/ecord.yaml
@@ -17,5 +17,3 @@
           dependency-jobs: 'verify_ecord_licensed'
       - 'verify-ansible-lint':
           dependency-jobs: 'verify_ecord_tag-collision'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_ecord_ansible-lint'
diff --git a/jjb/verify/epc-service.yaml b/jjb/verify/epc-service.yaml
index d1f2ff0..6354eeb 100644
--- a/jjb/verify/epc-service.yaml
+++ b/jjb/verify/epc-service.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_epc-service_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_epc-service_tag-collision'
diff --git a/jjb/verify/exampleservice.yaml b/jjb/verify/exampleservice.yaml
index 14ab74e..0aafdec 100644
--- a/jjb/verify/exampleservice.yaml
+++ b/jjb/verify/exampleservice.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_exampleservice_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_exampleservice_tag-collision'
diff --git a/jjb/verify/fabric-crossconnect.yaml b/jjb/verify/fabric-crossconnect.yaml
index bc2d2b8..54268ce 100644
--- a/jjb/verify/fabric-crossconnect.yaml
+++ b/jjb/verify/fabric-crossconnect.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_fabric-crossconnect_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_fabric-crossconnect_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_fabric-crossconnect_sonarqube'
+          dependency-jobs: 'verify_fabric-crossconnect_tag-collision'
       - 'xos-service-upgrade':
           dependency-jobs: 'verify_fabric-crossconnect-unit-test'
 - job-group:
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index b1e53e8..46927fe 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_fabric_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_fabric_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_fabric_sonarqube'
+          dependency-jobs: 'verify_fabric_tag-collision'
       - 'xos-service-upgrade':
           dependency-jobs: 'verify_fabric-unit-test'
 
diff --git a/jjb/verify/helm-charts.yaml b/jjb/verify/helm-charts.yaml
index af2ab28..dc6d904 100644
--- a/jjb/verify/helm-charts.yaml
+++ b/jjb/verify/helm-charts.yaml
@@ -17,6 +17,4 @@
           dependency-jobs: 'verify_helm-charts_licensed'
       - 'verify-helm-lint':
           dependency-jobs: 'verify_helm-charts_tag-collision'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_helm-charts_helm-lint'
 
diff --git a/jjb/verify/hippie-oss.yaml b/jjb/verify/hippie-oss.yaml
index a53233b..987be8e 100644
--- a/jjb/verify/hippie-oss.yaml
+++ b/jjb/verify/hippie-oss.yaml
@@ -15,7 +15,5 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_hippie-oss_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_hippie-oss_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_hippie-oss_sonarqube'
+          dependency-jobs: 'verify_hippie-oss_tag-collision'
diff --git a/jjb/verify/hss_db.yaml b/jjb/verify/hss_db.yaml
index 2a91e88..ef9eef0 100644
--- a/jjb/verify/hss_db.yaml
+++ b/jjb/verify/hss_db.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_hss_db_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_hss_db_tag-collision'
diff --git a/jjb/verify/internetemulator.yaml b/jjb/verify/internetemulator.yaml
index 120fb40..9b3a38a 100644
--- a/jjb/verify/internetemulator.yaml
+++ b/jjb/verify/internetemulator.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_internetemulator_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_internetemulator_tag-collision'
diff --git a/jjb/verify/k8sepcservice.yaml b/jjb/verify/k8sepcservice.yaml
index fde0b75..e35332c 100644
--- a/jjb/verify/k8sepcservice.yaml
+++ b/jjb/verify/k8sepcservice.yaml
@@ -15,7 +15,5 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_k8sepcservice_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_k8sepcservice_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_k8sepcservice_sonarqube'
+          dependency-jobs: 'verify_k8sepcservice_tag-collision'
diff --git a/jjb/verify/kafkaloghandler.yaml b/jjb/verify/kafkaloghandler.yaml
index 4294afd..64e0397 100644
--- a/jjb/verify/kafkaloghandler.yaml
+++ b/jjb/verify/kafkaloghandler.yaml
@@ -15,7 +15,5 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_kafkaloghandler_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_kafkaloghandler_tag-collision'
       - 'python-unit-test':
-          dependency-jobs: 'verify_kafkaloghandler_sonarqube'
+          dependency-jobs: 'verify_kafkaloghandler_tag-collision'
diff --git a/jjb/verify/kubernetes-service.yaml b/jjb/verify/kubernetes-service.yaml
index 0a55b21..a0116bb 100644
--- a/jjb/verify/kubernetes-service.yaml
+++ b/jjb/verify/kubernetes-service.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_kubernetes-service_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_kubernetes-service_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_kubernetes-service_sonarqube'
+          dependency-jobs: 'verify_kubernetes-service_tag-collision'
       - 'xos-service-upgrade':
           dependency-jobs: 'verify_kubernetes-service-unit-test'
 
diff --git a/jjb/verify/maas.yaml b/jjb/verify/maas.yaml
index 6c49511..1d3d928 100644
--- a/jjb/verify/maas.yaml
+++ b/jjb/verify/maas.yaml
@@ -15,6 +15,3 @@
       - 'verify-licensed'
       - 'verify-ansible-lint':
           dependency-jobs: 'verify_maas_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_maas_ansible-lint'
-
diff --git a/jjb/verify/mcord.yaml b/jjb/verify/mcord.yaml
index 36c47dc..da33c93 100644
--- a/jjb/verify/mcord.yaml
+++ b/jjb/verify/mcord.yaml
@@ -17,5 +17,3 @@
           dependency-jobs: 'verify_mcord_licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_mcord_ansible-lint'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_mcord_tag-collision'
diff --git a/jjb/verify/mgmt-gateway-vm.yaml b/jjb/verify/mgmt-gateway-vm.yaml
index 57f7e8c..2d7ff45 100644
--- a/jjb/verify/mgmt-gateway-vm.yaml
+++ b/jjb/verify/mgmt-gateway-vm.yaml
@@ -13,5 +13,3 @@
     name: 'verify-mgmt-gateway-vm-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_mgmt-gateway-vm_licensed'
diff --git a/jjb/verify/multistructlog.yaml b/jjb/verify/multistructlog.yaml
index e85bb20..cb8def4 100644
--- a/jjb/verify/multistructlog.yaml
+++ b/jjb/verify/multistructlog.yaml
@@ -15,7 +15,5 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_multistructlog_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_multistructlog_tag-collision'
       - 'python-unit-test':
-          dependency-jobs: 'verify_multistructlog_sonarqube'
+          dependency-jobs: 'verify_multistructlog_tag-collision'
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
index 089a023..ea78433 100644
--- a/jjb/verify/olt-service.yaml
+++ b/jjb/verify/olt-service.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_olt-service_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_olt-service_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_olt-service_sonarqube'
+          dependency-jobs: 'verify_olt-service_tag-collision'
       - 'xos-service-upgrade':
           dependency-jobs: 'verify_olt-service-unit-test'
 - job-group:
diff --git a/jjb/verify/onos-service.yaml b/jjb/verify/onos-service.yaml
index b582d44..4642089 100644
--- a/jjb/verify/onos-service.yaml
+++ b/jjb/verify/onos-service.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_onos-service_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_onos-service_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_onos-service_sonarqube'
+          dependency-jobs: 'verify_onos-service_tag-collision'
       - 'xos-service-upgrade':
           dependency-jobs: 'verify_onos-service-unit-test'
 
diff --git a/jjb/verify/openolt.yaml b/jjb/verify/openolt.yaml
index 91159f6..ef8ab38 100644
--- a/jjb/verify/openolt.yaml
+++ b/jjb/verify/openolt.yaml
@@ -21,13 +21,6 @@
           junit-allow-empty-results: true
           xunit-skip-if-no-test-files: false
 
-# This and the job-template below were written in October 2018
-#
-# Unknown if it is still relevant - the executor in Jenkins does not exist.
-#
-#      - 'openolt-tests':
-#          dependency-jobs: 'verify_openolt_sonarqube'
-
 - job-template:
     id: 'openolt-tests'
     name: 'verify_{project}_tests'
diff --git a/jjb/verify/openstack.yaml b/jjb/verify/openstack.yaml
index 5c963ad..215fc5b 100644
--- a/jjb/verify/openstack.yaml
+++ b/jjb/verify/openstack.yaml
@@ -15,7 +15,5 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_openstack_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_openstack_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_openstack_sonarqube'
+          dependency-jobs: 'verify_openstack_tag-collision'
diff --git a/jjb/verify/osam.yaml b/jjb/verify/osam.yaml
index f5e0e8b..a89f1cc 100644
--- a/jjb/verify/osam.yaml
+++ b/jjb/verify/osam.yaml
@@ -13,16 +13,8 @@
     name: 'verify-osam-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
-          build-timeout: 40
-          dependency-jobs: 'verify_osam_licensed'
-          sonar-prep-commands: 'mvn compile'
-          sonar-java-binaries: 'osam-core'
       - 'osam-test':
-          dependency-jobs: 'verify_osam_sonarqube'
-
-#     - 'tag-collision-reject':
-#         dependency-jobs: 'verify_osam_licensed'
+          dependency-jobs: 'verify_osam_licensed'
 
 - job-template:
     id: 'osam-test'
diff --git a/jjb/verify/platform-install.yaml b/jjb/verify/platform-install.yaml
index 7520d67..ef2acc9 100644
--- a/jjb/verify/platform-install.yaml
+++ b/jjb/verify/platform-install.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'verify-ansible-lint':
           dependency-jobs: 'verify_platform-install_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_platform-install_ansible-lint'
diff --git a/jjb/verify/plyxproto.yaml b/jjb/verify/plyxproto.yaml
index 4eb2c32..fda909c 100644
--- a/jjb/verify/plyxproto.yaml
+++ b/jjb/verify/plyxproto.yaml
@@ -19,7 +19,6 @@
       - 'tag-collision-reject':
           dependency-jobs: 'verify_plyxproto_licensed'
       - 'python-unit-test':
-          dependency-jobs: 'verify_plyxproto_sonarqube'
 
 - job-group:
     name: 'post-merge-plyxproto-jobs'
diff --git a/jjb/verify/progran.yaml b/jjb/verify/progran.yaml
index 30288d6..314eebd 100644
--- a/jjb/verify/progran.yaml
+++ b/jjb/verify/progran.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_progran_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_progran_tag-collision'
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
index c046fab..2fe8627 100644
--- a/jjb/verify/rcord.yaml
+++ b/jjb/verify/rcord.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_rcord_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_rcord_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_rcord_sonarqube'
+          dependency-jobs: 'verify_rcord_tag-collision'
       - 'xos-service-upgrade':
           dependency-jobs: 'verify_rcord-unit-test'
 
diff --git a/jjb/verify/sadis-server.yaml b/jjb/verify/sadis-server.yaml
index 55574ce..3d1b591 100644
--- a/jjb/verify/sadis-server.yaml
+++ b/jjb/verify/sadis-server.yaml
@@ -15,10 +15,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_sadis-server_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_sadis-server_tag-collision'
       - 'sadis-server-tests':
-          dependency-jobs: 'verify_sadis-server_sonarqube'
+          dependency-jobs: 'verify_sadis-server_tag-collision'
 
 - job-template:
     id: 'sadis-server-tests'
diff --git a/jjb/verify/sdn-controller.yaml b/jjb/verify/sdn-controller.yaml
index 110516a..56430f2 100644
--- a/jjb/verify/sdn-controller.yaml
+++ b/jjb/verify/sdn-controller.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_sdn-controller_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_sdn-controller_tag-collision'
diff --git a/jjb/verify/simpleexampleservice.yaml b/jjb/verify/simpleexampleservice.yaml
index 5077924..03054db 100644
--- a/jjb/verify/simpleexampleservice.yaml
+++ b/jjb/verify/simpleexampleservice.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_simpleexampleservice_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_simpleexampleservice_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_simpleexampleservice_sonarqube'
+          dependency-jobs: 'verify_simpleexampleservice_tag-collision'
       - 'xos-service-upgrade':
           dependency-jobs: 'verify_simpleexampleservice-unit-test'
 
diff --git a/jjb/verify/tt-workflow-driver.yaml b/jjb/verify/tt-workflow-driver.yaml
index e3592c4..371ba73 100644
--- a/jjb/verify/tt-workflow-driver.yaml
+++ b/jjb/verify/tt-workflow-driver.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_tt-workflow-driver_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_tt-workflow-driver_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_tt-workflow-driver_sonarqube'
+          dependency-jobs: 'verify_tt-workflow-driver_tag-collision'
 
 - job-group:
     name: 'publish-tt-workflow-driver-jobs'
diff --git a/jjb/verify/vEE.yaml b/jjb/verify/vEE.yaml
index d9571b2..b81aa45 100644
--- a/jjb/verify/vEE.yaml
+++ b/jjb/verify/vEE.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vEE_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vEE_tag-collision'
diff --git a/jjb/verify/vEG.yaml b/jjb/verify/vEG.yaml
index e10b23c..e5693c1 100644
--- a/jjb/verify/vEG.yaml
+++ b/jjb/verify/vEG.yaml
@@ -15,7 +15,5 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vEG_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vEG_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_vEG_sonarqube'
+          dependency-jobs: 'verify_vEG_tag-collision'
diff --git a/jjb/verify/vEPC.yaml b/jjb/verify/vEPC.yaml
index 31360ba..a652095 100644
--- a/jjb/verify/vEPC.yaml
+++ b/jjb/verify/vEPC.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vEPC_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vEPC_tag-collision'
diff --git a/jjb/verify/vHSS.yaml b/jjb/verify/vHSS.yaml
index 0224851..5a7fa89 100644
--- a/jjb/verify/vHSS.yaml
+++ b/jjb/verify/vHSS.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vHSS_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vHSS_tag-collision'
diff --git a/jjb/verify/vMME.yaml b/jjb/verify/vMME.yaml
index 9652d82..4f0797c 100644
--- a/jjb/verify/vMME.yaml
+++ b/jjb/verify/vMME.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vMME_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vMME_tag-collision'
diff --git a/jjb/verify/venb.yaml b/jjb/verify/venb.yaml
index a9235bd..445686a 100644
--- a/jjb/verify/venb.yaml
+++ b/jjb/verify/venb.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_venb_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_venb_tag-collision'
diff --git a/jjb/verify/ves-agent.yaml b/jjb/verify/ves-agent.yaml
index 36b755a..5a7808b 100644
--- a/jjb/verify/ves-agent.yaml
+++ b/jjb/verify/ves-agent.yaml
@@ -15,7 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_ves-agent_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_ves-agent_tag-collision'
-          sonar-prep-commands: './build.sh'
-          sonar-java-binaries: 'target'
diff --git a/jjb/verify/vnaas.yaml b/jjb/verify/vnaas.yaml
index 34f44ba..435cf9f 100644
--- a/jjb/verify/vnaas.yaml
+++ b/jjb/verify/vnaas.yaml
@@ -15,8 +15,6 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vnaas_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vnaas_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_vnaas_sonarqube'
+          dependency-jobs: 'verify_vnaas_tag-collision'
 #
diff --git a/jjb/verify/voltha-adtran-adapter.yaml b/jjb/verify/voltha-adtran-adapter.yaml
index b648a24..c20c2b2 100644
--- a/jjb/verify/voltha-adtran-adapter.yaml
+++ b/jjb/verify/voltha-adtran-adapter.yaml
@@ -15,7 +15,5 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_voltha-adtran-adapter_licensed'
-#     - 'verify-sonarqube':
-#         dependency-jobs: 'verify_voltha-adtran-adapter_tag-collision'
 #     - 'python-unit-test':
-#         dependency-jobs: 'verify_voltha-adtran-adapter_sonarqube'
+#         dependency-jobs: 'verify_voltha-adtran-adapter_tag-collision'
diff --git a/jjb/verify/voltha.yaml b/jjb/verify/voltha.yaml
index caa8477..6eede8d 100644
--- a/jjb/verify/voltha.yaml
+++ b/jjb/verify/voltha.yaml
@@ -13,10 +13,6 @@
     name: 'verify-voltha-jobs'
     jobs:
       - 'verify-licensed'
-      #     - 'verify-sonarqube':
-      #         dependency-jobs: 'verify_voltha_licensed'
-      #         build-timeout: 20
       - 'voltha-unit-test':
           dependency-jobs: 'verify_voltha_licensed'
-#         dependency-jobs: 'verify_voltha_sonarqube'
 
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
index 7bf672d..9bb9680 100644
--- a/jjb/verify/vrouter.yaml
+++ b/jjb/verify/vrouter.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vrouter_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vrouter_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_vrouter_sonarqube'
+          dependency-jobs: 'verify_vrouter_tag-collision'
 
 - job-group:
     name: 'publish-vrouter-jobs'
diff --git a/jjb/verify/vsg-hw.yaml b/jjb/verify/vsg-hw.yaml
index 1314376..b06e5ac 100644
--- a/jjb/verify/vsg-hw.yaml
+++ b/jjb/verify/vsg-hw.yaml
@@ -15,8 +15,6 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vsg-hw_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vsg-hw_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_vsg-hw_sonarqube'
+          dependency-jobs: 'verify_vsg-hw_tag-collision'
 
diff --git a/jjb/verify/vsg.yaml b/jjb/verify/vsg.yaml
index 73bcbc9..17ba227 100644
--- a/jjb/verify/vsg.yaml
+++ b/jjb/verify/vsg.yaml
@@ -15,7 +15,5 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vsg_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vsg_tag-collision'
       - 'xos-unit-test':
-          dependency-jobs: 'verify_vsg_sonarqube'
+          dependency-jobs: 'verify_vsg_tag-collision'
diff --git a/jjb/verify/vspgwc.yaml b/jjb/verify/vspgwc.yaml
index f23154d..224d6c6 100644
--- a/jjb/verify/vspgwc.yaml
+++ b/jjb/verify/vspgwc.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vspgwc_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vspgwc_tag-collision'
diff --git a/jjb/verify/vspgwu.yaml b/jjb/verify/vspgwu.yaml
index a53a854..3c1b4c9 100644
--- a/jjb/verify/vspgwu.yaml
+++ b/jjb/verify/vspgwu.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vspgwu_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vspgwu_tag-collision'
diff --git a/jjb/verify/vtn-service.yaml b/jjb/verify/vtn-service.yaml
index 57b3dd1..e69393f 100644
--- a/jjb/verify/vtn-service.yaml
+++ b/jjb/verify/vtn-service.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vtn-service_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vtn-service_tag-collision'
diff --git a/jjb/verify/vtr.yaml b/jjb/verify/vtr.yaml
index 0e002a3..432dbbf 100644
--- a/jjb/verify/vtr.yaml
+++ b/jjb/verify/vtr.yaml
@@ -15,5 +15,3 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_vtr_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_vtr_tag-collision'
diff --git a/jjb/verify/xos-gui.yaml b/jjb/verify/xos-gui.yaml
index 68bf816..46d15de 100644
--- a/jjb/verify/xos-gui.yaml
+++ b/jjb/verify/xos-gui.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_xos-gui_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_xos-gui_tag-collision'
       - 'gui-unit-test':
-          dependency-jobs: 'verify_xos-gui_sonarqube'
+          dependency-jobs: 'verify_xos-gui_tag-collision'
 
 - job-group:
     name: 'publish-xos-gui-jobs'
diff --git a/jjb/verify/xos-rest-gw.yaml b/jjb/verify/xos-rest-gw.yaml
index 5af8c16..56268d0 100644
--- a/jjb/verify/xos-rest-gw.yaml
+++ b/jjb/verify/xos-rest-gw.yaml
@@ -16,10 +16,8 @@
       - 'verify-licensed'
       - 'tag-collision-reject':
           dependency-jobs: 'verify_xos-rest-gw_licensed'
-      - 'verify-sonarqube':
-          dependency-jobs: 'verify_xos-rest-gw_tag-collision'
       - 'xos-rest-gw-unit':
-          dependency-jobs: 'verify_xos-rest-gw_sonarqube'
+          dependency-jobs: 'verify_xos-rest-gw_tag-collision'
 
 - job-group:
     name: 'publish-xos-rest-gw-jobs'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 34e73fc..524c8c8 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -24,8 +24,8 @@
           build-node: 'qct-pod4-node2'
           make-target: functional-single-kind
           code-branch: 'master'
-          workflow: 'DT'
-          extraHelmFlags: 'use_openonu_adapter_go=true,images.adapter_open_onu.repository=voltha/voltha-openonu-adapter-go,images.adapter_open_onu.tag=master'
+          work-flow: 'DT'
+          extraHelmFlags: 'use_openonu_adapter_go=true,images.adapter_open_onu_go.repository=voltha/voltha-openonu-adapter-go,images.adapter_open_onu_go.tag=master'
           onus: 2
           pons: 2
           time-trigger: "H H/12 * * *"
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index bdc0723..40453cd 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -68,7 +68,7 @@
           withPcap: true
           bbsimImg: matteoscandolo/bbsim:experiment
           openoltAdapterImg: gcgirish/voltha-openolt-adapter:flowReplica
-          onosImg:  matteoscandolo/voltha-onos:dhcp-aaa
+          onosImg:  andreacampanella/voltha-onos:aaa-single-radius-master-dhcp-option82
 
 
       # jobs for 512 ONUs with a 8 openonu-adapters and clustered ONOS (1 OLT)
@@ -91,7 +91,7 @@
           withPcap: true
           bbsimImg: matteoscandolo/bbsim:experiment
           openoltAdapterImg: gcgirish/voltha-openolt-adapter:flowReplica
-          onosImg:  matteoscandolo/voltha-onos:dhcp-aaa
+          onosImg:  andreacampanella/voltha-onos:aaa-single-radius-master-dhcp-option82
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-1-16-32-tt-subscribers'
@@ -113,7 +113,7 @@
           withPcap: true
           bbsimImg: matteoscandolo/bbsim:experiment
           openoltAdapterImg: gcgirish/voltha-openolt-adapter:flowReplica
-          onosImg:  matteoscandolo/voltha-onos:dhcp-aaa
+          onosImg:  andreacampanella/voltha-onos:aaa-single-radius-master-dhcp-option82
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-1-16-32-dt-subscribers'
@@ -134,7 +134,7 @@
           atomixReplicas: 3
           bbsimImg: matteoscandolo/bbsim:experiment
           openoltAdapterImg: gcgirish/voltha-openolt-adapter:flowReplica
-          onosImg:  matteoscandolo/voltha-onos:dhcp-aaa
+          onosImg:  andreacampanella/voltha-onos:aaa-single-radius-master-dhcp-option82
 
       # jobs for 1024 ONUs with a 8 openonu-adapters and clustered ONOS (2 OLTs)
       - 'voltha-scale-measurements':