diff --git a/jjb/verify/chameleon.yaml b/jjb/verify/chameleon.yaml
index 90262e7..8b5394a 100644
--- a/jjb/verify/chameleon.yaml
+++ b/jjb/verify/chameleon.yaml
@@ -13,5 +13,7 @@
     name: 'verify-chameleon-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_chameleon_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_chameleon_sonarqube'
diff --git a/jjb/verify/cord-tester.yaml b/jjb/verify/cord-tester.yaml
index 11e26b2..cecc814 100644
--- a/jjb/verify/cord-tester.yaml
+++ b/jjb/verify/cord-tester.yaml
@@ -13,5 +13,7 @@
     name: 'verify-cord-tester-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_cord-tester_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_cord-tester_sonarqube'
diff --git a/jjb/verify/ecord.yaml b/jjb/verify/ecord.yaml
index 38fa940..aa4665b 100644
--- a/jjb/verify/ecord.yaml
+++ b/jjb/verify/ecord.yaml
@@ -15,5 +15,7 @@
       - 'verify-licensed'
       - 'verify-ansible-lint':
           dependency-jobs: 'verify_ecord_licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_ecord_ansible-lint'
+      - 'api-test':
+          dependency-jobs: 'verify_ecord_sonarqube'
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index 185c01c..6afb727 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -13,5 +13,7 @@
     name: 'verify-fabric-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_fabric_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_fabric_sonarqube'
diff --git a/jjb/verify/helm-charts.yaml b/jjb/verify/helm-charts.yaml
index 7eaa8bf..621168b 100644
--- a/jjb/verify/helm-charts.yaml
+++ b/jjb/verify/helm-charts.yaml
@@ -13,6 +13,8 @@
     name: 'verify-helm-charts-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-helm-lint':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_helm-charts_licensed'
+      - 'verify-helm-lint':
+          dependency-jobs: 'verify_helm-charts_sonarqube'
 
diff --git a/jjb/verify/mcord.yaml b/jjb/verify/mcord.yaml
index 204eba1..4fe4751 100644
--- a/jjb/verify/mcord.yaml
+++ b/jjb/verify/mcord.yaml
@@ -15,5 +15,7 @@
       - 'verify-licensed'
       - 'verify-ansible-lint':
           dependency-jobs: 'verify_mcord_licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_mcord_ansible-lint'
+      - 'api-test':
+          dependency-jobs: 'verify_mcord_sonarqube'
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
index 3a85e14..c4ab6e3 100644
--- a/jjb/verify/olt-service.yaml
+++ b/jjb/verify/olt-service.yaml
@@ -13,5 +13,7 @@
     name: 'verify-olt-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_olt-service_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_olt-service_sonarqube'
diff --git a/jjb/verify/onos-service.yaml b/jjb/verify/onos-service.yaml
index 3e878e6..93e21c1 100644
--- a/jjb/verify/onos-service.yaml
+++ b/jjb/verify/onos-service.yaml
@@ -13,5 +13,7 @@
     name: 'verify-onos-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_onos-service_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_onos-service_sonarqube'
diff --git a/jjb/verify/openstack.yaml b/jjb/verify/openstack.yaml
index 16d56ad..0436e28 100644
--- a/jjb/verify/openstack.yaml
+++ b/jjb/verify/openstack.yaml
@@ -13,5 +13,7 @@
     name: 'verify-openstack-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_openstack_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_openstack_sonarqube'
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
index a7cbf76..92621c8 100644
--- a/jjb/verify/rcord.yaml
+++ b/jjb/verify/rcord.yaml
@@ -13,5 +13,7 @@
     name: 'verify-rcord-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_rcord_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_rcord_sonarqube'
diff --git a/jjb/verify/vEE.yaml b/jjb/verify/vEE.yaml
index 4e24e13..74aad02 100644
--- a/jjb/verify/vEE.yaml
+++ b/jjb/verify/vEE.yaml
@@ -13,5 +13,7 @@
     name: 'verify-vEE-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_vEE_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_vEE_sonarqube'
diff --git a/jjb/verify/vEG.yaml b/jjb/verify/vEG.yaml
index c57b95a..1db0b76 100644
--- a/jjb/verify/vEG.yaml
+++ b/jjb/verify/vEG.yaml
@@ -13,5 +13,7 @@
     name: 'verify-vEG-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_vEG_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_vEG_sonarqube'
