diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index f51c6c5..fbb530a 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -537,7 +537,7 @@
               logging: true
             - target: mib-upload-templating-openonu-go-adapter-test
               workflow: att
-              flags: "--set pon=2,onu=2,controlledActivation=only-onu"
+              flags: "--set pon=2,onu=2,controlledActivation=only-onu,injectOmciUnknownAttributes=true,injectOmciUnknownMe=true --set global.extended_omci_support.enabled=true "
               teardown: true
               logging: true
             - target: reconcile-openonu-go-adapter-test-att
@@ -550,9 +550,9 @@
               flags: ""
               teardown: true
               logging: true
-            - target: reconcile-openonu-go-adapter-test-tt
+            - target: reconcile-openonu-go-adapter-multi-uni-test-tt
               workflow: tt
-              flags: ""
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
               teardown: true
               logging: true
             - target: openonu-go-adapter-omci-hardening-passed-test
@@ -562,7 +562,7 @@
               logging: true
             - target: openonu-go-adapter-omci-hardening-failed-test
               workflow: att
-              flags: "--set omci_response_rate=7"
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
               teardown: true
               logging: true
             - target: voltha-onu-omci-get-single-kind-att
@@ -580,6 +580,47 @@
               flags: ""
               teardown: true
               logging: true
+            - target: voltha-onu-flows-check-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-att
+              workflow: att
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-dt
+              workflow: dt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-tt
+              workflow: tt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-robustness-test-single-kind-dt
+              workflow: dt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1"
+              teardown: true
+              logging: true
+            - target: onu-robustness-test-multi-uni-kind-tt
+              workflow: tt
+              flags: "--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF,kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1"
+              teardown: true
+              logging: true
+          timeout: 240
 
       - 'voltha-periodic-test':
           name: 'patchset-voltha-openonu-go-test-bbsim'
@@ -778,7 +819,7 @@
               logging: true
             - target: mib-upload-templating-openonu-go-adapter-test
               workflow: att
-              flags: "--set pon=2,onu=2,controlledActivation=only-onu"
+              flags: "--set pon=2,onu=2,controlledActivation=only-onu,injectOmciUnknownAttributes=true,injectOmciUnknownMe=true --set global.extended_omci_support.enabled=true "
               teardown: true
               logging: true
             - target: reconcile-openonu-go-adapter-test-att
@@ -791,9 +832,9 @@
               flags: ""
               teardown: true
               logging: true
-            - target: reconcile-openonu-go-adapter-test-tt
+            - target: reconcile-openonu-go-adapter-multi-uni-test-tt
               workflow: tt
-              flags: ""
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
               teardown: true
               logging: true
             - target: openonu-go-adapter-omci-hardening-passed-test
@@ -803,7 +844,7 @@
               logging: true
             - target: openonu-go-adapter-omci-hardening-failed-test
               workflow: att
-              flags: "--set omci_response_rate=7"
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
               teardown: true
               logging: true
             - target: voltha-onu-omci-get-single-kind-att
@@ -821,6 +862,37 @@
               flags: ""
               teardown: true
               logging: true
+            - target: voltha-onu-flows-check-single-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-att
+              workflow: att
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-dt
+              workflow: dt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+            - target: onu-mib-audit-test-single-kind-tt
+              workflow: tt
+              flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
+              teardown: true
+              logging: true
+          timeout: 210
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim'
@@ -980,9 +1052,9 @@
               flags: ""
               teardown: true
               logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-tt
+            - target: reconcile-openonu-go-adapter-multi-olt-multi-uni-test-tt
               workflow: tt
-              flags: ""
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
               teardown: true
               logging: true
             - target: voltha-onu-omci-get-multiolt-kind-att
@@ -1000,7 +1072,23 @@
               flags: ""
               teardown: true
               logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
           time-trigger: "H H/23 * * *"
+          timeout: 270
 
       - 'voltha-periodic-test':
           name: 'patchset-voltha-multiple-olts-openonu-go-test-bbsim'
@@ -1167,9 +1255,9 @@
               flags: ""
               teardown: true
               logging: true
-            - target: reconcile-openonu-go-adapter-multi-olt-test-tt
+            - target: reconcile-openonu-go-adapter-multi-olt-multi-uni-test-tt
               workflow: tt
-              flags: ""
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
               teardown: true
               logging: true
             - target: voltha-onu-omci-get-multiolt-kind-att
@@ -1187,6 +1275,22 @@
               flags: ""
               teardown: true
               logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-att
