diff --git a/jjb/imagebuilder.yaml b/jjb/imagebuilder.yaml
index a03db4d..1f2a67b 100644
--- a/jjb/imagebuilder.yaml
+++ b/jjb/imagebuilder.yaml
@@ -9,7 +9,7 @@
       - 'publish-imagebuilder':
           project-regexp: '{imagebuilder-projects-regexp}'
           branch-regexp: '{supported-branches-regexp}'
-#          dependency-jobs: 'version-tag'
+          dependency-jobs: 'version-tag'
 
 - job-template:
     id: publish-imagebuilder
diff --git a/jjb/pipeline/voltha-atest-provisioning.groovy b/jjb/pipeline/voltha-atest-provisioning.groovy
old mode 100644
new mode 100755
index 6b90973..ea8d198
--- a/jjb/pipeline/voltha-atest-provisioning.groovy
+++ b/jjb/pipeline/voltha-atest-provisioning.groovy
@@ -9,10 +9,54 @@
 
   stages {
 
+    stage ('Cleanup workspace') {
+        steps {
+        sh 'rm -rf ./build ./component ./incubator ./onos-apps ./orchestration ./test ./.repo'
+        }
+    }
+
+    stage('voltha Repo') {
+      steps {
+        checkout(changelog: false, \
+          poll: false,
+          scm: [$class: 'RepoScm', \
+            manifestRepositoryUrl: "${params.manifestUrl}", \
+            manifestBranch: "${params.manifestBranch}", \
+            currentBranch: true, \
+            destinationDir: 'cord', \
+            forceSync: true,
+            resetFirst: true, \
+            quiet: true, \
+            jobs: 4, \
+            showAllChanges: true] \
+          )
+      }
+    }
+
+    stage ('Bring up voltha dev vm') {
+      steps {
+        sh '''
+        pushd $WORKSPACE/cord/incubator/voltha
+        vagrant up voltha
+        popd
+        '''
+        }
+      }
+    stage ('Remove the pre-created venv-linux') {
+      steps {
+        sh 'vagrant ssh -c "rm -rf $WORKSPACE/cord/incubator/voltha/venv-linux"'
+        }
+      }
+
+    stage ('Build voltha and onos') {
+      steps {
+        sh 'vagrant ssh -c "cd $WORKSPACE/cord/incubator/voltha && source env.sh && make fetch-jenkins && make jenkins && make onos" voltha' }
+        }
+
     stage ('Start Provisioning Test') {
       steps {
         println 'Start Provisioning Test'
+        sh 'vagrant ssh -c "cd $WORKSPACE/cord/incubator/voltha/tests && pwd" voltha' }
       }
     }
-  }
 }
diff --git a/jjb/shell/tagcollisionreject.sh b/jjb/shell/tagcollisionreject.sh
index 81ffaeb..86fe317 100755
--- a/jjb/shell/tagcollisionreject.sh
+++ b/jjb/shell/tagcollisionreject.sh
@@ -35,6 +35,10 @@
   then
     NEW_VERSION=$(head -n1 "VERSION")
     VERSIONFILE="VERSION"
+  elif [ -f "package.json" ]
+  then
+    NEW_VERSION=$(python -c 'import json,sys;obj=json.load(sys.stdin); print obj["version"]' < package.json)
+    VERSIONFILE="package.json"
   else
     echo "ERROR: No versioning file found!"
     exit 1
diff --git a/jjb/shell/versiontag.sh b/jjb/shell/versiontag.sh
index 1ee9246..4287914 100755
--- a/jjb/shell/versiontag.sh
+++ b/jjb/shell/versiontag.sh
@@ -36,6 +36,10 @@
   then
     NEW_VERSION=$(head -n1 "VERSION")
     VERSIONFILE="VERSION"
+  elif [ -f "package.json" ]
+  then
+    NEW_VERSION=$(python -c 'import json,sys;obj=json.load(sys.stdin); print obj["version"]' < package.json)
+    VERSIONFILE="package.json"
   else
     echo "ERROR: No versioning file found!"
     exit 1
