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'