diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index 37dbd19..91c5bdd 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -8,12 +8,12 @@
     jobs:
       - 'verify-bbsim-sadis-server-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-bbsim-sadis-server-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-bbsim-sadis-server-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-bbsim-sadis-server-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
       - 'verify-bbsim-sadis-server-jobs-master':
           branch-regexp: '^master$'
       - 'publish-bbsim-sadis-server-jobs':
@@ -32,22 +32,22 @@
           unit-test-keep-going: 'false'
 
 - job-group:
-    name: 'verify-bbsim-sadis-server-jobs-voltha-2.11'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-
-- job-group:
-    name: 'verify-bbsim-sadis-server-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-bbsim-sadis-server-jobs-master'
     jobs:
       - 'voltha-patch-test':
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          
+- job-group:
+    name: 'verify-bbsim-sadis-server-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+- job-group:
+    name: 'verify-bbsim-sadis-server-jobs-voltha-2.11'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-bbsim-sadis-server-jobs'
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 5866715..4b85faa 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -9,14 +9,18 @@
     jobs:
       - 'verify-bbsim-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-bbsim-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-bbsim-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-bbsim-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
+#      - 'verify-bbsim-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
       - 'verify-bbsim-jobs-master':
           branch-regexp: '^master$'
       - 'publish-bbsim-jobs':
@@ -34,11 +38,57 @@
           unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'false'
 
+#- job-group:
+#    name: 'verify-bbsim-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          testTargets: |
+#            - target: sanity-bbsim-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: sanity-bbsim-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: sanity-bbsim-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#
+
 - job-group:
-    name: 'verify-bbsim-jobs-voltha-2.8'
+    name: 'verify-bbsim-jobs-master'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          testTargets: |
+            - target: sanity-bbsim-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: sanity-bbsim-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: sanity-bbsim-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+
+- job-group:
+    name: 'verify-bbsim-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
           testTargets: |
             - target: sanity-bbsim-att
               workflow: att
@@ -78,29 +128,7 @@
               flags: ""
               teardown: true
               logging: true
-
-- job-group:
-    name: 'verify-bbsim-jobs-master'
-    jobs:
-      - 'voltha-patch-test':
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
-          testTargets: |
-            - target: sanity-bbsim-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-
+              
 - job-group:
     name: 'publish-bbsim-jobs'
     jobs:
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index ae2469a..de4fad4 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -8,16 +8,20 @@
     jobs:
       - 'verify-ofagent-go-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-ofagent-jobs-master':
+          branch-regexp: '^master$'          
+      - 'verify-ofagent-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '{kind-voltha-regexp}'
       - 'verify-ofagent-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '{kind-voltha-regexp}'
-      - 'verify-ofagent-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '{kind-voltha-regexp}'
-      - 'verify-ofagent-jobs-master':
-          branch-regexp: '^master$'
+#      - 'verify-ofagent-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '{kind-voltha-regexp}'
       - 'publish-ofagent-go-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -35,22 +39,28 @@
           junit-allow-empty-results: true
 
 - job-group:
-    name: 'verify-ofagent-jobs-voltha-2.11'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-
-- job-group:
-    name: 'verify-ofagent-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-ofagent-jobs-master'
     jobs:
       - 'voltha-patch-test':
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          
+- job-group:
+    name: 'verify-ofagent-jobs-voltha-2.11'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          
+- job-group:
+    name: 'verify-ofagent-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+# - job-group:
+#    name: 'verify-ofagent-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-ofagent-go-jobs'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 226863e..7b508a0 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -8,16 +8,20 @@
     jobs:
       - 'verify-voltha-go-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-go-jobs-master':
+          branch-regexp: '^master$'          
+      - 'verify-voltha-go-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-go-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-voltha-go-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-go-jobs-master':
-          branch-regexp: '^master$'
+#      - 'verify-voltha-go-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
       - 'publish-voltha-go-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -43,16 +47,22 @@
           unit-test-keep-going: 'false'
 
 - job-group:
+    name: 'verify-voltha-go-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+- job-group:
     name: 'verify-voltha-go-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
-- job-group:
-    name: 'verify-voltha-go-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+# - job-group:
+#    name: 'verify-voltha-go-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-go-jobs-master'
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 8815676..6779887 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -8,16 +8,20 @@
     jobs:
       - 'verify-voltha-onos-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-onos-jobs-master':