diff --git a/jjb/verify/vEPC.yaml b/jjb/verify/vEPC.yaml
index 5b1451d..f3dafa5 100644
--- a/jjb/verify/vEPC.yaml
+++ b/jjb/verify/vEPC.yaml
@@ -13,5 +13,7 @@
     name: 'verify-vEPC-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_vEPC_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_vEPC_sonarqube'
diff --git a/jjb/verify/vHSS.yaml b/jjb/verify/vHSS.yaml
index d41748e..beb2a95 100644
--- a/jjb/verify/vHSS.yaml
+++ b/jjb/verify/vHSS.yaml
@@ -13,5 +13,7 @@
     name: 'verify-vHSS-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_vHSS_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_vHSS_sonarqube'
diff --git a/jjb/verify/vMME.yaml b/jjb/verify/vMME.yaml
index 1b87edf..e7a5582 100644
--- a/jjb/verify/vMME.yaml
+++ b/jjb/verify/vMME.yaml
@@ -13,5 +13,7 @@
     name: 'verify-vMME-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_vMME_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_vMME_sonarqube'
diff --git a/jjb/verify/venb.yaml b/jjb/verify/venb.yaml
index 68f3ced..2d56a82 100644
--- a/jjb/verify/venb.yaml
+++ b/jjb/verify/venb.yaml
@@ -13,5 +13,7 @@
     name: 'verify-venb-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_venb_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_venb_sonarqube'
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
index 467c5e8..dd9c08d 100644
--- a/jjb/verify/vrouter.yaml
+++ b/jjb/verify/vrouter.yaml
@@ -13,5 +13,7 @@
     name: 'verify-vrouter-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_vrouter_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_vrouter_sonarqube'
diff --git a/jjb/verify/vsg.yaml b/jjb/verify/vsg.yaml
index 2a70758..e35fe9d 100644
--- a/jjb/verify/vsg.yaml
+++ b/jjb/verify/vsg.yaml
@@ -13,5 +13,7 @@
     name: 'verify-vsg-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_vsg_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_vsg_sonarqube'
diff --git a/jjb/verify/vspgwc.yaml b/jjb/verify/vspgwc.yaml
index 2bef282..6ded2d3 100644
--- a/jjb/verify/vspgwc.yaml
+++ b/jjb/verify/vspgwc.yaml
@@ -13,5 +13,7 @@
     name: 'verify-vspgwc-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_vspgwc_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_vspgwc_sonarqube'
diff --git a/jjb/verify/vspgwu.yaml b/jjb/verify/vspgwu.yaml
index d221209..74cf8ec 100644
--- a/jjb/verify/vspgwu.yaml
+++ b/jjb/verify/vspgwu.yaml
@@ -13,5 +13,7 @@
     name: 'verify-vspgwu-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_vspgwu_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_vspgwu_sonarqube'
diff --git a/jjb/verify/vtn.yaml b/jjb/verify/vtn.yaml
index 31350f5..49936a2 100644
--- a/jjb/verify/vtn.yaml
+++ b/jjb/verify/vtn.yaml
@@ -13,5 +13,7 @@
     name: 'verify-vtn-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_vtn_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_vtn_sonarqube'
diff --git a/jjb/verify/vtr.yaml b/jjb/verify/vtr.yaml
index 4afca83..6cd0f16 100644
--- a/jjb/verify/vtr.yaml
+++ b/jjb/verify/vtr.yaml
@@ -13,5 +13,7 @@
     name: 'verify-vtr-jobs'
     jobs:
       - 'verify-licensed'
-      - 'api-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_vtr_licensed'
+      - 'api-test':
+          dependency-jobs: 'verify_vtr_sonarqube'
diff --git a/jjb/verify/xos-gui.yaml b/jjb/verify/xos-gui.yaml
index e7cd509..8acd304 100644
--- a/jjb/verify/xos-gui.yaml
+++ b/jjb/verify/xos-gui.yaml
@@ -13,5 +13,7 @@
     name: 'verify-xos-gui-jobs'
     jobs:
       - 'verify-licensed'
-      - 'gui-unit-test':
+      - 'verify-sonarqube':
           dependency-jobs: 'verify_xos-gui_licensed'
+      - 'gui-unit-test':
+          dependency-jobs: 'verify_xos-gui_sonarqube'