diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 09293d9..70a46a3 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -109,6 +109,33 @@
               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'
@@ -138,6 +165,35 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-multiple-olts-test-bbsim-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          olts: 2
+          extraHelmFlags: '--set onu=2,pon=2'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: functional-multi-olt
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-multiolt-failurescenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-multiolt-errorscenarios
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-multiolt-kind
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-multi-uni-test-bbsim'
           code-branch: 'master'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
@@ -207,6 +263,29 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-multi-uni-test-bbsim-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          extraHelmFlags: '--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: functional-single-kind-multiuni-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-multiuni-failurescenarios-att
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-multiuni-errorscenarios-att
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.8'
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
           code-branch: 'voltha-2.8'
@@ -231,6 +310,31 @@
               logging: true
           timeout: 180
 
+      - 'voltha-periodic-test':
+          name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          olts: 2
+          extraHelmFlags: '--set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: functional-multiuni-multiolt-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-multiuni-multiolt-failurescenarios-att
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+            - target: bbsim-multiuni-multiolt-errorscenarios-att
+              workflow: att
+              flags: ""
+              teardown: false
+              logging: true
+          timeout: 180
+
       # openonu Go periodic tests
       - 'voltha-periodic-test':
           name: 'periodic-voltha-openonu-go-test-bbsim'
@@ -410,6 +514,74 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-openonu-go-test-bbsim-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          time-trigger: "H H/23 * * *"
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: mib-upload-templating-openonu-go-adapter-test
+              workflow: att
+              flags: "--set pon=2,onu=2,controlledActivation=only-onu"
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-passed-test
+              workflow: att
+              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-failed-test
+              workflow: att
+              flags: "--set omci_response_rate=7"
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+
+      - 'voltha-periodic-test':
           name: 'patchset-voltha-openonu-go-test-bbsim'
           trigger-comment: "voltha test openonu singleolt"
           code-branch: '$GERRIT_BRANCH'
@@ -581,6 +753,76 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'patchset-voltha-2.11-openonu-go-test-bbsim'
+          trigger-comment: "voltha 2.11 test openonu singleolt"
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: '$GERRIT_BRANCH'
+          gerritProject: '$GERRIT_PROJECT'
+          gerritRefspec: '$GERRIT_REFSPEC'
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: mib-upload-templating-openonu-go-adapter-test
+              workflow: att
+              flags: "--set pon=2,onu=2,controlledActivation=only-onu"
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-test-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-passed-test
+              workflow: att
+              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
+              teardown: true
+              logging: true
+            - target: openonu-go-adapter-omci-hardening-failed-test
+              workflow: att
+              flags: "--set omci_response_rate=7"
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim'
           code-branch: 'master'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
@@ -706,6 +948,61 @@
           time-trigger: "H H/23 * * *"
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          extraHelmFlags: '--set onu=2,pon=2'
+          olts: 2
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+          time-trigger: "H H/23 * * *"
+
+      - 'voltha-periodic-test':
           name: 'patchset-voltha-multiple-olts-openonu-go-test-bbsim'
           trigger-comment: "voltha test openonu multiolt"
           code-branch: '$GERRIT_BRANCH'
@@ -835,6 +1132,63 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'patchset-voltha-2.11-multiple-olts-openonu-go-test-bbsim'
+          trigger-comment: "voltha 2.11 test openonu multiolt"
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: '$GERRIT_BRANCH'
+          gerritProject: '$GERRIT_PROJECT'
+          gerritRefspec: '$GERRIT_REFSPEC'
+          extraHelmFlags: '--set onu=2,pon=2'
+          olts: 2
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: 1t1gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t4gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: 1t8gem-openonu-go-adapter-multi-olt-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: reconcile-openonu-go-adapter-multi-olt-test-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-omci-get-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-pm-data-test-bbsim'
           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'
@@ -910,6 +1264,31 @@
           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'
           code-branch: 'master'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
@@ -988,6 +1367,32 @@
           time-trigger: "H H/23 * * *"
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          extraHelmFlags: '--set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+          olts: 2
+          timeout: 180
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: voltha-pm-data-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-pm-data-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-pm-data-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+          time-trigger: "H H/23 * * *"
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-test-DMI'
           extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
           code-branch: 'master'
@@ -1012,6 +1417,18 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-test-DMI-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: bbsim-dmi-hw-management-test
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-etcd-test'
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'master'
@@ -1039,6 +1456,20 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-etcd-test-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          code-branch: 'voltha-2.11'
+          extraHelmFlags: '--set onu=2,pon=2'
+          time-trigger: "H H/23 * * *"
+          testTargets: |
+            - target: sanity-multi-kind
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-sanity-test-multi-runs'
           code-branch: 'master'
           time-trigger: "H H/23 * * *"
@@ -1103,6 +1534,38 @@
               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'
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'master'
@@ -1223,6 +1686,17 @@
       #    workflow: 'att'
       #    branch-pattern: voltha-2.8
 
+      # ATT Per-patchset Pod builds on Tucson pod (voltha-2.11)
+      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
+      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
+      # the job when the OLT is replaced and everything works fine.
+      # - 'verify_physical_voltha_patchset_auto':
+      #    name: 'verify_physical_voltha_patchset_auto-2.11'
+      #    pipeline-script: 'voltha/voltha-2.11/tucson-build-and-test.groovy'
+      #    extraHelmFlags: '--set global.log_level=debug'
+      #    workflow: 'att'
+      #    branch-pattern: voltha-2.11
+
       # ATT Manual Pod builds on Tucson pod (master)
       # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
       # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
@@ -1246,6 +1720,18 @@
       #    extraHelmFlags: '--set global.log_level=debug'
       #    workflow: 'att'
 
+      # ATT Manual Pod builds on Tucson pod (voltha-2.11)
+      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
+      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
+      # the job when the OLT is replaced and everything works fine.
+      # - 'verify_physical_voltha_patchset_manual':
+      #    name: 'verify_physical_voltha_patchset_manual-2.11'
+      #    pipeline-script: 'voltha/voltha-2.11/tucson-build-and-test.groovy'
+      #    trigger-string: 'hardware test'
+      #    branch-pattern: voltha-2.11
+      #    extraHelmFlags: '--set global.log_level=debug'
+      #    workflow: 'att'
+
       # DT Manual Pod builds on Tucson pod  (master)
       # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
       # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
@@ -1270,6 +1756,19 @@
       #    default-test-args: '-i sanityDt -i PowerSwitch -X'
       #    branch-pattern: voltha-2.8
       #    extraHelmFlags: '--set global.log_level=debug'
+      # DT Manual Pod builds on Tucson pod  (voltha-2.8)
+
+      # Disable Tucson pod jobs as the corresponding ASXVOLT16 OLT is bad and replacement is needed.
+      # The dev_mgmt_daemon process keeps crashing on this OLT and seems to be a hardware issue. Reenable
+      # the job when the OLT is replaced and everything works fine.
+      # - 'verify_physical_voltha_patchset_manual':
+      #    name: 'verify_physical_voltha_patchset_manual_DT-2.11'
+      #    pipeline-script: 'voltha/voltha-2.11/tucson-build-and-test.groovy'
+      #    workflow: 'dt'
+      #    trigger-string: 'DT hardware test'
+      #    default-test-args: '-i sanityDt -i PowerSwitch -X'
+      #    branch-pattern: voltha-2.11
+      #    extraHelmFlags: '--set global.log_level=debug'
 
 - job-template:
     id: 'voltha-periodic-test'