+          branch-regexp: '^master$'
+      - 'verify-voltha-onos-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-onos-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-voltha-onos-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-onos-jobs-master':
-          branch-regexp: '^master$'
+#      - 'verify-voltha-onos-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
       - 'publish-voltha-onos-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -29,16 +33,22 @@
           dependency-jobs: 'verify_voltha-onos_licensed'
 
 - job-group:
-    name: 'verify-voltha-onos-jobs-voltha-2.11'
+    name: 'verify-voltha-onos-jobs-voltha-2.12'
     jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
 - job-group:
-    name: 'verify-voltha-onos-jobs-voltha-2.8'
+    name: 'verify-voltha-onos-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+
+#- job-group:
+#    name: 'verify-voltha-onos-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-onos-jobs-master'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index a3b40b8..3e9afde 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -8,16 +8,20 @@
     jobs:
       - 'verify-voltha-openolt-adapter-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-openolt-adapter-jobs-master':
+          branch-regexp: '^master$'
+      - 'verify-voltha-openolt-adapter-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-openolt-adapter-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-voltha-openolt-adapter-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-openolt-adapter-jobs-master':
-          branch-regexp: '^master$'
+#      - 'verify-voltha-openolt-adapter-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
       - 'publish-voltha-openolt-adapter-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -43,22 +47,28 @@
           build-node: 'ubuntu18.04-basebuild-2c-4g'
 
 - job-group:
+    name: 'verify-voltha-openolt-adapter-jobs-master'
+    jobs:
+      - 'voltha-patch-test':
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+          
+- job-group:
+    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+- job-group:
     name: 'verify-voltha-openolt-adapter-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
-- job-group:
-    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-
-- job-group:
-    name: 'verify-voltha-openolt-adapter-jobs-master'
-    jobs:
-      - 'voltha-patch-test':
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+#- job-group:
+#    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'publish-voltha-openolt-adapter-jobs'
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index a7c36ae..574d1c1 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -8,16 +8,20 @@
     jobs:
       - 'verify-voltha-openonu-adapter-go-jobs':
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-openonu-adapter-go-jobs-master':
+          branch-regexp: '^master$'
+      - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.12':
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.11':
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-openonu-adapter-go-jobs-master':
-          branch-regexp: '^master$'
+#      - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8':
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
       - 'publish-voltha-openonu-adapter-go-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -42,16 +46,22 @@
           build-node: 'ubuntu18.04-basebuild-2c-4g'
 
 - job-group:
+    name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+- job-group:
     name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
-- job-group:
-    name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#- job-group:
+#    name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-openonu-adapter-go-jobs-master'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index 08a4c8e..b62dd2b 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -9,19 +9,24 @@
       - 'verify-voltha-system-tests-jobs':
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           branch-regexp: '{all-branches-regexp}'
+      - 'verify-voltha-system-tests-jobs-master':
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          branch-regexp: '^master$'
+      - 'verify-voltha-system-tests-jobs-voltha-2.12':
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          name-extension: '-voltha-2.12'
+          override-branch: 'voltha-2.12'
+          branch-regexp: '^voltha-2.12$'
       - 'verify-voltha-system-tests-jobs-voltha-2.11':
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-      - 'verify-voltha-system-tests-jobs-voltha-2.8':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-system-tests-jobs-master':
-          build-node: 'ubuntu18.04-basebuild-4c-8g'
-          branch-regexp: '^master$'
+#      - 'verify-voltha-system-tests-jobs-voltha-2.8':
+#          build-node: 'ubuntu18.04-basebuild-4c-8g'
+#          name-extension: '-voltha-2.8'
+#          override-branch: 'voltha-2.8'
+#          branch-regexp: '^voltha-2.8$'
 
 - job-group:
     name: 'verify-voltha-system-tests-jobs'
@@ -35,16 +40,22 @@
           junit-allow-empty-results: true
 
 - job-group:
+    name: 'verify-voltha-system-tests-jobs-voltha-2.12'
+    jobs:
+      - 'voltha-patch-test':
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+
+- job-group:
     name: 'verify-voltha-system-tests-jobs-voltha-2.11'
     jobs:
       - 'voltha-patch-test':
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
 
-- job-group:
-    name: 'verify-voltha-system-tests-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#- job-group:
+#    name: 'verify-voltha-system-tests-jobs-voltha-2.8'
+#    jobs:
+#      - 'voltha-patch-test':
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
     name: 'verify-voltha-system-tests-jobs-master'