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'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index a57037d..689faeb 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -642,6 +642,184 @@
           onosImg: ''
           extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
 
+      # voltha-2.11 Jobs
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-voltha-2.11-2-16-32-att-subscribers'
+          pipeline-script: 'voltha/voltha-2.11/voltha-scale-test.groovy'
+          build-node: 'voltha-scale-1'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          withEapol: true
+          withDhcp: true
+          withIgmp: false
+          release: voltha-2.11
+          karaf-home: 'apache-karaf-4.2.9'
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: ''
+          extraHelmFlags: "--set authRetry=false,dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
+
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-voltha-2.11-2-16-32-dt-subscribers'
+          pipeline-script: 'voltha/voltha-2.11/voltha-scale-test.groovy'
+          build-node: 'voltha-scale-1'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          workflow: dt
+          withEapol: false
+          withDhcp: false
+          withIgmp: false
+          release: voltha-2.11
+          karaf-home: 'apache-karaf-4.2.9'
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: 'voltha/voltha-onos:5.0.4'
+          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
+
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-voltha-2.11-2-16-32-tt-subscribers'
+          pipeline-script: 'voltha/voltha-2.11/voltha-scale-test.groovy'
+          build-node: 'voltha-scale-1'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          workflow: tt
+          withEapol: false
+          withDhcp: true
+          withIgmp: true
+          release: voltha-2.11
+          karaf-home: 'apache-karaf-4.2.9'
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: ''
+          extraHelmFlags: "--set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
+
+      # 2.11 multi-stack jobs
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-2.11-10-stacks-2-16-32-att-subscribers'
+          build-node: 'voltha-scale-2'
+          pipeline-script: 'voltha/voltha-2.11/voltha-scale-multi-stack.groovy'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          withMonitoring: false
+          logLevel: WARN
+          onosReplicas: 1
+          atomixReplicas: 0
+          kafkaReplicas: 1
+          etcdReplicas: 1
+          volthaStacks: 10
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          release: voltha-2.11
+          karaf-home: 'apache-karaf-4.2.9'
+          workflow: att
+          withEapol: true
+          withDhcp: true
+          withIgmp: false
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: 'voltha/voltha-onos:5.0.4'
+          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
+
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-2.11-10-stacks-2-16-32-dt-subscribers'
+          build-node: 'voltha-scale-2'
+          pipeline-script: 'voltha/voltha-2.11/voltha-scale-multi-stack.groovy'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          withMonitoring: false
+          logLevel: WARN
+          onosReplicas: 1
+          atomixReplicas: 0
+          kafkaReplicas: 1
+          etcdReplicas: 1
+          volthaStacks: 10
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          release: voltha-2.11
+          karaf-home: 'apache-karaf-4.2.9'
+          workflow: dt
+          withEapol: false
+          withDhcp: false
+          withIgmp: false
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: ''
+          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
+
+      - 'voltha-scale-measurements':
+          name: 'voltha-scale-measurements-2.11-10-stacks-2-16-32-tt-subscribers'
+          build-node: 'voltha-scale-2'
+          pipeline-script: 'voltha/voltha-2.11/voltha-scale-multi-stack.groovy'
+          time-trigger: "H H/4 * * *"
+          disable-job: true
+          withMonitoring: false
+          logLevel: WARN
+          onosReplicas: 1
+          atomixReplicas: 0
+          kafkaReplicas: 1
+          etcdReplicas: 1
+          volthaStacks: 10
+          olts: 2
+          pons: 16
+          onus: 32
+          withFlows: true
+          provisionSubscribers: true
+          release: voltha-2.11
+          karaf-home: 'apache-karaf-4.2.9'
+          workflow: tt
+          withEapol: false
+          withDhcp: true
+          withIgmp: true
+          bbsimImg: ''
+          rwCoreImg: ''
+          ofAgentImg: ''
+          openoltAdapterImg: ''
+          openonuAdapterImg: ''
+          openonuAdapterGoImg: ''
+          onosImg: ''
+          extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
+
       # per patchset job
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-patchset-1-16-32-att-subscribers'
@@ -958,6 +1136,7 @@
           name: kindVolthaChange
           default: '{kindVolthaChange}'
           description: 'Download a change for gerrit in the kind-voltha repo, example value: "refs/changes/32/19132/1"'
+
       - bool:
           name: withMibTemplate
           default: '{withMibTemplate}'
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 995c477..8e2d5ca 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -84,6 +84,20 @@
           disable-job: true
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          profile: '1T4GEM'
+          time: '1'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+
+      # flex OCP pod with olt/onu - 1T4GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
           release: '2.8'
           branch: 'voltha-2.8'
           profile: '1T4GEM'