diff --git a/jjb/verify/acordion.yaml b/jjb/verify/acordion.yaml
index ceb900e..3f2ca21 100644
--- a/jjb/verify/acordion.yaml
+++ b/jjb/verify/acordion.yaml
@@ -13,8 +13,10 @@
     name: 'verify-acordion-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - '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':
diff --git a/jjb/verify/chameleon.yaml b/jjb/verify/chameleon.yaml
index 34262b4..8d40a38 100644
--- a/jjb/verify/chameleon.yaml
+++ b/jjb/verify/chameleon.yaml
@@ -13,8 +13,10 @@
     name: 'verify-chameleon-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_chameleon_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_chameleon_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_chameleon_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/ecord.yaml b/jjb/verify/ecord.yaml
index 9cdce62..40177ca 100644
--- a/jjb/verify/ecord.yaml
+++ b/jjb/verify/ecord.yaml
@@ -13,8 +13,10 @@
     name: 'verify-ecord-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-ansible-lint':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_ecord_licensed'
+      - 'verify-ansible-lint':
+          dependency-jobs: 'verify_ecord_tag-collision'
       - 'verify-sonarqube':
           dependency-jobs: 'verify_ecord_ansible-lint'
       - 'api-test':
diff --git a/jjb/verify/epc-service.yaml b/jjb/verify/epc-service.yaml
index 40c7907..a0f63f6 100644
--- a/jjb/verify/epc-service.yaml
+++ b/jjb/verify/epc-service.yaml
@@ -13,8 +13,10 @@
     name: 'verify-epc-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_epc-service_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_epc-service_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_epc-service_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/exampleservice.yaml b/jjb/verify/exampleservice.yaml
index d32af50..dea147e 100644
--- a/jjb/verify/exampleservice.yaml
+++ b/jjb/verify/exampleservice.yaml
@@ -13,8 +13,10 @@
     name: 'verify-exampleservice-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_exampleservice_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_exampleservice_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_exampleservice_sonarqube'
           pipeline_script: 'all-xos-api-test.groovy'
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index ef4a915..afea07c 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -13,8 +13,10 @@
     name: 'verify-fabric-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_fabric_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_fabric_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_fabric_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/hippie-oss.yaml b/jjb/verify/hippie-oss.yaml
index d08b5ad..5aeab09 100644
--- a/jjb/verify/hippie-oss.yaml
+++ b/jjb/verify/hippie-oss.yaml
@@ -13,8 +13,10 @@
     name: 'verify-hippie-oss-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - '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'
       - 'api-test':
diff --git a/jjb/verify/hss_db.yaml b/jjb/verify/hss_db.yaml
index 00dfc1f..c40b69e 100644
--- a/jjb/verify/hss_db.yaml
+++ b/jjb/verify/hss_db.yaml
@@ -13,8 +13,10 @@
     name: 'verify-hss_db-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_hss_db_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_hss_db_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_hss_db_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/internetemulator.yaml b/jjb/verify/internetemulator.yaml
index a8f1483..4b84fe6 100644
--- a/jjb/verify/internetemulator.yaml
+++ b/jjb/verify/internetemulator.yaml
@@ -13,8 +13,10 @@
     name: 'verify-internetemulator-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_internetemulator_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_internetemulator_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_internetemulator_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/kubernetes-service.yaml b/jjb/verify/kubernetes-service.yaml
index d1c0487..b954c4e 100644
--- a/jjb/verify/kubernetes-service.yaml
+++ b/jjb/verify/kubernetes-service.yaml
@@ -13,8 +13,10 @@
     name: 'verify-kubernetes-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - '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'
       - 'api-test':
diff --git a/jjb/verify/mcord.yaml b/jjb/verify/mcord.yaml
index d5f0ece..4f48b7c 100644
--- a/jjb/verify/mcord.yaml
+++ b/jjb/verify/mcord.yaml
@@ -15,8 +15,10 @@
       - 'verify-licensed'
       - 'verify-ansible-lint':
           dependency-jobs: 'verify_mcord_licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_mcord_ansible-lint'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_mcord_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_mcord_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
