diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 2d6a5b8..a09a09e 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -22,38 +22,6 @@
 
     jobs:
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-test-bbsim'
-          code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: functional-single-kind
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: bbsim-alarms-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-failurescenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-errorscenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: onos-ha-test
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-
-      - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-test-bbsim'
           code-branch: 'master'
           olts: 2
@@ -82,60 +50,6 @@
               logging: true
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-test-bbsim-2.8'
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          code-branch: 'voltha-2.8'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: functional-single-kind
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: bbsim-alarms-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-failurescenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-errorscenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-test-bbsim-2.11'
-          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-          code-branch: 'voltha-2.11'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: functional-single-kind
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: bbsim-alarms-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-failurescenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: bbsim-errorscenarios
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-
-      - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-test-bbsim-2.8'
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
           code-branch: 'voltha-2.8'
@@ -1426,101 +1340,101 @@
               teardown: true
               logging: true
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-sanity-test-multi-runs'
-          code-branch: 'master'
-          time-trigger: "H H/23 * * *"
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
-          testTargets: |
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-sanity-test-multi-runs'
+#          code-branch: 'master'
+#          time-trigger: "H H/23 * * *"
+#          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
+#          testTargets: |
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-sanity-test-multi-runs-2.8'
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          code-branch: 'voltha-2.8'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-sanity-test-multi-runs-2.8'
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          code-branch: 'voltha-2.8'
+#          time-trigger: "H H/23 * * *"
+#          testTargets: |
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-sanity-test-multi-runs-2.11'
-          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-          code-branch: 'voltha-2.11'
-          time-trigger: "H H/23 * * *"
-          testTargets: |
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
-            - target: sanity-kind
-              workflow: att
-              flags: ""
-              teardown: false
-              logging: true
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-sanity-test-multi-runs-2.11'
+#          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+#          code-branch: 'voltha-2.11'
+#          time-trigger: "H H/23 * * *"
+#          testTargets: |
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
+#            - target: sanity-kind
+#              workflow: att
+#              flags: ""
+#              teardown: false
+#              logging: true
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-test-bbsim'
diff --git a/jjb/voltha-e2e/master.yaml b/jjb/voltha-e2e/master.yaml
index 7d1407f..9754c28 100644
--- a/jjb/voltha-e2e/master.yaml
+++ b/jjb/voltha-e2e/master.yaml
@@ -70,4 +70,68 @@
               logging: true
           time-trigger: "H H/23 * * *"
 
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-test-bbsim'
+          code-branch: 'master'
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: functional-single-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-alarms-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-failurescenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-errorscenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: onos-ha-test
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-sanity-test-multi-runs'
+          code-branch: 'master'
+          time-trigger: "H H/23 * * *"
+          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
+          testTargets: |
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+              
 # [EOF]
diff --git a/jjb/voltha-e2e/voltha-2.11.yaml b/jjb/voltha-e2e/voltha-2.11.yaml
index 18ec234..67d0a29 100644
--- a/jjb/voltha-e2e/voltha-2.11.yaml
+++ b/jjb/voltha-e2e/voltha-2.11.yaml
@@ -72,5 +72,64 @@
               teardown: true
               logging: true
           time-trigger: "H H/23 * * *"
-          
+
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-test-bbsim-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: functional-single-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-alarms-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-failurescenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-errorscenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-sanity-test-multi-runs-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+              
 # [EOF]
diff --git a/jjb/voltha-e2e/voltha-2.12.yaml b/jjb/voltha-e2e/voltha-2.12.yaml
index e2721e9..3ba5cd3 100644
--- a/jjb/voltha-e2e/voltha-2.12.yaml
+++ b/jjb/voltha-e2e/voltha-2.12.yaml
@@ -72,5 +72,64 @@
               teardown: true
               logging: true
           time-trigger: "H H/23 * * *"
-          
+
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-test-bbsim-2.12'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: 'voltha-2.12'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: functional-single-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-alarms-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-failurescenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-errorscenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-sanity-test-multi-runs-2.12'
+          pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+          code-branch: 'voltha-2.12'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+              
 # [EOF]
diff --git a/jjb/voltha-e2e/voltha-2.8.yaml b/jjb/voltha-e2e/voltha-2.8.yaml
index 55859f2..0803c33 100644
--- a/jjb/voltha-e2e/voltha-2.8.yaml
+++ b/jjb/voltha-e2e/voltha-2.8.yaml
@@ -75,4 +75,66 @@
               logging: true
           time-trigger: "H H/23 * * *"
 
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-test-bbsim-2.8'
+          disable-job: true
+          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+          code-branch: 'voltha-2.8'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: functional-single-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-alarms-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-failurescenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-errorscenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-sanity-test-multi-runs-2.8'
+          disable-job: true
+          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+          code-branch: 'voltha-2.8'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: sanity-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+
 # [EOF]