diff --git a/.coafile b/.coafile
deleted file mode 100644
index 3f6f8f4..0000000
--- a/.coafile
+++ /dev/null
@@ -1,33 +0,0 @@
-[GitCommit]
-bears = GitCommitBear
-ignore_length_regex = Signed-off-by,
-    Also-by,
-    Co-authored-by,
-    http://,
-    https://
-
-[JSON]
-bears = JSONFormatBear
-files = **/*.json
-ignore = .*/**
-indent_size = 2
-
-[YAML]
-bears = YAMLLintBear
-files = jjb/**/*.yaml
-document_start = True
-yamllint_config = yamllint.conf
-
-[ShellCheck]
-bears = ShellCheckBear,SpaceConsistencyBear
-files = jenkins-scripts/**/*.sh,
-    jjb/**/*.sh,
-    scripts/**/*.sh
-ignore = jenkins-scripts/*-local-env.sh,
-    jjb/global-jjb/shell/*.sh,
-    jjb/include-docker-push.sh,
-    jjb/include-update-pom-versions.sh,
-    jjb/testsuite/testsuite-docker.sh,
-shell = bash
-indent_size = 4
-use_spaces = yeah
diff --git a/global-jjb b/global-jjb
index 09659ce..7482b27 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 09659ce65d005b15595a44bbef6304fd3cc83ac1
+Subproject commit 7482b2720dc51e454bfad870d3ccdebbc11a12d2
diff --git a/jjb/api-test.yaml b/jjb/api-test.yaml
index c0f8c81..a46502f 100644
--- a/jjb/api-test.yaml
+++ b/jjb/api-test.yaml
@@ -66,6 +66,6 @@
     project-type: pipeline
     concurrent: true
 
-    dsl: !include-raw: pipeline/{pipeline-script}
+    dsl: !include-raw-verbatim: pipeline/{pipeline-script}
 
 # [EOF]
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 16980a6..754a051 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -12,6 +12,6 @@
     project: 'ci-management'
     project-name: 'ci-management'
 
-    jjb-version: 3.2.0
+    jjb-version: 6.4.1
 
 # [EOF]
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 3b6df79..45d3407 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -1,7 +1,7 @@
 ---
 # POD Nightly Build Pipeline Jobs
 
-- test-pipe-job-boiler-plate: &test-pipe-job-boiler-plate
+- _test-pipe-job-boiler-plate: &test-pipe-job-boiler-plate
     name: test-pipe-job-boiler-plate
 
     project-type: pipeline
diff --git a/jjb/verify/aaa.yaml b/jjb/verify/aaa.yaml
index fe503d3..e4c8b57 100644
--- a/jjb/verify/aaa.yaml
+++ b/jjb/verify/aaa.yaml
@@ -21,7 +21,6 @@
     name: 'aaa-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'aaa-jobs'
diff --git a/jjb/verify/acordion.yaml b/jjb/verify/acordion.yaml
index 989677c..ec15eb6 100644
--- a/jjb/verify/acordion.yaml
+++ b/jjb/verify/acordion.yaml
@@ -13,7 +13,5 @@
     name: 'verify-acordion-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_acordion_licensed'
 
 # [EOF]
diff --git a/jjb/verify/addressmanager.yaml b/jjb/verify/addressmanager.yaml
index d74e9be..811c0fe 100644
--- a/jjb/verify/addressmanager.yaml
+++ b/jjb/verify/addressmanager.yaml
@@ -13,8 +13,6 @@
     name: 'verify-addressmanager-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_addressmanager_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_addressmanager_tag-collision'
 
diff --git a/jjb/verify/alpine-grpc-base.yaml b/jjb/verify/alpine-grpc-base.yaml
index 1b14f2a..f4d9d6c 100644
--- a/jjb/verify/alpine-grpc-base.yaml
+++ b/jjb/verify/alpine-grpc-base.yaml
@@ -14,8 +14,6 @@
     name: 'verify-alpine-grpc-base-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_alpine-grpc-base_licensed'
 
 - job-group:
     name: 'publish-alpine-grpc-base-jobs'
diff --git a/jjb/verify/att-workflow-driver.yaml b/jjb/verify/att-workflow-driver.yaml
index 598eb33..a1cab88 100644
--- a/jjb/verify/att-workflow-driver.yaml
+++ b/jjb/verify/att-workflow-driver.yaml
@@ -14,8 +14,6 @@
     name: 'verify-att-workflow-driver-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_att-workflow-driver_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_att-workflow-driver_tag-collision'
       - 'xos-service-upgrade':
diff --git a/jjb/verify/automation-tools.yaml b/jjb/verify/automation-tools.yaml
index 695f327..02c0825 100644
--- a/jjb/verify/automation-tools.yaml
+++ b/jjb/verify/automation-tools.yaml
@@ -14,8 +14,6 @@
     name: 'verify-automation-tools-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_automation-tools_licensed'
       - 'verify-ansible-lint':
           skip-dirs: "comac comac-in-a-box"
           dependency-jobs: 'verify_automation-tools_tag-collision'
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index e7be2f6..25a66e9 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -45,8 +45,6 @@
     name: 'verify-bbsim-sadis-server-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_bbsim-sadis-server_licensed'
       - 'make-unit-test':
           build-node: 'ubuntu18.04-basebuild-1c-2g'
           dest-gopath: "github.com/opencord"
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 4631760..5702889 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -48,8 +48,6 @@
     name: 'verify-bbsim-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_bbsim_licensed'
       - 'make-unit-test':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
diff --git a/jjb/verify/bng.yaml b/jjb/verify/bng.yaml
index a7f111a..07c7207 100644
--- a/jjb/verify/bng.yaml
+++ b/jjb/verify/bng.yaml
@@ -13,7 +13,6 @@
     name: 'bng-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'maven-test'
       - 'maven-publish'
 
diff --git a/jjb/verify/certification.yaml b/jjb/verify/certification.yaml
index 6608548..ee90c80 100644
--- a/jjb/verify/certification.yaml
+++ b/jjb/verify/certification.yaml
@@ -13,7 +13,5 @@
     name: 'verify-certification-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_certification_licensed'
 
 # [EOF]
diff --git a/jjb/verify/chameleon.yaml b/jjb/verify/chameleon.yaml
index 8732965..06e3f15 100644
--- a/jjb/verify/chameleon.yaml
+++ b/jjb/verify/chameleon.yaml
@@ -15,11 +15,9 @@
     name: 'verify-chameleon-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_chameleon_licensed'
       - 'python-unit-test':
           dependency-jobs: 'verify_chameleon_tag-collision'
-      - 'xos-auth':
+      - 'xos-auth-test':
           dependency-jobs: 'verify_chameleon_unit-test'
 
 - job-group:
diff --git a/jjb/verify/comac-helm-charts.yaml b/jjb/verify/comac-helm-charts.yaml
index 246cfcd..39c2bcd 100644
--- a/jjb/verify/comac-helm-charts.yaml
+++ b/jjb/verify/comac-helm-charts.yaml
@@ -13,10 +13,6 @@
     name: 'verify-comac-helm-charts-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_comac-helm-charts_licensed'
-      - 'verify-helm-lint':
-          dependency-jobs: 'verify_comac-helm-charts_tag-collision'
 
 
 # [EOF]
diff --git a/jjb/verify/config.yaml b/jjb/verify/config.yaml
index 8b76f3b..59215f8 100644
--- a/jjb/verify/config.yaml
+++ b/jjb/verify/config.yaml
@@ -23,7 +23,6 @@
     name: 'config-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'config-jobs'
diff --git a/jjb/verify/cord-onos-publisher.yaml b/jjb/verify/cord-onos-publisher.yaml
index 14a900e..b009696 100644
--- a/jjb/verify/cord-onos-publisher.yaml
+++ b/jjb/verify/cord-onos-publisher.yaml
@@ -13,8 +13,6 @@
     name: 'verify-cord-onos-publisher-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_cord-onos-publisher_licensed'
 #      - 'make-unit-test':
 #         dest-gopath: "github.com/opencord"
 
diff --git a/jjb/verify/cord-platform.yaml b/jjb/verify/cord-platform.yaml
index a91328c..20f71da 100644
--- a/jjb/verify/cord-platform.yaml
+++ b/jjb/verify/cord-platform.yaml
@@ -13,7 +13,5 @@
     name: 'verify-cord-platform-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-helm-lint':
-          dependency-jobs: 'verify_cord-platform_licensed'
 
 # [EOF]
diff --git a/jjb/verify/cord-tester.yaml b/jjb/verify/cord-tester.yaml
index dd79d43..fb62766 100644
--- a/jjb/verify/cord-tester.yaml
+++ b/jjb/verify/cord-tester.yaml
@@ -16,8 +16,6 @@
     name: 'verify-cord-tester-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_cord-tester_licensed'
       - 'make-unit-test':
           dependency-jobs: 'verify_cord-tester_tag-collision'
           unit-test-targets: 'lint test'
diff --git a/jjb/verify/cord-workflow-airflow.yaml b/jjb/verify/cord-workflow-airflow.yaml
index e0bfeaf..e3052c2 100644
--- a/jjb/verify/cord-workflow-airflow.yaml
+++ b/jjb/verify/cord-workflow-airflow.yaml
@@ -17,8 +17,6 @@
     name: 'verify-cord-workflow-airflow-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_cord-workflow-airflow_licensed'
       - 'make-unit-test':
           dependency-jobs: 'verify_cord-workflow-airflow_tag-collision'
 
diff --git a/jjb/verify/cord-workflow-controller-client.yaml b/jjb/verify/cord-workflow-controller-client.yaml
index 4c5d53e..e8233be 100644
--- a/jjb/verify/cord-workflow-controller-client.yaml
+++ b/jjb/verify/cord-workflow-controller-client.yaml
@@ -18,8 +18,6 @@
     name: 'verify-cord-workflow-controller-client-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_cord-workflow-controller-client_licensed'
       - 'make-unit-test':
           dependency-jobs: 'verify_cord-workflow-controller-client_tag-collision'
 
diff --git a/jjb/verify/cord-workflow-controller.yaml b/jjb/verify/cord-workflow-controller.yaml
index fa2219c..4d8908b 100644
--- a/jjb/verify/cord-workflow-controller.yaml
+++ b/jjb/verify/cord-workflow-controller.yaml
@@ -17,8 +17,6 @@
     name: 'verify-cord-workflow-controller-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_cord-workflow-controller_licensed'
       - 'make-unit-test':
           dependency-jobs: 'verify_cord-workflow-controller_tag-collision'
 
diff --git a/jjb/verify/cord-workflow-probe.yaml b/jjb/verify/cord-workflow-probe.yaml
index d221af6..eb90a6b 100644
--- a/jjb/verify/cord-workflow-probe.yaml
+++ b/jjb/verify/cord-workflow-probe.yaml
@@ -15,8 +15,6 @@
     name: 'verify-cord-workflow-probe-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_cord-workflow-probe_licensed'
       - 'make-unit-test':
           dependency-jobs: 'verify_cord-workflow-probe_tag-collision'
           junit-allow-empty-results: true
diff --git a/jjb/verify/cord-workflow.yaml b/jjb/verify/cord-workflow.yaml
index 6ab0af3..fe1c678 100644
--- a/jjb/verify/cord-workflow.yaml
+++ b/jjb/verify/cord-workflow.yaml
@@ -15,8 +15,6 @@
     name: 'verify-cord-workflow-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_cord-workflow_licensed'
       - 'make-unit-test':
           dependency-jobs: 'verify_cord-workflow_tag-collision'
 
diff --git a/jjb/verify/cordctl.yaml b/jjb/verify/cordctl.yaml
index 6116376..17b65a3 100644
--- a/jjb/verify/cordctl.yaml
+++ b/jjb/verify/cordctl.yaml
@@ -17,8 +17,6 @@
     name: 'verify-cordctl-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_cordctl_licensed'
       - 'make-unit-test':
           unit-test-targets: 'lint test'
           unit-test-keep-going: 'false'
diff --git a/jjb/verify/device-management-interface.yaml b/jjb/verify/device-management-interface.yaml
index 83cc7f0..fa33a0f 100644
--- a/jjb/verify/device-management-interface.yaml
+++ b/jjb/verify/device-management-interface.yaml
@@ -17,7 +17,6 @@
     name: 'verify-device-management-interface-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test':
           junit-allow-empty-results: true
 
diff --git a/jjb/verify/device-management.yaml b/jjb/verify/device-management.yaml
index 258e9a7..155796f 100644
--- a/jjb/verify/device-management.yaml
+++ b/jjb/verify/device-management.yaml
@@ -15,8 +15,6 @@
     name: 'verify-device-management-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_device-management_licensed'
       - 'make-unit-test':
           junit-allow-empty-results: true
           build-node: 'ubuntu18.04-basebuild-2c-4g'
diff --git a/jjb/verify/dhcpl2relay.yaml b/jjb/verify/dhcpl2relay.yaml
index 122dad6..a40205f 100644
--- a/jjb/verify/dhcpl2relay.yaml
+++ b/jjb/verify/dhcpl2relay.yaml
@@ -21,7 +21,6 @@
     name: 'dhcpl2relay-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'dhcpl2relay-jobs'
diff --git a/jjb/verify/dt-workflow-driver.yaml b/jjb/verify/dt-workflow-driver.yaml
index 6c050b9..e895cf0 100644
--- a/jjb/verify/dt-workflow-driver.yaml
+++ b/jjb/verify/dt-workflow-driver.yaml
@@ -14,8 +14,6 @@
     name: 'verify-dt-workflow-driver-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_dt-workflow-driver_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_dt-workflow-driver_tag-collision'
       - 'xos-service-upgrade':
diff --git a/jjb/verify/ecord.yaml b/jjb/verify/ecord.yaml
index 9b8bffa..45932bb 100644
--- a/jjb/verify/ecord.yaml
+++ b/jjb/verify/ecord.yaml
@@ -13,8 +13,6 @@
     name: 'verify-ecord-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_ecord_licensed'
       - 'verify-ansible-lint':
           dependency-jobs: 'verify_ecord_tag-collision'
 
diff --git a/jjb/verify/epc-service.yaml b/jjb/verify/epc-service.yaml
index 6e85d1e..0d62eb4 100644
--- a/jjb/verify/epc-service.yaml
+++ b/jjb/verify/epc-service.yaml
@@ -13,7 +13,5 @@
     name: 'verify-epc-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_epc-service_licensed'
 
 # [EOF]
diff --git a/jjb/verify/exampleservice.yaml b/jjb/verify/exampleservice.yaml
index b312cd8..645effc 100644
--- a/jjb/verify/exampleservice.yaml
+++ b/jjb/verify/exampleservice.yaml
@@ -13,7 +13,5 @@
     name: 'verify-exampleservice-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_exampleservice_licensed'
 
 # [EOF]
diff --git a/jjb/verify/fabric-crossconnect.yaml b/jjb/verify/fabric-crossconnect.yaml
index d7fa79f..0cfa9e8 100644
--- a/jjb/verify/fabric-crossconnect.yaml
+++ b/jjb/verify/fabric-crossconnect.yaml
@@ -14,8 +14,6 @@
     name: 'verify-fabric-crossconnect-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_fabric-crossconnect_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_fabric-crossconnect_tag-collision'
       - 'xos-service-upgrade':
diff --git a/jjb/verify/fabric-tofino.yaml b/jjb/verify/fabric-tofino.yaml
index 551025a..cfcd583 100644
--- a/jjb/verify/fabric-tofino.yaml
+++ b/jjb/verify/fabric-tofino.yaml
@@ -17,7 +17,6 @@
     name: 'fabric-tofino-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'fabric-tofino-jobs'
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index b08a1b6..4263699 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -14,8 +14,6 @@
     name: 'verify-fabric-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_fabric_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_fabric_tag-collision'
       - 'xos-service-upgrade':
diff --git a/jjb/verify/goloxi.yaml b/jjb/verify/goloxi.yaml
index a43da96..21f82eb 100644
--- a/jjb/verify/goloxi.yaml
+++ b/jjb/verify/goloxi.yaml
@@ -13,7 +13,6 @@
     name: 'verify-goloxi-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test':
           unit-test-targets: 'test'
           junit-allow-empty-results: true
diff --git a/jjb/verify/grpc-robot.yaml b/jjb/verify/grpc-robot.yaml
index 8f08409..f64ee70 100644
--- a/jjb/verify/grpc-robot.yaml
+++ b/jjb/verify/grpc-robot.yaml
@@ -16,7 +16,6 @@
     name: 'verify-grpc-robot-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test':
           junit-allow-empty-results: true
 
diff --git a/jjb/verify/hippie-oss.yaml b/jjb/verify/hippie-oss.yaml
index 9abbc9d..9fba872 100644
--- a/jjb/verify/hippie-oss.yaml
+++ b/jjb/verify/hippie-oss.yaml
@@ -13,8 +13,6 @@
     name: 'verify-hippie-oss-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_hippie-oss_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_hippie-oss_tag-collision'
 
diff --git a/jjb/verify/hss_db.yaml b/jjb/verify/hss_db.yaml
index b481ef6..8ec7707 100644
--- a/jjb/verify/hss_db.yaml
+++ b/jjb/verify/hss_db.yaml
@@ -13,7 +13,5 @@
     name: 'verify-hss_db-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_hss_db_licensed'
 
 # [EOF]
diff --git a/jjb/verify/igmp.yaml b/jjb/verify/igmp.yaml
index 7ca56ca..829c266 100644
--- a/jjb/verify/igmp.yaml
+++ b/jjb/verify/igmp.yaml
@@ -21,7 +21,6 @@
     name: 'igmp-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'igmp-jobs'
diff --git a/jjb/verify/igmpproxy.yaml b/jjb/verify/igmpproxy.yaml
index 79e8ea7..984c665 100644
--- a/jjb/verify/igmpproxy.yaml
+++ b/jjb/verify/igmpproxy.yaml
@@ -23,7 +23,6 @@
     name: 'igmpproxy-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'igmpproxy-jobs'
diff --git a/jjb/verify/internetemulator.yaml b/jjb/verify/internetemulator.yaml
index c454d38..113fddb 100644
--- a/jjb/verify/internetemulator.yaml
+++ b/jjb/verify/internetemulator.yaml
@@ -13,7 +13,5 @@
     name: 'verify-internetemulator-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_internetemulator_licensed'
 
 # [EOF]
diff --git a/jjb/verify/k8sepcservice.yaml b/jjb/verify/k8sepcservice.yaml
index 635bdd7..f7d5b6e 100644
--- a/jjb/verify/k8sepcservice.yaml
+++ b/jjb/verify/k8sepcservice.yaml
@@ -13,8 +13,6 @@
     name: 'verify-k8sepcservice-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_k8sepcservice_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_k8sepcservice_tag-collision'
 
diff --git a/jjb/verify/kafka-onos.yaml b/jjb/verify/kafka-onos.yaml
index ebac7bd..70a7bcb 100644
--- a/jjb/verify/kafka-onos.yaml
+++ b/jjb/verify/kafka-onos.yaml
@@ -23,7 +23,6 @@
     name: 'kafka-onos-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'kafka-onos-jobs'
diff --git a/jjb/verify/kafka-robot.yaml b/jjb/verify/kafka-robot.yaml
index b0a85b5..7a7e61b 100644
--- a/jjb/verify/kafka-robot.yaml
+++ b/jjb/verify/kafka-robot.yaml
@@ -16,7 +16,6 @@
     name: 'verify-kafka-robot-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test':
           junit-allow-empty-results: true
 
diff --git a/jjb/verify/kafka-topic-exporter.yaml b/jjb/verify/kafka-topic-exporter.yaml
index ab4033f..7ec7d1c 100644
--- a/jjb/verify/kafka-topic-exporter.yaml
+++ b/jjb/verify/kafka-topic-exporter.yaml
@@ -14,8 +14,6 @@
     name: 'verify-kafka-topic-exporter-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_kafka-topic-exporter_licensed'
       - 'make-unit-test':
           build-timeout: 30
           unit-test-targets: 'test docker-build'
diff --git a/jjb/verify/kafkaloghandler.yaml b/jjb/verify/kafkaloghandler.yaml
index 089213d..52c5e84 100644
--- a/jjb/verify/kafkaloghandler.yaml
+++ b/jjb/verify/kafkaloghandler.yaml
@@ -13,8 +13,6 @@
     name: 'verify-kafkaloghandler-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_kafkaloghandler_licensed'
       - 'python-unit-test':
           dependency-jobs: 'verify_kafkaloghandler_tag-collision'
 
diff --git a/jjb/verify/kubernetes-service.yaml b/jjb/verify/kubernetes-service.yaml
index faf3458..2a0d2e8 100644
--- a/jjb/verify/kubernetes-service.yaml
+++ b/jjb/verify/kubernetes-service.yaml
@@ -14,8 +14,6 @@
     name: 'verify-kubernetes-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_kubernetes-service_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_kubernetes-service_tag-collision'
       - 'xos-service-upgrade':
diff --git a/jjb/verify/mac-learning.yaml b/jjb/verify/mac-learning.yaml
index 8a4b3f7..99413cd 100644
--- a/jjb/verify/mac-learning.yaml
+++ b/jjb/verify/mac-learning.yaml
@@ -13,7 +13,6 @@
     name: 'mac-learning-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'maven-test'
       - 'maven-publish'
 
diff --git a/jjb/verify/mcast.yaml b/jjb/verify/mcast.yaml
index 493bd73..5735ba7 100644
--- a/jjb/verify/mcast.yaml
+++ b/jjb/verify/mcast.yaml
@@ -23,7 +23,6 @@
     name: 'mcast-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'mcast-jobs'
diff --git a/jjb/verify/mcord.yaml b/jjb/verify/mcord.yaml
index 4c1fe6d..f356f41 100644
--- a/jjb/verify/mcord.yaml
+++ b/jjb/verify/mcord.yaml
@@ -15,7 +15,5 @@
       - 'verify-licensed'
       - 'verify-ansible-lint':
           dependency-jobs: 'verify_mcord_licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_mcord_ansible-lint'
 
 # [EOF]
diff --git a/jjb/verify/mn-stratum-siab.yaml b/jjb/verify/mn-stratum-siab.yaml
index 2764ff1..eb6356f 100644
--- a/jjb/verify/mn-stratum-siab.yaml
+++ b/jjb/verify/mn-stratum-siab.yaml
@@ -14,7 +14,6 @@
     name: 'verify-mn-stratum-siab-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test':
           unit-test-targets: 'test'
           junit-allow-empty-results: true
diff --git a/jjb/verify/multifabric.yaml b/jjb/verify/multifabric.yaml
index de187d9..af6c400 100644
--- a/jjb/verify/multifabric.yaml
+++ b/jjb/verify/multifabric.yaml
@@ -14,7 +14,6 @@
     name: 'verify-multifabric-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test':
           unit-test-targets: 'test docker-build'
           junit-allow-empty-results: true
diff --git a/jjb/verify/multistructlog.yaml b/jjb/verify/multistructlog.yaml
index 6fee434..db4358d 100644
--- a/jjb/verify/multistructlog.yaml
+++ b/jjb/verify/multistructlog.yaml
@@ -13,8 +13,6 @@
     name: 'verify-multistructlog-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_multistructlog_licensed'
       - 'python-unit-test':
           dependency-jobs: 'verify_multistructlog_tag-collision'
 
diff --git a/jjb/verify/nem-ondemand-proxy.yaml b/jjb/verify/nem-ondemand-proxy.yaml
index 7612ac5..27a301a 100644
--- a/jjb/verify/nem-ondemand-proxy.yaml
+++ b/jjb/verify/nem-ondemand-proxy.yaml
@@ -14,7 +14,6 @@
     name: 'verify-nem-ondemand-proxy-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
       - 'make-unit-test':
           unit-test-targets: 'docker-build lint'
           junit-allow-empty-results: true
diff --git a/jjb/verify/ntt-workflow-driver.yaml b/jjb/verify/ntt-workflow-driver.yaml
index 94f7b04..9f69dbe 100644
--- a/jjb/verify/ntt-workflow-driver.yaml
+++ b/jjb/verify/ntt-workflow-driver.yaml
@@ -14,8 +14,6 @@
     name: 'verify-ntt-workflow-driver-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_ntt-workflow-driver_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_ntt-workflow-driver_tag-collision'
       - 'xos-service-upgrade':
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index a39b218..8c480a7 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -29,8 +29,6 @@
     name: 'verify-ofagent-go-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_ofagent-go_licensed'
       - 'make-unit-test':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
index 9c54818..82e080c 100644
--- a/jjb/verify/olt-service.yaml
+++ b/jjb/verify/olt-service.yaml
@@ -14,8 +14,6 @@
     name: 'verify-olt-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_olt-service_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_olt-service_tag-collision'
       - 'xos-service-upgrade':
diff --git a/jjb/verify/olt.yaml b/jjb/verify/olt.yaml
index 7408f0d..74c023c 100644
--- a/jjb/verify/olt.yaml
+++ b/jjb/verify/olt.yaml
@@ -21,7 +21,6 @@
     name: 'olt-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'olt-jobs'
diff --git a/jjb/verify/olttopology.yaml b/jjb/verify/olttopology.yaml
index 24533fa..fef489e 100644
--- a/jjb/verify/olttopology.yaml
+++ b/jjb/verify/olttopology.yaml
@@ -13,7 +13,6 @@
     name: 'olttopology-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'olttopology-jobs'
diff --git a/jjb/verify/omci-lib-go.yaml b/jjb/verify/omci-lib-go.yaml
index 288b4b5..3b8a8f2 100644
--- a/jjb/verify/omci-lib-go.yaml
+++ b/jjb/verify/omci-lib-go.yaml
@@ -13,7 +13,6 @@
     name: 'verify-omci-lib-go-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test'
 
 # [EOF]
diff --git a/jjb/verify/omec-cni.yaml b/jjb/verify/omec-cni.yaml
index 673838b..5db70ec 100644
--- a/jjb/verify/omec-cni.yaml
+++ b/jjb/verify/omec-cni.yaml
@@ -14,8 +14,6 @@
     name: 'verify-omec-cni-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_omec-cni_licensed'
       - 'make-unit-test':
           build-timeout: 30
           junit-allow-empty-results: true
diff --git a/jjb/verify/omec-pod-init.yaml b/jjb/verify/omec-pod-init.yaml
index 616d05b..81ad208 100644
--- a/jjb/verify/omec-pod-init.yaml
+++ b/jjb/verify/omec-pod-init.yaml
@@ -14,8 +14,6 @@
     name: 'verify-omec-pod-init-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_omec-pod-init_licensed'
       - 'make-unit-test':
           build-timeout: 30
           junit-allow-empty-results: true
diff --git a/jjb/verify/onos-classic-helm-utils.yaml b/jjb/verify/onos-classic-helm-utils.yaml
index f4813c0..341f226 100644
--- a/jjb/verify/onos-classic-helm-utils.yaml
+++ b/jjb/verify/onos-classic-helm-utils.yaml
@@ -14,8 +14,6 @@
     name: 'verify-onos-classic-helm-utils-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_onos-classic-helm-utils_licensed'
       - 'make-unit-test':
           build-timeout: 30
           unit-test-targets: 'docker-build'
diff --git a/jjb/verify/onos-service.yaml b/jjb/verify/onos-service.yaml
index 9eaed37..228d078 100644
--- a/jjb/verify/onos-service.yaml
+++ b/jjb/verify/onos-service.yaml
@@ -14,8 +14,6 @@
     name: 'verify-onos-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_onos-service_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_onos-service_tag-collision'
       - 'xos-service-upgrade':
diff --git a/jjb/verify/openairinterface.yaml b/jjb/verify/openairinterface.yaml
index 061b69b..8eec392 100644
--- a/jjb/verify/openairinterface.yaml
+++ b/jjb/verify/openairinterface.yaml
@@ -14,8 +14,6 @@
     name: 'verify-openairinterface-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_openairinterface_licensed'
       - 'make-unit-test':
           build-timeout: 60
           junit-allow-empty-results: true
diff --git a/jjb/verify/opendevice-manager.yaml b/jjb/verify/opendevice-manager.yaml
index eee0345..008118e 100644
--- a/jjb/verify/opendevice-manager.yaml
+++ b/jjb/verify/opendevice-manager.yaml
@@ -15,7 +15,6 @@
     name: 'verify-opendevice-manager-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test':
           build-node: 'ubuntu18.04-basebuild-2c-4g'
           unit-test-targets: 'test'
diff --git a/jjb/verify/opendm-agent.yaml b/jjb/verify/opendm-agent.yaml
index 5e48c4d..d89306c 100644
--- a/jjb/verify/opendm-agent.yaml
+++ b/jjb/verify/opendm-agent.yaml
@@ -13,7 +13,6 @@
     name: 'verify-opendm-agent-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test':
           build-node: 'ubuntu18.04-basebuild-2c-4g'
           unit-test-targets: 'test'
diff --git a/jjb/verify/openolt-scale-tester.yaml b/jjb/verify/openolt-scale-tester.yaml
index 7c6010a..34a0389 100644
--- a/jjb/verify/openolt-scale-tester.yaml
+++ b/jjb/verify/openolt-scale-tester.yaml
@@ -15,8 +15,6 @@
     name: 'verify-openolt-scale-tester-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_openolt-scale-tester_licensed'
       - 'make-unit-test':
           dest-gopath: "github.com/opencord"
           unit-test-targets: 'test'
diff --git a/jjb/verify/openolt-test.yaml b/jjb/verify/openolt-test.yaml
index 01cfb0b..8c053a7 100644
--- a/jjb/verify/openolt-test.yaml
+++ b/jjb/verify/openolt-test.yaml
@@ -14,7 +14,6 @@
     name: 'verify-openolt-test-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test':
           build-node: 'ubuntu18.04-basebuild-2c-4g'
           build-timeout: 60
diff --git a/jjb/verify/openolt.yaml b/jjb/verify/openolt.yaml
index b23b187..f980cbc 100644
--- a/jjb/verify/openolt.yaml
+++ b/jjb/verify/openolt.yaml
@@ -13,7 +13,6 @@
     name: 'verify-openolt-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test':
           build-node: 'ubuntu18.04-basebuild-2c-4g'
           unit-test-targets: 'test'
diff --git a/jjb/verify/openstack.yaml b/jjb/verify/openstack.yaml
index ae8ebe4..cdb2e86 100644
--- a/jjb/verify/openstack.yaml
+++ b/jjb/verify/openstack.yaml
@@ -13,8 +13,6 @@
     name: 'verify-openstack-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_openstack_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_openstack_tag-collision'
 
diff --git a/jjb/verify/plyxproto.yaml b/jjb/verify/plyxproto.yaml
index 2054767..a419d90 100644
--- a/jjb/verify/plyxproto.yaml
+++ b/jjb/verify/plyxproto.yaml
@@ -16,8 +16,6 @@
     name: 'verify-plyxproto-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_plyxproto_licensed'
       - 'python-unit-test':
 
 - job-group:
diff --git a/jjb/verify/pppoeagent.yaml b/jjb/verify/pppoeagent.yaml
index d620774..32e8393 100644
--- a/jjb/verify/pppoeagent.yaml
+++ b/jjb/verify/pppoeagent.yaml
@@ -13,7 +13,6 @@
     name: 'pppoeagent-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'maven-test'
       - 'maven-publish'
 
diff --git a/jjb/verify/pppoel2relay.yaml b/jjb/verify/pppoel2relay.yaml
index 855f4f6..8c4dfe3 100644
--- a/jjb/verify/pppoel2relay.yaml
+++ b/jjb/verify/pppoel2relay.yaml
@@ -13,7 +13,6 @@
     name: 'pppoel2relay-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'maven-test'
       - 'maven-publish'
 
diff --git a/jjb/verify/progran.yaml b/jjb/verify/progran.yaml
index 2df3f40..c3297bb 100644
--- a/jjb/verify/progran.yaml
+++ b/jjb/verify/progran.yaml
@@ -13,7 +13,5 @@
     name: 'verify-progran-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_progran_licensed'
 
 # [EOF]
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
index 2bf9bbb..1b15eab 100644
--- a/jjb/verify/rcord.yaml
+++ b/jjb/verify/rcord.yaml
@@ -14,8 +14,6 @@
     name: 'verify-rcord-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_rcord_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_rcord_tag-collision'
       - 'xos-service-upgrade':
diff --git a/jjb/verify/sadis-server.yaml b/jjb/verify/sadis-server.yaml
index 5b03717..bfa7b6e 100644
--- a/jjb/verify/sadis-server.yaml
+++ b/jjb/verify/sadis-server.yaml
@@ -13,8 +13,6 @@
     name: 'verify-sadis-server-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_sadis-server_licensed'
       - 'sadis-server-tests':
           dependency-jobs: 'verify_sadis-server_tag-collision'
 
diff --git a/jjb/verify/sadis.yaml b/jjb/verify/sadis.yaml
index a3e37c1..f9ee810 100644
--- a/jjb/verify/sadis.yaml
+++ b/jjb/verify/sadis.yaml
@@ -21,7 +21,6 @@
     name: 'sadis-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'sadis-jobs'
diff --git a/jjb/verify/sdn-controller.yaml b/jjb/verify/sdn-controller.yaml
index 2ed6945..e2838f2 100644
--- a/jjb/verify/sdn-controller.yaml
+++ b/jjb/verify/sdn-controller.yaml
@@ -13,7 +13,5 @@
     name: 'verify-sdn-controller-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_sdn-controller_licensed'
 
 # [EOF]
diff --git a/jjb/verify/seba.yaml b/jjb/verify/seba.yaml
index 5c2379c..d8e9fee 100644
--- a/jjb/verify/seba.yaml
+++ b/jjb/verify/seba.yaml
@@ -13,7 +13,5 @@
     name: 'verify-seba-jobs'
     jobs:
       - 'verify-licensed'
-      - 'verify-helm-lint':
-          dependency-jobs: 'verify_seba_licensed'
 
 # [EOF]
diff --git a/jjb/verify/simpleexampleservice.yaml b/jjb/verify/simpleexampleservice.yaml
index 8a77ccf..2a195c0 100644
--- a/jjb/verify/simpleexampleservice.yaml
+++ b/jjb/verify/simpleexampleservice.yaml
@@ -14,8 +14,6 @@
     name: 'verify-simpleexampleservice-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_simpleexampleservice_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_simpleexampleservice_tag-collision'
       - 'xos-service-upgrade':
diff --git a/jjb/verify/tt-workflow-driver.yaml b/jjb/verify/tt-workflow-driver.yaml
index 8125c4a..4eced6c 100644
--- a/jjb/verify/tt-workflow-driver.yaml
+++ b/jjb/verify/tt-workflow-driver.yaml
@@ -14,8 +14,6 @@
     name: 'verify-tt-workflow-driver-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_tt-workflow-driver_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_tt-workflow-driver_tag-collision'
 
diff --git a/jjb/verify/vEE.yaml b/jjb/verify/vEE.yaml
index a488a25..bea359e 100644
--- a/jjb/verify/vEE.yaml
+++ b/jjb/verify/vEE.yaml
@@ -13,7 +13,5 @@
     name: 'verify-vEE-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vEE_licensed'
 
 # [EOF]
diff --git a/jjb/verify/vEG.yaml b/jjb/verify/vEG.yaml
index e3fa896..3c863db 100644
--- a/jjb/verify/vEG.yaml
+++ b/jjb/verify/vEG.yaml
@@ -13,8 +13,6 @@
     name: 'verify-vEG-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vEG_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vEG_tag-collision'
 
diff --git a/jjb/verify/vEPC.yaml b/jjb/verify/vEPC.yaml
index 0705ea9..12bf8a6 100644
--- a/jjb/verify/vEPC.yaml
+++ b/jjb/verify/vEPC.yaml
@@ -13,7 +13,5 @@
     name: 'verify-vEPC-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vEPC_licensed'
 
 # [EOF]
diff --git a/jjb/verify/vHSS.yaml b/jjb/verify/vHSS.yaml
index 7c54008..23bcca9 100644
--- a/jjb/verify/vHSS.yaml
+++ b/jjb/verify/vHSS.yaml
@@ -13,7 +13,5 @@
     name: 'verify-vHSS-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vHSS_licensed'
 
 # [EOF]
diff --git a/jjb/verify/vMME.yaml b/jjb/verify/vMME.yaml
index 25ada24..923a24a 100644
--- a/jjb/verify/vMME.yaml
+++ b/jjb/verify/vMME.yaml
@@ -13,7 +13,5 @@
     name: 'verify-vMME-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vMME_licensed'
 
 # [EOF]
diff --git a/jjb/verify/venb.yaml b/jjb/verify/venb.yaml
index 8d18fdc..3f45669 100644
--- a/jjb/verify/venb.yaml
+++ b/jjb/verify/venb.yaml
@@ -13,7 +13,5 @@
     name: 'verify-venb-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_venb_licensed'
 
 # [EOF]
diff --git a/jjb/verify/ves-agent.yaml b/jjb/verify/ves-agent.yaml
index 88b6fd9..6448a72 100644
--- a/jjb/verify/ves-agent.yaml
+++ b/jjb/verify/ves-agent.yaml
@@ -13,7 +13,5 @@
     name: 'verify-ves-agent-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_ves-agent_licensed'
 
 # [EOF]
diff --git a/jjb/verify/vnaas.yaml b/jjb/verify/vnaas.yaml
index 50d7c98..93f7ce9 100644
--- a/jjb/verify/vnaas.yaml
+++ b/jjb/verify/vnaas.yaml
@@ -13,8 +13,6 @@
     name: 'verify-vnaas-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vnaas_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vnaas_tag-collision'
 #
diff --git a/jjb/verify/voltctl.yaml b/jjb/verify/voltctl.yaml
index a0be6f0..3d6209b 100644
--- a/jjb/verify/voltctl.yaml
+++ b/jjb/verify/voltctl.yaml
@@ -17,8 +17,6 @@
     name: 'verify-voltctl-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltctl_licensed'
       - 'make-unit-test':
           build-node: 'ubuntu18.04-basebuild-2c-4g'
           unit-test-targets: 'lint sca test'
diff --git a/jjb/verify/voltha-adtran-adapter.yaml b/jjb/verify/voltha-adtran-adapter.yaml
index 5467bd7..7896ebe 100644
--- a/jjb/verify/voltha-adtran-adapter.yaml
+++ b/jjb/verify/voltha-adtran-adapter.yaml
@@ -13,8 +13,6 @@
     name: 'verify-voltha-adtran-adapter-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-adtran-adapter_licensed'
 #     - 'python-unit-test':
 #         dependency-jobs: 'verify_voltha-adtran-adapter_tag-collision'
 
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index 90cd1b4..073745f 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -46,8 +46,6 @@
     name: 'verify-voltha-api-server-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-api-server_licensed'
       - 'make-unit-test':
           build-node: 'ubuntu18.04-basebuild-2c-4g'
           dest-gopath: "github.com/opencord"
@@ -62,8 +60,6 @@
     name: 'verify-voltha-api-server-jobs-voltha-2.8'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-api-server_licensed'
       - 'make-unit-test':
           build-node: 'ubuntu18.04-basebuild-2c-4g'
           dest-gopath: "github.com/opencord"
diff --git a/jjb/verify/voltha-docker-tools.yaml b/jjb/verify/voltha-docker-tools.yaml
index 8136dac..be1c50d 100644
--- a/jjb/verify/voltha-docker-tools.yaml
+++ b/jjb/verify/voltha-docker-tools.yaml
@@ -14,8 +14,6 @@
     name: 'verify-voltha-docker-tools-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-docker-tools_licensed'
       - 'make-unit-test':
           build-timeout: 30
           unit-test-targets: 'docker-build lint'
diff --git a/jjb/verify/voltha-eponolt-adapter.yaml b/jjb/verify/voltha-eponolt-adapter.yaml
index daa2481..fb83ae4 100644
--- a/jjb/verify/voltha-eponolt-adapter.yaml
+++ b/jjb/verify/voltha-eponolt-adapter.yaml
@@ -15,8 +15,6 @@
     name: 'verify-voltha-eponolt-adapter-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-eponolt-adapter_licensed'
       - 'make-unit-test':
           dest-gopath: "github.com/opencord"
           unit-test-targets: 'lint sca test'
diff --git a/jjb/verify/voltha-epononu-adapter.yaml b/jjb/verify/voltha-epononu-adapter.yaml
index aa8eaf7..2700e07 100644
--- a/jjb/verify/voltha-epononu-adapter.yaml
+++ b/jjb/verify/voltha-epononu-adapter.yaml
@@ -15,8 +15,6 @@
     name: 'verify-voltha-epononu-adapter-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-epononu-adapter_licensed'
       - 'make-unit-test':
           unit-test-targets: 'test'
           unit-test-keep-going: 'false'
diff --git a/jjb/verify/voltha-go-controller.yaml b/jjb/verify/voltha-go-controller.yaml
index ac90812..a8cab50 100644
--- a/jjb/verify/voltha-go-controller.yaml
+++ b/jjb/verify/voltha-go-controller.yaml
@@ -13,8 +13,6 @@
     name: 'verify-voltha-go-controller-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-go-controller_licensed'
       - 'make-unit-test':
           build-node: 'ubuntu18.04-basebuild-1c-2g'
           dest-gopath: "github.com/opencord"
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index a0bf4b1..f30944c 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -29,8 +29,6 @@
     name: 'verify-voltha-go-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-go_licensed'
       - 'make-unit-test':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
diff --git a/jjb/verify/voltha-lib-go.yaml b/jjb/verify/voltha-lib-go.yaml
index 9203685..332870e 100644
--- a/jjb/verify/voltha-lib-go.yaml
+++ b/jjb/verify/voltha-lib-go.yaml
@@ -34,8 +34,6 @@
     name: 'verify-voltha-lib-go-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-lib-go_licensed'
       - 'make-unit-test':
 #          build-node: 'ubuntu18.04-basebuild-4c-8g'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
diff --git a/jjb/verify/voltha-northbound-bbf-adapter.yaml b/jjb/verify/voltha-northbound-bbf-adapter.yaml
index 19de589..c16d7d7 100644
--- a/jjb/verify/voltha-northbound-bbf-adapter.yaml
+++ b/jjb/verify/voltha-northbound-bbf-adapter.yaml
@@ -17,8 +17,6 @@
     name: 'voltha-northbound-bbf-adapter'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-northbound-bbf-adapter_licensed'
       - 'make-unit-test':
           # build-node: 'ubuntu18.04-basebuild-4c-8g'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 68c648b..5ed7188 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -25,8 +25,6 @@
     name: 'verify-voltha-onos-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-onos_licensed'
 
 - job-group:
     name: 'verify-voltha-onos-jobs-voltha-2.12'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 3697c96..c984e1f 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -25,8 +25,6 @@
     name: 'verify-voltha-openolt-adapter-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-openolt-adapter_licensed'
       - 'make-unit-test':
           dest-gopath: "github.com/opencord"
           name-extension: "-lint"
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 49ef6a5..38af390 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -29,7 +29,6 @@
     name: 'verify-voltha-openonu-adapter-go-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
       - 'make-unit-test':
           dest-gopath: "github.com/opencord"
           name-extension: "-lint"
diff --git a/jjb/verify/voltha-protos.yaml b/jjb/verify/voltha-protos.yaml
index 99c98e8..91d0e31 100644
--- a/jjb/verify/voltha-protos.yaml
+++ b/jjb/verify/voltha-protos.yaml
@@ -17,7 +17,6 @@
     name: 'verify-voltha-protos-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
       - 'make-unit-test':
 #          build-node: 'ubuntu18.04-basebuild-2c-4g'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index f933b63..44f7449 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -36,8 +36,6 @@
     name: 'verify-voltha-system-tests-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-system-tests_licensed'
       - 'make-unit-test':
           dependency-jobs: 'verify_voltha-system-tests_tag-collision'
           unit-test-targets: 'lint'
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
index 93d1d58..2d3d5b8 100644
--- a/jjb/verify/vrouter.yaml
+++ b/jjb/verify/vrouter.yaml
@@ -14,8 +14,6 @@
     name: 'verify-vrouter-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vrouter_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vrouter_tag-collision'
 
diff --git a/jjb/verify/vsg-hw.yaml b/jjb/verify/vsg-hw.yaml
index f61ec2f..669ec11 100644
--- a/jjb/verify/vsg-hw.yaml
+++ b/jjb/verify/vsg-hw.yaml
@@ -33,8 +33,6 @@
     name: 'verify-vsg-hw-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vsg-hw_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vsg-hw_tag-collision'
 
diff --git a/jjb/verify/vsg.yaml b/jjb/verify/vsg.yaml
index 1f7f57f..4179d21 100644
--- a/jjb/verify/vsg.yaml
+++ b/jjb/verify/vsg.yaml
@@ -33,8 +33,6 @@
     name: 'verify-vsg-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vsg_licensed'
       - 'xos-unit-test':
           dependency-jobs: 'verify_vsg_tag-collision'
 
diff --git a/jjb/verify/vspgwc.yaml b/jjb/verify/vspgwc.yaml
index 9e4b876..05049ed 100644
--- a/jjb/verify/vspgwc.yaml
+++ b/jjb/verify/vspgwc.yaml
@@ -33,7 +33,5 @@
     name: 'verify-vspgwc-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vspgwc_licensed'
 
 # [EOF]
diff --git a/jjb/verify/vspgwu.yaml b/jjb/verify/vspgwu.yaml
index d8553e8..fb6771d 100644
--- a/jjb/verify/vspgwu.yaml
+++ b/jjb/verify/vspgwu.yaml
@@ -33,7 +33,5 @@
     name: 'verify-vspgwu-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vspgwu_licensed'
 
 # [EOF]
diff --git a/jjb/verify/vtn-service.yaml b/jjb/verify/vtn-service.yaml
index f0f6477..54effe4 100644
--- a/jjb/verify/vtn-service.yaml
+++ b/jjb/verify/vtn-service.yaml
@@ -33,7 +33,5 @@
     name: 'verify-vtn-service-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vtn-service_licensed'
 
 # [EOF]
diff --git a/jjb/verify/vtn.yaml b/jjb/verify/vtn.yaml
index 5812d05..1df4bda 100644
--- a/jjb/verify/vtn.yaml
+++ b/jjb/verify/vtn.yaml
@@ -41,7 +41,6 @@
     name: 'vtn-jobs-common'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject'
 
 - job-group:
     name: 'vtn-jobs'
diff --git a/jjb/verify/vtr.yaml b/jjb/verify/vtr.yaml
index 54383ab..fd69ce2 100644
--- a/jjb/verify/vtr.yaml
+++ b/jjb/verify/vtr.yaml
@@ -33,7 +33,5 @@
     name: 'verify-vtr-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_vtr_licensed'
 
 # [EOF]
diff --git a/jjb/verify/xos-gui.yaml b/jjb/verify/xos-gui.yaml
index a90d91e..0d4bf60 100644
--- a/jjb/verify/xos-gui.yaml
+++ b/jjb/verify/xos-gui.yaml
@@ -34,8 +34,6 @@
     name: 'verify-xos-gui-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_xos-gui_licensed'
       - 'gui-unit-test':
           dependency-jobs: 'verify_xos-gui_tag-collision'
 
diff --git a/jjb/verify/xos-rest-gw.yaml b/jjb/verify/xos-rest-gw.yaml
index 8dfeb45..909e75f 100644
--- a/jjb/verify/xos-rest-gw.yaml
+++ b/jjb/verify/xos-rest-gw.yaml
@@ -34,8 +34,6 @@
     name: 'verify-xos-rest-gw-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_xos-rest-gw_licensed'
       - 'xos-rest-gw-unit':
           dependency-jobs: 'verify_xos-rest-gw_tag-collision'
 
diff --git a/jjb/verify/xos-tosca.yaml b/jjb/verify/xos-tosca.yaml
index 7544672..221cc78 100644
--- a/jjb/verify/xos-tosca.yaml
+++ b/jjb/verify/xos-tosca.yaml
@@ -34,8 +34,6 @@
     name: 'verify-xos-tosca-jobs'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_xos-tosca_licensed'
       - 'python-unit-test':
           dependency-jobs: 'verify_xos-tosca_tag-collision'
 
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index a273a78..5d02a5d 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -43,8 +43,6 @@
     name: 'verify-xos-jobs-licensed-versioned'
     jobs:
       - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_xos_licensed'
 
 - job-group:
     name: 'verify-xos-jobs-code'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index dac53fe..6b85f6c 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -2472,7 +2472,7 @@
 
 # POD Per Patchset Pipeline Jobs
 # to use these parameters in a job: `<<: *voltha-physical-patchset-parameters`
-- voltha-physical-patchset-parameters: &voltha-physical-patchset-parameters
+- _voltha-physical-patchset-parameters: &voltha-physical-patchset-parameters
     name: voltha-physical-patchset-parameters
     parameters:
       - string:
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 6b41b15..fddf00c 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -952,7 +952,7 @@
 # list of parameters for the VOLTHA Jobs,
 # used as anchor so that can be shared across multiple jobs
 # to use in a job: `parameters: *voltha-scale-job-parameters`
-- voltha-scale-job-parameters: &voltha-scale-job-parameters
+- _voltha-scale-job-parameters: &voltha-scale-job-parameters
     name: voltha-scale-job-parameters
     parameters:
       - string:
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 89d1a4b..3f26acd 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -2,7 +2,7 @@
 # list of parameters for the VOLTHA Jobs,
 # used as anchor so that can be shared across multiple jobs
 # to use in a job: `parameters: *voltha-build-job-parameters`
-- voltha-build-job-parameters: &voltha-build-job-parameters
+- _voltha-build-job-parameters: &voltha-build-job-parameters
     name: voltha-build-job-parameters
 
     openoltAdapterChart: onf/voltha-adapter-openolt
@@ -193,7 +193,7 @@
 # -----------------------------------------------------------------------
 # default properties for the VOLTHA scale jobs
 # -----------------------------------------------------------------------
-- voltha-pipe-job-boiler-plate: &voltha-pipe-job-boiler-plate
+- _voltha-pipe-job-boiler-plate: &voltha-pipe-job-boiler-plate
     name: voltha-pipe-job-boiler-plate
 
     project-type: pipeline
diff --git a/tox.ini b/tox.ini
index dbeedd8..8bbd5c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,21 +1,51 @@
 [tox]
 minversion = 1.6
-envlist = coala,docs,pep8
+envlist = pre-commit
 skipsdist = true
 
-[testenv:coala]
-basepython = python3
+[testenv:jenkins-jobs]
 deps =
-    coala
-    coala-bears
+    jenkins-job-builder=={env:JJB_VERSION:6.4.1}
 commands =
-    python3 -m nltk.downloader punkt maxent_treebank_pos_tagger averaged_perceptron_tagger
-    coala --non-interactive
+    jenkins-jobs {posargs:--help}
 
-# [testenv:docs]
-# deps = sphinx
-# commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
+[testenv:pre-commit-install]
+basepython = python3
+deps = pre-commit
+commands =
+    pre-commit install
+    pre-commit install --hook-type commit-msg
 
-[testenv:pep8]
-deps = flake8
-commands = flake8 scripts/
+[testenv:pre-commit-uninstall]
+basepython = python3
+deps = pre-commit
+commands =
+    pre-commit uninstall
+    pre-commit uninstall --hook-type commit-msg
+
+[testenv:pre-commit]
+description = Precommit checks for black, gitlint, etc.
+allowlist_externals =
+    /bin/sh
+deps =
+    pre-commit
+passenv = HOME
+commands =
+    pre-commit run --all-files --show-diff-on-failure
+    /bin/sh -c 'if ! git config --get user.name > /dev/null; then \
+        git config --global --add user.name "CI"; \
+        touch .git/REMOVE_USERNAME; fi'
+    /bin/sh -c 'if ! git config --get user.email > /dev/null; then \
+        git config --global --add user.email "ci@example.org"; \
+        touch .git/REMOVE_USEREMAIL; fi'
+    /bin/sh -c "if [ -f .git/COMMIT_EDITMSG ]; then \
+        cp .git/COMMIT_EDITMSG .git/COMMIT_MSGTOX; else \
+        git log HEAD -n1 --pretty=%B > .git/COMMIT_MSGTOX; fi"
+    pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_MSGTOX
+    /bin/sh -c "rm -f .git/COMMIT_MSGTOX"
+    /bin/sh -c "if [ -f .git/REMOVE_USERNAME ]; then \
+        git config --global --unset user.name; \
+        rm -f .git/REMOVE_USERNAME; fi"
+    /bin/sh -c "if [ -f .git/REMOVE_USEREMAIL ]; then \
+        git config --global --unset user.email; \
+        rm -f .git/REMOVE_USEREMAIL; fi"