diff --git a/.wip/periodic-voltha-pm-data-test-bbsim-2.8/todo b/.wip/periodic-voltha-pm-data-test-bbsim-2.8/todo
index 5a8e482..548769c 100644
--- a/.wip/periodic-voltha-pm-data-test-bbsim-2.8/todo
+++ b/.wip/periodic-voltha-pm-data-test-bbsim-2.8/todo
@@ -1,7 +1,21 @@
 # TODO:
 #   o Verify periodic job has been disabled
-#   o Delete job defined in voltha-e2e.yaml
+
+#   o [x] Delete job defined in voltha-e2e.yaml (master)
+#     - Deleted, verify voltha-e2e/master.yaml launched as job
+#     - Delete intermediate job periodic-voltha-pm-data-test-bbsim-master
+
+#   o Create voltha-e2e/voltha-2.12.yaml
+
+#   o Delete job defined in voltha-e2e.yaml (v2.11)
+#     - Deleted, verify voltha-e2e/master.yaml launched as job
+#     - Delete intermediate job periodic-voltha-pm-data-test-bbsim-master
+
 #   o rename bbsim-2.8-playground to bbsim-2.8
+# [Intermediate Jobs]
+#   o Delete pipeline job periodic-voltha-pm-data-test-bbsim-2.8-playground
+
+#   o Once all jobs verified delete commented entries from voltha-e2e.yaml
 
 https://jenkins.opencord.org/job/periodic-voltha-pm-data-test-bbsim-2.8/
   Verify periodic job has been disabled.
@@ -11,3 +25,4 @@
 
 ci-management/jjb/voltha-e2e/voltha-2.8.yaml
   name: 'periodic-voltha-pm-data-test-bbsim-2.8-playground'
+
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 030df97..4f42bb2 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1293,29 +1293,29 @@
           timeout: 270
 
           # Migrating to voltha-e2e/master.yaml
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-pm-data-test-bbsim-master'
-          code-branch: 'master'
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
-          time-trigger: "H H/23 * * *"
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: voltha-pm-data-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-pm-data-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-pm-data-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-          timeout: 140
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-pm-data-test-bbsim-master'
+#          code-branch: 'master'
+#          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+#          time-trigger: "H H/23 * * *"
+#          logLevel: 'DEBUG'
+#          testTargets: |
+#            - target: voltha-pm-data-single-kind-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-pm-data-single-kind-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-pm-data-single-kind-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#          timeout: 140
 
       - 'voltha-periodic-test':
           name: 'patchset-voltha-pm-data-test-bbsim'
@@ -1343,56 +1343,56 @@
               logging: true
           timeout: 140
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-pm-data-test-bbsim-2.8'
-          disable-job: true
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-          code-branch: 'voltha-2.8'
-          extraHelmFlags: '--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
-          time-trigger: "H H/23 * * *"
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: voltha-pm-data-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-pm-data-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-pm-data-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-          timeout: 140
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-pm-data-test-bbsim-2.8'
+#          disable-job: true
+#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+#          code-branch: 'voltha-2.8'
+#          extraHelmFlags: '--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+#          time-trigger: "H H/23 * * *"
+#          logLevel: 'DEBUG'
+#          testTargets: |
+#            - target: voltha-pm-data-single-kind-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-pm-data-single-kind-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-pm-data-single-kind-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#          timeout: 140
 
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-pm-data-test-bbsim-2.11'
-          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-          code-branch: 'voltha-2.11'
-          extraHelmFlags: '--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
-          time-trigger: "H H/23 * * *"
-          logLevel: 'DEBUG'
-          testTargets: |
-            - target: voltha-pm-data-single-kind-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-pm-data-single-kind-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: voltha-pm-data-single-kind-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-          timeout: 140
+#      - 'voltha-periodic-test':
+#          name: 'periodic-voltha-pm-data-test-bbsim-2.11'
+#          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+#          code-branch: 'voltha-2.11'
+#          extraHelmFlags: '--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+#          time-trigger: "H H/23 * * *"
+#          logLevel: 'DEBUG'
+#          testTargets: |
+#            - target: voltha-pm-data-single-kind-att
+#              workflow: att
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-pm-data-single-kind-dt
+#              workflow: dt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#            - target: voltha-pm-data-single-kind-tt
+#              workflow: tt
+#              flags: ""
+#              teardown: true
+#              logging: true
+#          timeout: 140
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim'
diff --git a/jjb/voltha-e2e/voltha-2.11.yaml b/jjb/voltha-e2e/voltha-2.11.yaml
index e69de29..18e9710 100644
--- a/jjb/voltha-e2e/voltha-2.11.yaml
+++ b/jjb/voltha-e2e/voltha-2.11.yaml
@@ -0,0 +1,48 @@
+---
+# voltha 2.x tests
+
+- project:
+    name: voltha-e2e-2.11
+
+    project-name: '{name}'
+    manualBranch: ''
+    olts: 1
+    onus: 1
+    pons: 1
+    withAlarms: true
+    make-target-failtest: bbsim-failurescenarios
+    make-target-errortest: bbsim-errorscenarios
+    make-target-alarmtest: bbsim-alarms-kind
+    make-target-multipleolt: bbsim-multiolt-kind
+    make-target-1t4gemtest: 1t4gem-openonu-go-adapter-test
+    make-target-1t8gemtest: 1t8gem-openonu-go-adapter-test
+    make-target-reconciletest: reconcile-openonu-go-adapter-test-att
+    make-target-reconciledttest: reconcile-openonu-go-adapter-test-dt
+    make-target-reconciletttest: reconcile-openonu-go-adapter-test-tt
+
+# source: voltha-e2e.yaml
+    jobs:
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-pm-data-test-bbsim-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          extraHelmFlags: '--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+          time-trigger: "H H/23 * * *"
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: voltha-pm-data-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-pm-data-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-pm-data-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+          timeout: 140