index a93aa51..b891963 100644
--- a/jjb/verify/olt-service.yaml
+++ b/jjb/verify/olt-service.yaml
@@ -13,8 +13,10 @@
     name: 'verify-olt-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - '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'
       - 'api-test':
diff --git a/jjb/verify/onos-service.yaml b/jjb/verify/onos-service.yaml
index 8c87d63..59027ba 100644
--- a/jjb/verify/onos-service.yaml
+++ b/jjb/verify/onos-service.yaml
@@ -13,8 +13,10 @@
     name: 'verify-onos-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_onos-service_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_onos-service_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_onos-service_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/openstack.yaml b/jjb/verify/openstack.yaml
index 98eac1a..5efce1b 100644
--- a/jjb/verify/openstack.yaml
+++ b/jjb/verify/openstack.yaml
@@ -13,8 +13,10 @@
     name: 'verify-openstack-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_openstack_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_openstack_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_openstack_sonarqube'
       - 'api-test':
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
index bd0e683..9e75cd7 100644
--- a/jjb/verify/rcord.yaml
+++ b/jjb/verify/rcord.yaml
@@ -13,8 +13,10 @@
     name: 'verify-rcord-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_rcord_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_rcord_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_rcord_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/sdn-controller.yaml b/jjb/verify/sdn-controller.yaml
index 805124b..4ba8516 100644
--- a/jjb/verify/sdn-controller.yaml
+++ b/jjb/verify/sdn-controller.yaml
@@ -13,8 +13,10 @@
     name: 'verify-sdn-controller-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_sdn-controller_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_sdn-controller_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_sdn-controller_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/simpleexampleservice.yaml b/jjb/verify/simpleexampleservice.yaml
index 8184756..7f93703 100644
--- a/jjb/verify/simpleexampleservice.yaml
+++ b/jjb/verify/simpleexampleservice.yaml
@@ -13,8 +13,10 @@
     name: 'verify-simpleexampleservice-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_simpleexampleservice_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_simpleexampleservice_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_simpleexampleservice_sonarqube'
       - 'api-test':
diff --git a/jjb/verify/vEE.yaml b/jjb/verify/vEE.yaml
index 466172c..b14d607 100644
--- a/jjb/verify/vEE.yaml
+++ b/jjb/verify/vEE.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vEE-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_vEE_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_vEE_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_vEE_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vEG.yaml b/jjb/verify/vEG.yaml
index 720c740..cf2f94b 100644
--- a/jjb/verify/vEG.yaml
+++ b/jjb/verify/vEG.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vEG-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_vEG_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_vEG_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vEG_sonarqube'
       - 'api-test':
diff --git a/jjb/verify/vEPC.yaml b/jjb/verify/vEPC.yaml
index 4ad4366..84ede17 100644
--- a/jjb/verify/vEPC.yaml
+++ b/jjb/verify/vEPC.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vEPC-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_vEPC_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_vEPC_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_vEPC_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vHSS.yaml b/jjb/verify/vHSS.yaml
index e1f1317..ee347d2 100644
--- a/jjb/verify/vHSS.yaml
+++ b/jjb/verify/vHSS.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vHSS-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_vHSS_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_vHSS_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_vHSS_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vMME.yaml b/jjb/verify/vMME.yaml
index 7099e51..eb21c4e 100644
--- a/jjb/verify/vMME.yaml
+++ b/jjb/verify/vMME.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vMME-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_vMME_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_vMME_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_vMME_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/venb.yaml b/jjb/verify/venb.yaml
index b928b67..63e2882 100644
--- a/jjb/verify/venb.yaml
+++ b/jjb/verify/venb.yaml
@@ -13,8 +13,10 @@
     name: 'verify-venb-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_venb_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_venb_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_venb_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
index e0240b1..a66bf5a 100644
--- a/jjb/verify/vrouter.yaml
+++ b/jjb/verify/vrouter.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vrouter-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_vrouter_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_vrouter_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_vrouter_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vsg-hw.yaml b/jjb/verify/vsg-hw.yaml
index 3aad4a1..872ce0b 100644
--- a/jjb/verify/vsg-hw.yaml
+++ b/jjb/verify/vsg-hw.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vsg-hw-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - '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'
       - 'api-test':