@@ -104,7 +118,18 @@
           test-repo: 'voltha-system-tests'
           profile: '1T4GEM'
 
-          # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+      # flex pod1 test job - released versions: uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          power-switch: true
+          test-repo: 'voltha-system-tests'
+          profile: '1T4GEM'
+
+      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           disable-job: true
           build-node: 'qa-testvm-pod'
@@ -135,7 +160,7 @@
           profile: 'TP'
           timeout: 360
 
-          # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           disable-job: true
           build-node: 'qa-testvm-pod'
@@ -151,6 +176,22 @@
           num-of-atomix: '3'
           pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
 
+      # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          profile: 'TP'
+          time: '20'
+          VolthaEtcdPort: 9999
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+
       # flex pod1 test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           disable-job: true
@@ -165,6 +206,20 @@
           test-repo: 'voltha-system-tests'
           profile: 'TP'
 
+      # flex pod1 test job - released versions: uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          disable-job: true
+          build-node: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_TT'
+          work-flow: 'TT'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.11/voltha-tt-physical-functional-tests.groovy'
+          test-repo: 'voltha-system-tests'
+          profile: 'TP'
+
           # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           disable-job: true
@@ -273,6 +328,23 @@
           time: '11'
           pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
 
+      # Menlo pod with olt/onu - released branch,  Default tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-demo-pod'
+          config-pod: 'onf-demo-pod'
+          disable-job: true
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM'
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          VolthaEtcdPort: 9999
+          in-band-management: true
+          time: '11'
+          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+
       # Menlo pod test job - uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 300
@@ -288,6 +360,21 @@
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
           power-switch: true
 
+      # Menlo pod test job - uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          timeout: 300
+          build-node: 'menlo-demo-pod'
+          config-pod: 'onf-demo-pod'
+          disable-job: true
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
+          power-switch: true
+
       # ONF Menlo Soak POD build job - voltha-master branch
       - 'build_voltha_pod_manual':
           build-node: 'menlo-soak-pod'
@@ -366,6 +453,23 @@
           logLevel: 'WARN'
           pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
 
+      # ONF Menlo Soak POD build job - voltha-2.11 branch
+      - 'build_voltha_pod_manual':
+          build-node: 'menlo-soak-pod'
+          config-pod: 'onf-soak-pod'
+          disable-job: true
+          branch: 'voltha-2.11'
+          release: '2.11'
+          bbsimReplicas: 1
+          profile: '1T8GEM'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          reinstall-olt: true
+          num-of-onus: 32
+          num-of-ponports: 16
+          logLevel: 'WARN'
+          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+
       # ONF Menlo Soak POD test job - voltha-2.8 branch
       # Run tests manually triggering the job
       - 'build_voltha_pod_manual_test':
@@ -381,6 +485,21 @@
           test-repo: 'voltha-system-tests'
           pipeline-script: 'voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy'
 
+      # ONF Menlo Soak POD test job - voltha-2.11 branch
+      # Run tests manually triggering the job
+      - 'build_voltha_pod_manual_test':
+          build-node: 'menlo-soak-pod'
+          config-pod: 'onf-soak-pod'
+          disable-job: true
+          profile: '1T8GEM'
+          branch: 'voltha-2.11'
+          release: '2.11'
+          work-flow: 'DT'
+          name-extension: '_DT_soak_Func'
+          test-type: 'Functional'
+          test-repo: 'voltha-system-tests'
+          pipeline-script: 'voltha/voltha-2.11/voltha-physical-soak-dt-tests.groovy'
+
       # ONF Menlo Soak POD test job - voltha-2.8 branch
       # Run failure/recovery tests every Wednesday
       - 'build_voltha_pod_soak_test':
@@ -397,6 +516,22 @@
           pipeline-script: 'voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy'
           time-trigger: "H H * * 3"
 
+      # ONF Menlo Soak POD test job - voltha-2.11 branch
+      # Run failure/recovery tests every Wednesday
+      - 'build_voltha_pod_soak_test':
+          build-node: 'menlo-soak-pod'
+          config-pod: 'onf-soak-pod'
+          disable-job: true
+          profile: '1T8GEM'
+          branch: 'voltha-2.11'
+          release: '2.11'
+          work-flow: 'DT'
+          name-extension: '_DT_soak_Fail'
+          test-type: 'Failure'
+          test-repo: 'voltha-system-tests'
+          pipeline-script: 'voltha/voltha-2.11/voltha-physical-soak-dt-tests.groovy'
+          time-trigger: "H H * * 3"
+
       # ONF Menlo Soak POD test job - voltha-2.8 branch
       # Run dataplane tests every Saturday
       - 'build_voltha_pod_soak_test':