+              workflow: att
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: voltha-onu-flows-check-multiolt-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+          timeout: 270
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-pm-data-test-bbsim'
@@ -1584,6 +1688,24 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-dt-test-bbsim-2.11'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          time-trigger: "@daily"
+          testTargets: |
+            - target: functional-single-kind-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-failurescenarios-dt
+              workflow: dt
+              flags: ""
+              teardown: false
+              logging: true
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-unitag-subscriber-tt-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 '
@@ -1608,6 +1730,31 @@
               logging: true
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim-2.11'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          extraHelmFlags: '--set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
+          time-trigger: "H H/23 * * *"
+          logLevel: 'DEBUG'
+          robot-args: '-v unitag_sub:True'
+          testTargets: |
+            - target: functional-single-kind-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: bbsim-failurescenarios-tt
+              workflow: tt
+              flags: ""
+              teardown: true
+              logging: true
+            - target: functional-single-kind-multiuni-tt
+              workflow: tt
+              flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
+              teardown: true
+              logging: true
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-tt-maclearner-sanity-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 '
@@ -1639,6 +1786,23 @@
           timeout: 230
 
       - 'voltha-periodic-test':
+          name: 'periodic-voltha-memory-leak-test-bbsim-2.11'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
+          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+          code-branch: 'voltha-2.11'
+          time-trigger: "H H/23 * * *"
+          extraHelmFlags: '--set onu=2,controlledActivation=only-onu'
+          withMonitoring: true
+          logLevel: 'DEBUG'
+          testTargets: |
+            - target: memory-leak-test-single-pon-multi-onu-dt
+              workflow: dt
+              flags: ""
+              teardown: true
+              logging: true
+          timeout: 230
+
+      - 'voltha-periodic-test':
           name: 'periodic-voltha-dt-fttb-test-bbsim'
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           code-branch: 'master'
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 6c9bf1b..fe9f6da 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -732,7 +732,7 @@
           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
+      # Berlin pod with gpon olt/onu - master 1T4GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-1'
           config-pod: 'berlin-community-pod-1-gpon-fttb'
@@ -745,7 +745,7 @@
           num-of-atomix: '3'
           time: '13'
 
-      # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
+      # Berlin POD test job - master versions: uses 1T4GEM tech profile on voltha branch
       - 'build_voltha_pod_test':
           timeout: 330
           build-node: 'berlin-community-pod-1'
@@ -761,7 +761,39 @@
           power-switch: true
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
-      # Berlin pod with zyxel gpon olt/onu - master 1T8GEM tech profile and timer based job
+      # Berlin pod with gpon olt/onu - 2.11 1T4GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon-fttb'
+          withFttb: true
+          name-extension: '_DT'
+          disable-job: false
+          work-flow: 'DT'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          profile: '1T4GEM-FTTB'
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          time: '13'
+          pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+
+      # Berlin POD test job - 2.11 versions: uses 1T4GEM tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          timeout: 330
+          build-node: 'berlin-community-pod-1'
+          config-pod: 'berlin-community-pod-1-gpon-fttb'
+          withFttb: true
+          name-extension: '_DT'
+          disable-job: false
+          work-flow: 'DT'
+          release: '2.11'
+          branch: 'voltha-2.11'
+          test-repo: 'voltha-system-tests'
+          profile: '1T4GEM-FTTB'
+          power-switch: true
+          pipeline-script: 'voltha/voltha-2.11/voltha-dt-physical-functional-tests.groovy'
+
+          # Berlin pod with zyxel gpon olt/onu - master 1T8GEM tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           build-node: 'berlin-community-pod-2'
           config-pod: 'berlin-community-pod-2-gpon-zyxel'
@@ -988,15 +1020,15 @@
           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
+      # Berlin pod with adtran gpon olt/onu - 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'
           disable-job: true
           work-flow: 'DT'
-          release: '2.8'
-          branch: 'voltha-2.8'
+          release: 'master'
+          branch: 'master'
           profile: 'Default'
           installVolthaInfra: true
           installVolthaStack: false
@@ -1008,8 +1040,6 @@
           num-of-onos: '3'
           num-of-atomix: '3'
           VolthaEtcdPort: 9999
-          openoltAdapterChart: '/home/community/adtran-21.5-voltha-2.8/voltha-adapter-adtran-olt'
-          oltAdapterReleaseName: 'adtran-olt'
           waitTimerForOltUp: 420
           time: '16'
 
@@ -1032,8 +1062,6 @@
           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'