diff --git a/jjb/verify/vsg.yaml b/jjb/verify/vsg.yaml
index bb3ad3a..730158f 100644
--- a/jjb/verify/vsg.yaml
+++ b/jjb/verify/vsg.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vsg-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_vsg_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_vsg_tag-collision'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vsg_sonarqube'
       - 'api-test':
diff --git a/jjb/verify/vspgwc.yaml b/jjb/verify/vspgwc.yaml
index 3e2431f..6e55246 100644
--- a/jjb/verify/vspgwc.yaml
+++ b/jjb/verify/vspgwc.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vspgwc-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_vspgwc_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_vspgwc_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_vspgwc_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vspgwu.yaml b/jjb/verify/vspgwu.yaml
index 77d55b5..543b906 100644
--- a/jjb/verify/vspgwu.yaml
+++ b/jjb/verify/vspgwu.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vspgwu-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_vspgwu_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_vspgwu_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_vspgwu_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vtn-service.yaml b/jjb/verify/vtn-service.yaml
index feab0a7..8f11c11 100644
--- a/jjb/verify/vtn-service.yaml
+++ b/jjb/verify/vtn-service.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vtn-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_vtn-service_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_vtn-service_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_vtn-service_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vtr.yaml b/jjb/verify/vtr.yaml
index 29437c5..6fea10b 100644
--- a/jjb/verify/vtr.yaml
+++ b/jjb/verify/vtr.yaml
@@ -13,8 +13,10 @@
     name: 'verify-vtr-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_vtr_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_vtr_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_vtr_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/xos-gui.yaml b/jjb/verify/xos-gui.yaml
index 8acd304..e88b61d 100644
--- a/jjb/verify/xos-gui.yaml
+++ b/jjb/verify/xos-gui.yaml
@@ -13,7 +13,9 @@
     name: 'verify-xos-gui-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - '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'
diff --git a/jjb/verify/xos-tosca.yaml b/jjb/verify/xos-tosca.yaml
index df2d896..fd1fd0f 100644
--- a/jjb/verify/xos-tosca.yaml
+++ b/jjb/verify/xos-tosca.yaml
@@ -13,8 +13,10 @@
     name: 'verify-xos-tosca-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_xos-tosca_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_xos-tosca_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_xos-tosca_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index 1a6ba4b..3bb889f 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -13,8 +13,10 @@
     name: 'verify-xos-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-sonarqube':
+      - 'tag-collision-reject':
           dependency-jobs: 'verify_xos_licensed'
+      - 'verify-sonarqube':
+          dependency-jobs: 'verify_xos_tag-collision'
       - 'api-test':
           dependency-jobs: 'verify_xos_sonarqube'
           pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/versioning.yaml b/jjb/versioning.yaml
index 020691b..73b1608 100644
--- a/jjb/versioning.yaml
+++ b/jjb/versioning.yaml
@@ -22,16 +22,14 @@
     name: versioning-jobs
 
     branch-regexp: '{modern-branches-regexp}'
-    project-regexp: '^bogus-project$'
-#    project-regexp: '{imagebuilder-projects-regexp}'
+    project-regexp: '{imagebuilder-projects-regexp}'
 
     jobs:
-      - 'tag-collision-reject'
       - 'version-tag'
 
 - job-template:
     id: tag-collision-reject
-    name: "tag-collision-reject"
+    name: "verify_{project}_tag-collision"
     description: |
       Created by {id} job-template from ci-management/jjb/versioning.yaml
       Checks for changes to version files, and that they don't duplicate tags
@@ -40,7 +38,7 @@
     triggers:
       - cord-infra-gerrit-trigger-patchset:
           gerrit-server-name: '{gerrit-server-name}'
-          project-regexp: '{project-regexp}'
+          project-regexp: '^{project}$'
           branch-regexp: '{branch-regexp}'
           file-include-regexp: '{all-files-regexp}'
           dependency-jobs: '{dependency-jobs}'