@@ -413,6 +548,22 @@
           pipeline-script: 'voltha/voltha-2.8/voltha-physical-soak-dt-tests.groovy'
           time-trigger: "H H * * 6"
 
+      # ONF Menlo Soak POD test job - voltha-2.11 branch
+      # Run dataplane tests every Saturday
+      - 'build_voltha_pod_soak_test':
+          build-node: 'menlo-soak-pod'
+          config-pod: 'onf-soak-pod'
+          disable-job: true
+          profile: '1T8GEM'
+          branch: 'voltha-2.11'
+          release: '2.11'
+          work-flow: 'DT'
+          name-extension: '_DT_soak_DP'
+          test-type: 'Dataplane'
+          test-repo: 'voltha-system-tests'
+          pipeline-script: 'voltha/voltha-2.11/voltha-physical-soak-dt-tests.groovy'
+          time-trigger: "H H * * 6"
+
       # Berlin pod with olt/onu - master versions timer based job , two OLTs
       - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-1'
@@ -483,6 +634,20 @@
           time: '1'
           pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
 
+      # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM'
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          time: '1'
+          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+
       # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           build-node: 'berlin-community-pod-1'
@@ -496,6 +661,19 @@
           power-switch: true
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
 
+      # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
+
       # Berlin pod with olt/onu - voltha-2.8 versions timer based job , two OLTs
       - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-1'
@@ -510,6 +688,20 @@
           pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
           time: '7'
 
+      # Berlin pod with olt/onu - voltha-2.11 versions timer based job , two OLTs
+      - 'build_voltha_pod_release_timer':
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-multi-olt'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          profile: '1T8GEM'
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+          time: '7'
+
       # Berlin POD test job - voltha-2.8 versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           build-node: 'berlin-community-pod-1'
@@ -523,6 +715,19 @@
           power-switch: true
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
 
+      # Berlin POD test job - voltha-2.11 versions: uses tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-multi-olt'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
+
       # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-1'
@@ -665,6 +870,26 @@
           waitTimerForOltUp: 420
           time: '19'
 
+      # Berlin pod with adtran gpon olt/onu - 2.11 1T8GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon-adtran'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          profile: '1T8GEM'
+          reinstall-olt: false
+          extraHelmFlags: "--set adapter_adtran_olt.kv_store_data_prefix='service/voltha/voltha_voltha' --set network.netconfUserSecret='' --set adapter_adtran_olt.topics.core_topic=voltha_voltha_rwcore"
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+          VolthaEtcdPort: 9999
+          openoltAdapterChart: '/home/community/adtran-21.5-voltha-2.11/voltha-adapter-adtran-olt'
+          oltAdapterReleaseName: 'adtran-olt'
+          waitTimerForOltUp: 420
+          time: '19'
+
       # Berlin POD adtran test job - 2.8 versions: uses 1T8GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 390
@@ -680,14 +905,29 @@
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
           oltAdapterAppLabel: 'adapter-adtran-olt'
 
+      # Berlin POD adtran test job - 2.11 versions: uses 1T8GEM tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          timeout: 390
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon-adtran'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
+          oltAdapterAppLabel: 'adapter-adtran-olt'
+
       # Berlin pod with adtran gpon olt/onu - 2.8 1T8GEM tech profile and timer based job
       - 'verify_voltha_pod_dmi_test':
           build-node: 'berlin-community-pod-1'
           config-pod: 'berlin-community-pod-1-gpon-adtran'
           name-extension: '_DT'
           work-flow: 'DT'
-          release: 'master'
-          branch: 'master'
+          release: '2.8'
+          branch: 'voltha-2.8'
           profile: 'Default'
           installVolthaInfra: true
           installVolthaStack: false
@@ -704,4 +944,28 @@
           waitTimerForOltUp: 420
           time: '16'
 
+      # Berlin pod with adtran gpon olt/onu - 2.11 1T8GEM tech profile and timer based job
+      - 'verify_voltha_pod_dmi_test':
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon-adtran'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          profile: 'Default'
+          installVolthaInfra: true
+          installVolthaStack: false
+          reinstall-olt: false
+          restart-olt: false
+          extraHelmFlags: " -f /home/community/SDX_Device_Manager_21.4/helm/values-onf.yaml "
+          dmiChart: '/home/community/SDX_Device_Manager_21.4/helm/adtran-olt-device-manager'
+          OltDevMgr: 'adtran-olt-device-manager'
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          VolthaEtcdPort: 9999
+          openoltAdapterChart: '/home/community/adtran-21.5-voltha-2.11/voltha-adapter-adtran-olt'
+          oltAdapterReleaseName: 'adtran-olt'
+          waitTimerForOltUp: 420
+          time: '16'
+
 # [EOF]