diff --git a/Makefile b/Makefile
index 6a0bfd7..c36248b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Makefile for testing JJB jobs in a virtualenv
 .PHONY: test clean
 
-SHELL = bash -e -o pipefail
+SHELL         := bash -e -o pipefail
 VENV_DIR      ?= venv-jjb
 JJB_VERSION   ?= 4.1.0
 JOBCONFIG_DIR ?= job-configs
diff --git a/jjb/cord-macros.yaml b/jjb/cord-macros.yaml
index 39517ab..1da49a0 100644
--- a/jjb/cord-macros.yaml
+++ b/jjb/cord-macros.yaml
@@ -114,29 +114,29 @@
     name: cord-infra-github-pr-trigger-merge
     triggers:
       - generic-webhook-trigger:
-            post-content-params:
-                - type: JSONPath
-                  key: action
-                  value: $.action
-                - type: JSONPath
-                  key: merged
-                  value: $.pull_request.merged
-                - type: JSONPath
-                  key: repoUrl
-                  value: $.pull_request.base.repo.html_url
-                - type: JSONPath
-                  key: repoName
-                  value: $.pull_request.base.repo.name
-                - type: JSONPath
-                  key: branchName
-                  value: $.pull_request.base.ref
-                - type: JSONPath
-                  key: commitHash
-                  value: $.pull_request.merge_commit_sha
-            regex-filter-text: $action,$merged
-            regex-filter-expression: ^(closed,true)$
-            cause: Generic Cause
-            token: '{project}'
+          post-content-params:
+            - type: JSONPath
+              key: action
+              value: $.action
+            - type: JSONPath
+              key: merged
+              value: $.pull_request.merged
+            - type: JSONPath
+              key: repoUrl
+              value: $.pull_request.base.repo.html_url
+            - type: JSONPath
+              key: repoName
+              value: $.pull_request.base.repo.name
+            - type: JSONPath
+              key: branchName
+              value: $.pull_request.base.ref
+            - type: JSONPath
+              key: commitHash
+              value: $.pull_request.merge_commit_sha
+        regex-filter-text: $action,$merged
+        regex-filter-expression: ^(closed,true)$
+        cause: Generic Cause
+        token: '{project}'
 
 # wrapper to provide pypi config file
 
@@ -161,8 +161,6 @@
               target: '$HOME/.config/pip/pip.conf'
 
 
-
-
 ################## NEW and CONVERGED MACROS ###################
 # Name matches macro in ONOS/Aether JJB, for future unification
 
diff --git a/jjb/cord-test/seba-release.yaml b/jjb/cord-test/seba-release.yaml
index 8a9a5f2..1446bfe 100644
--- a/jjb/cord-test/seba-release.yaml
+++ b/jjb/cord-test/seba-release.yaml
@@ -55,7 +55,7 @@
           Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
           oltDebVersion: 'openolt-master.deb'
 
-     # Flex POD build 2.0
+          # Flex POD build 2.0
       - 'build_pod_manual_release':
           build-node: 'qa-testvm-pod'
           config-pod: 'flex-ocp-cord'
diff --git a/jjb/pipeline/xos-core.groovy b/jjb/pipeline/xos-core.groovy
index 8962545..21ca1b4 100644
--- a/jjb/pipeline/xos-core.groovy
+++ b/jjb/pipeline/xos-core.groovy
@@ -202,7 +202,7 @@
             reportFileName: 'RobotLogs/report*.html',
             unstableThreshold: 0]);
          archiveArtifacts artifacts: '*.log'
-         step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "kailash@opennetworking.org, teo@opennetworking.org", sendToIndividuals: false])
+         step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "kailash@opennetworking.org, onf-bat-admin@opennetworking.org", sendToIndividuals: false])
 
     }
   }
diff --git a/jjb/repos/voltha-helm-charts.yaml b/jjb/repos/voltha-helm-charts.yaml
index 9b80797..0f0dd39 100644
--- a/jjb/repos/voltha-helm-charts.yaml
+++ b/jjb/repos/voltha-helm-charts.yaml
@@ -14,14 +14,6 @@
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
           branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-helm-charts-jobs-voltha-2.9':
-          name-extension: '-voltha-2.9'
-          override-branch: 'voltha-2.9'
-          branch-regexp: '^voltha-2.9$'
-      - 'verify-voltha-helm-charts-jobs-voltha-2.10':
-          name-extension: '-voltha-2.10'
-          override-branch: 'voltha-2.10'
-          branch-regexp: '^voltha-2.10$'
       - 'verify-voltha-helm-charts-jobs-master':
           branch-regexp: '^master$'
 
@@ -41,18 +33,6 @@
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
-    name: 'verify-voltha-helm-charts-jobs-voltha-2.9'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
-    name: 'verify-voltha-helm-charts-jobs-voltha-2.10'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.10/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-voltha-helm-charts-jobs-master'
     jobs:
       - 'voltha-patch-test'
diff --git a/jjb/verify/att-workflow-driver.yaml b/jjb/verify/att-workflow-driver.yaml
index 91b0514..f244a66 100644
--- a/jjb/verify/att-workflow-driver.yaml
+++ b/jjb/verify/att-workflow-driver.yaml
@@ -25,6 +25,6 @@
     name: 'publish-att-workflow-driver-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org, andy@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org, andy@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index e603bc8..be04f9f 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -11,9 +11,6 @@
       - 'verify-bbsim-sadis-server-jobs-voltha-2.8':
           name-extension: '-voltha-2.8'
           branch-regexp: '^voltha-2.8$'
-      - 'verify-bbsim-sadis-server-jobs-voltha-2.9':
-          name-extension: '-voltha-2.9'
-          branch-regexp: '^voltha-2.9$'
       - 'verify-bbsim-sadis-server-jobs-master':
           branch-regexp: '^master$'
       - 'publish-bbsim-sadis-server-jobs':
@@ -38,12 +35,6 @@
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
-    name: 'verify-bbsim-sadis-server-jobs-voltha-2.9'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-bbsim-sadis-server-jobs-master'
     jobs:
       - 'voltha-patch-test':
@@ -53,6 +44,6 @@
     name: 'publish-bbsim-sadis-server-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org"
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index f156b67..185b399 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -12,14 +12,6 @@
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
           branch-regexp: '^voltha-2.8$'
-      - 'verify-bbsim-jobs-voltha-2.10':
-          name-extension: '-voltha-2.10'
-          override-branch: 'voltha-2.10'
-          branch-regexp: '^voltha-2.10$'
-      - 'verify-bbsim-jobs-voltha-2.11':
-          name-extension: '-voltha-2.11'
-          override-branch: 'voltha-2.11'
-          branch-regexp: '^voltha-2.11$'
       - 'verify-bbsim-jobs-master':
           branch-regexp: '^master$'
       - 'publish-bbsim-jobs':
@@ -60,72 +52,6 @@
               logging: true
 
 - job-group:
-    name: 'verify-bbsim-jobs-voltha-2.9'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-          testTargets: |
-            - target: sanity-bbsim-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-
-- job-group:
-    name: 'verify-bbsim-jobs-voltha-2.10'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.10/bbsim-tests.groovy'
-          testTargets: |
-            - target: sanity-bbsim-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-
-- job-group:
-    name: 'verify-bbsim-jobs-voltha-2.11'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-          testTargets: |
-            - target: sanity-bbsim-att
-              workflow: att
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-dt
-              workflow: dt
-              flags: ""
-              teardown: true
-              logging: true
-            - target: sanity-bbsim-tt
-              workflow: tt
-              flags: ""
-              teardown: true
-              logging: true
-
-- job-group:
     name: 'verify-bbsim-jobs-master'
     jobs:
       - 'voltha-patch-test':
@@ -151,11 +77,11 @@
     name: 'publish-bbsim-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org"
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag_wildcard'
       - 'github-release':
-           dependency-jobs: 'version-tag_wildcard'
-           github-organization: 'opencord'
-           release-targets: 'release'
-           artifact-glob: 'release/*'
+          dependency-jobs: 'version-tag_wildcard'
+          github-organization: 'opencord'
+          release-targets: 'release'
+          artifact-glob: 'release/*'
diff --git a/jjb/verify/device-management-interface.yaml b/jjb/verify/device-management-interface.yaml
index 45828df..63861c8 100644
--- a/jjb/verify/device-management-interface.yaml
+++ b/jjb/verify/device-management-interface.yaml
@@ -22,8 +22,8 @@
           junit-allow-empty-results: true
 
 - job-group:
-      name: 'post-merge-device-management-interface-jobs'
-      jobs:
-          - 'pypi-publish':
-                project-regexp: '^{name}$'
-                dependency-jobs: 'version-tag_wildcard'
+    name: 'post-merge-device-management-interface-jobs'
+    jobs:
+      - 'pypi-publish':
+          project-regexp: '^{name}$'
+          dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/fabric-crossconnect.yaml b/jjb/verify/fabric-crossconnect.yaml
index 72825a4..fcdf313 100644
--- a/jjb/verify/fabric-crossconnect.yaml
+++ b/jjb/verify/fabric-crossconnect.yaml
@@ -24,6 +24,6 @@
     name: 'publish-fabric-crossconnect-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index a43e56a..3c6954e 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -25,6 +25,6 @@
     name: 'publish-fabric-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index fbd511c..4e37059 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -12,10 +12,6 @@
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
           branch-regexp: '{kind-voltha-regexp}'
-      - 'verify-ofagent-jobs-voltha-2.9':
-          name-extension: '-voltha-2.9'
-          override-branch: 'voltha-2.9'
-          branch-regexp: '{kind-voltha-regexp}'
       - 'verify-ofagent-jobs-master':
           branch-regexp: '^master$'
       - 'publish-ofagent-go-jobs':
@@ -41,12 +37,6 @@
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
-    name: 'verify-ofagent-jobs-voltha-2.9'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-ofagent-jobs-master'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
index b20963c..cc0940b 100644
--- a/jjb/verify/olt-service.yaml
+++ b/jjb/verify/olt-service.yaml
@@ -24,6 +24,6 @@
     name: 'publish-olt-service-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/opendevice-manager.yaml b/jjb/verify/opendevice-manager.yaml
index 108ff79..144efe7 100644
--- a/jjb/verify/opendevice-manager.yaml
+++ b/jjb/verify/opendevice-manager.yaml
@@ -30,5 +30,3 @@
           build-timeout: 30
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag_wildcard'
-
-
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
index beee28a..6dc0b1c 100644
--- a/jjb/verify/rcord.yaml
+++ b/jjb/verify/rcord.yaml
@@ -25,6 +25,6 @@
     name: 'publish-rcord-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/tt-workflow-driver.yaml b/jjb/verify/tt-workflow-driver.yaml
index 2e76b9f..78b5ec8 100644
--- a/jjb/verify/tt-workflow-driver.yaml
+++ b/jjb/verify/tt-workflow-driver.yaml
@@ -23,6 +23,6 @@
     name: 'publish-tt-workflow-driver-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org, andy@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org, andy@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/up4.yaml b/jjb/verify/up4.yaml
index edc08b7..5ec1bf5 100644
--- a/jjb/verify/up4.yaml
+++ b/jjb/verify/up4.yaml
@@ -11,8 +11,8 @@
 
     # Matrix
     up4Ctrl:
-        - pfcp
-        - p4rt
+      - pfcp
+      - p4rt
 
     jobs:
       - "up4-jobs":
diff --git a/jjb/verify/voltha-go-controller.yaml b/jjb/verify/voltha-go-controller.yaml
index 7f47410..a74ae14 100644
--- a/jjb/verify/voltha-go-controller.yaml
+++ b/jjb/verify/voltha-go-controller.yaml
@@ -8,16 +8,6 @@
     jobs:
       - 'verify-voltha-go-controller-jobs':
           branch-regexp: '{all-branches-regexp}'
-      # NOTE no releases yet, will be enabled once 2.10 or 2.11 is out
-      # - 'verify-voltha-go-controller-jobs-voltha-2.9':
-      #     name-extension: '-voltha-2.9'
-      #     branch-regexp: '^voltha-2.9$'
-      # NOTE will be enabled once we have a pipeline that supports this controller
-      # - 'verify-voltha-go-controller-jobs-master':
-      #     branch-regexp: '^master$'
-      # NOTE will be enabled once we have artifacts to build
-      # - 'publish-voltha-go-controller-jobs':
-      #     branch-regexp: '{all-branches-regexp}'
 
 - job-group:
     name: 'verify-voltha-go-controller-jobs'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index d685ce6..5dad879 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -12,10 +12,6 @@
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
           branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-go-jobs-voltha-2.9':
-          name-extension: '-voltha-2.9'
-          override-branch: 'voltha-2.9'
-          branch-regexp: '^voltha-2.9$'
       - 'verify-voltha-go-jobs-master':
           branch-regexp: '^master$'
       - 'publish-voltha-go-jobs':
@@ -49,12 +45,6 @@
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
-    name: 'verify-voltha-go-jobs-voltha-2.9'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-voltha-go-jobs-master'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-northbound-bbf-adapter.yaml b/jjb/verify/voltha-northbound-bbf-adapter.yaml
index 10ab460..0e01384 100644
--- a/jjb/verify/voltha-northbound-bbf-adapter.yaml
+++ b/jjb/verify/voltha-northbound-bbf-adapter.yaml
@@ -52,6 +52,6 @@
     name: 'publish-voltha-northbound-bbf-adapter-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org"
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 6b17787..82910d6 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -12,10 +12,6 @@
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
           branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-onos-jobs-voltha-2.9':
-          name-extension: '-voltha-2.9'
-          override-branch: 'voltha-2.9'
-          branch-regexp: '^voltha-2.9$'
       - 'verify-voltha-onos-jobs-master':
           branch-regexp: '^master$'
       - 'publish-voltha-onos-jobs':
@@ -35,12 +31,6 @@
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
-    name: 'verify-voltha-onos-jobs-voltha-2.9'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-voltha-onos-jobs-master'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 9c9f878..b93d35c 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -12,10 +12,6 @@
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
           branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-openolt-adapter-jobs-voltha-2.9':
-          name-extension: '-voltha-2.9'
-          override-branch: 'voltha-2.9'
-          branch-regexp: '^voltha-2.9$'
       - 'verify-voltha-openolt-adapter-jobs-master':
           branch-regexp: '^master$'
       - 'publish-voltha-openolt-adapter-jobs':
@@ -49,12 +45,6 @@
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
-    name: 'verify-voltha-openolt-adapter-jobs-voltha-2.9'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-voltha-openolt-adapter-jobs-master'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 5bd6e85..b45783c 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -12,10 +12,6 @@
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
           branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.9':
-          name-extension: '-voltha-2.9'
-          override-branch: 'voltha-2.9'
-          branch-regexp: '^voltha-2.9$'
       - 'verify-voltha-openonu-adapter-go-jobs-master':
           branch-regexp: '^master$'
       - 'publish-voltha-openonu-adapter-go-jobs':
@@ -48,12 +44,6 @@
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
-    name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.9'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-voltha-openonu-adapter-go-jobs-master'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index 9a8cc35..8b442db 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -10,22 +10,12 @@
           build-node: 'ubuntu18.04-basebuild-4c-8g'
           branch-regexp: '{all-branches-regexp}'
       - 'verify-voltha-system-tests-jobs-voltha-2.8':
-          build-node:  'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
           name-extension: '-voltha-2.8'
           override-branch: 'voltha-2.8'
           branch-regexp: '^voltha-2.8$'
-      - 'verify-voltha-system-tests-jobs-voltha-2.9':
-          build-node:  'ubuntu18.04-basebuild-4c-8g'
-          name-extension: '-voltha-2.9'
-          override-branch: 'voltha-2.9'
-          branch-regexp: '^voltha-2.9$'
-      - 'verify-voltha-system-tests-jobs-voltha-2.10':
-          build-node:  'ubuntu18.04-basebuild-4c-8g'
-          name-extension: '-voltha-2.10'
-          override-branch: 'voltha-2.10'
-          branch-regexp: '^voltha-2.10$'
       - 'verify-voltha-system-tests-jobs-master':
-          build-node:  'ubuntu18.04-basebuild-4c-8g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
           branch-regexp: '^master$'
 
 - job-group:
@@ -46,18 +36,6 @@
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
 
 - job-group:
-    name: 'verify-voltha-system-tests-jobs-voltha-2.9'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
-    name: 'verify-voltha-system-tests-jobs-voltha-2.10'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.10/bbsim-tests.groovy'
-
-- job-group:
     name: 'verify-voltha-system-tests-jobs-master'
     jobs:
       - 'voltha-patch-test':
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
index e77d87a..2abd236 100644
--- a/jjb/verify/vrouter.yaml
+++ b/jjb/verify/vrouter.yaml
@@ -23,6 +23,6 @@
     name: 'publish-vrouter-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/xos-gui.yaml b/jjb/verify/xos-gui.yaml
index 1e7188c..862b2b7 100644
--- a/jjb/verify/xos-gui.yaml
+++ b/jjb/verify/xos-gui.yaml
@@ -23,6 +23,6 @@
     name: 'publish-xos-gui-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/xos-rest-gw.yaml b/jjb/verify/xos-rest-gw.yaml
index 5f1e29f..db0d56c 100644
--- a/jjb/verify/xos-rest-gw.yaml
+++ b/jjb/verify/xos-rest-gw.yaml
@@ -23,6 +23,6 @@
     name: 'publish-xos-rest-gw-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/xos-tosca.yaml b/jjb/verify/xos-tosca.yaml
index d4bd8a2..2f65d5c 100644
--- a/jjb/verify/xos-tosca.yaml
+++ b/jjb/verify/xos-tosca.yaml
@@ -23,6 +23,6 @@
     name: 'publish-xos-tosca-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org, scottb@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org, scottb@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index 889eae7..afc6ee1 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -44,7 +44,7 @@
           pypi-index: 'pypi'
           dependency-jobs: 'version-tag_wildcard'
       - 'docker-publish':
-          maintainers: "teo@opennetworking.org, andy@opennetworking.org, scottb@opennetworking.org"
+          maintainers: "onf-bat-admin@opennetworking.org, andy@opennetworking.org, scottb@opennetworking.org"
           build-timeout: 30
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index f16969a..fabd0d1 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -511,77 +511,6 @@
           timeout: 210
 
       - 'voltha-periodic-test':
-          name: 'patchset-voltha-2.9-openonu-go-test-bbsim'
-          trigger-comment: "voltha 2.9 test openonu singleolt"
-          pipeline-script: 'voltha/voltha-2.9/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
-          timeout: 180
-
-      - 'voltha-periodic-test':
           name: 'patchset-voltha-2.8-openonu-go-test-bbsim'
           trigger-comment: "voltha 2.8 test openonu singleolt"
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
@@ -722,118 +651,6 @@
           timeout: 270
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.10'
-          pipeline-script: 'voltha/voltha-2.10/bbsim-tests.groovy'
-          code-branch: 'voltha-2.10'
-          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 * * *"
-          timeout: 235
-
-      - 'voltha-periodic-test':
-          name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.9'
-          pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-          code-branch: 'voltha-2.9'
-          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 * * *"
-          timeout: 235
-
-      - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.8'
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
           code-branch: 'voltha-2.8'
@@ -961,64 +778,6 @@
           timeout: 270
 
       - 'voltha-periodic-test':
-          name: 'patchset-voltha-2.9-multiple-olts-openonu-go-test-bbsim'
-          trigger-comment: "voltha 2.9 test openonu multiolt"
-          pipeline-script: 'voltha/voltha-2.9/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
-          timeout: 235
-
-      - 'voltha-periodic-test':
           name: 'patchset-voltha-2.8-multiple-olts-openonu-go-test-bbsim'
           trigger-comment: "voltha 2.8 test openonu multiolt"
           pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
@@ -1446,7 +1205,7 @@
       # 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':
+      # - 'verify_physical_voltha_patchset_auto':
       #    name: 'verify_physical_voltha_patchset_auto'
       #    extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set global.log_level=debug'
       #    workflow: 'att'
@@ -1457,7 +1216,7 @@
       # 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':
+      # - 'verify_physical_voltha_patchset_auto':
       #    name: 'verify_physical_voltha_patchset_auto-2.8'
       #    pipeline-script: 'voltha/voltha-2.8/tucson-build-and-test.groovy'
       #    extraHelmFlags: '--set global.log_level=debug'
@@ -1468,7 +1227,7 @@
       # 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':
+      # - 'verify_physical_voltha_patchset_manual':
       #    name: 'verify_physical_voltha_patchset_manual'
       #    trigger-string: 'hardware test'
       #    branch-pattern: master
@@ -1479,7 +1238,7 @@
       # 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':
+      # - 'verify_physical_voltha_patchset_manual':
       #    name: 'verify_physical_voltha_patchset_manual-2.8'
       #    pipeline-script: 'voltha/voltha-2.8/tucson-build-and-test.groovy'
       #    trigger-string: 'hardware test'
@@ -1491,7 +1250,7 @@
       # 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':
+      # - 'verify_physical_voltha_patchset_manual':
       #    name: 'verify_physical_voltha_patchset_manual_DT'
       #    workflow: 'dt'
       #    trigger-string: 'DT hardware test'
@@ -1503,7 +1262,7 @@
       # 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':
+      # - 'verify_physical_voltha_patchset_manual':
       #    name: 'verify_physical_voltha_patchset_manual_DT-2.8'
       #    pipeline-script: 'voltha/voltha-2.8/tucson-build-and-test.groovy'
       #    workflow: 'dt'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 03bfd32..a41fc31 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -61,13 +61,17 @@
           withEapol: true
           withDhcp: true
           withIgmp: false
-          extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set voltha.securityContext.enabled=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn --set global.rpc_timeout=30s --set voltha.ofagent.log_level=DEBUG'
+          extraHelmFlags: >-
+            --set authRetry=true,dhcpRetry=true
+            --set voltha.securityContext.enabled=false -f /home/jenkins/voltha-scale/voltha-values.yaml
+            --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn
+            --set global.rpc_timeout=30s --set voltha.ofagent.log_level=DEBUG'
           onosReplicas: 1
           atomixReplicas: 1
           onosImg: andreacampanella/voltha-onos:extend-timeout
           ofAgentImg: matteoscandolo/voltha-ofagent-go:scale-debug
           openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:indications
-          volthaHelmChartsChange:  refs/changes/54/32954/1
+          volthaHelmChartsChange: refs/changes/54/32954/1
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-onu-upgrade-2-16-32-att-onus'
@@ -104,7 +108,7 @@
           onosImg: andreacampanella/voltha-onos:extend-timeout
           ofAgentImg: matteoscandolo/voltha-ofagent-go:scale-debug
           openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:indications
-          volthaHelmChartsChange:  refs/changes/54/32954/1
+          volthaHelmChartsChange: refs/changes/54/32954/1
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers'
@@ -131,7 +135,7 @@
           onosImg: andreacampanella/voltha-onos:extend-timeout
           ofAgentImg: matteoscandolo/voltha-ofagent-go:scale-debug
           openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:indications
-          volthaHelmChartsChange:  refs/changes/54/32954/1
+          volthaHelmChartsChange: refs/changes/54/32954/1
 
       - 'voltha-scale-measurements':
           name: 'voltha-scale-measurements-master-2-16-32-tt-subscribers-maclearner'
@@ -177,42 +181,42 @@
           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-master-1-64-63-dt-subscribers'
-            build-node: 'voltha-scale-1'
-            time-trigger: "H H/4 * * *"
-            olts: 1
-            pons: 64
-            onus: 63
-            unis: 1
-            withFlows: true
-            provisionSubscribers: true
-            workflow: dt
-            withEapol: false
-            withDhcp: false
-            withIgmp: false
-            onosImg: andreacampanella/voltha-onos:4k-dev
-            withMibTemplate: false
-            mibTemplateUrl: 'https://raw.githubusercontent.com/opencord/voltha-openonu-adapter-go/master/templates/BBSM-v0.0.1-BBSM_IMG_00001-v1-1UNI.json'
-            extraHelmFlags: '-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn -f /home/cord/dt-custom-values.yaml'
+          name: 'voltha-scale-measurements-master-1-64-63-dt-subscribers'
+          build-node: 'voltha-scale-1'
+          time-trigger: "H H/4 * * *"
+          olts: 1
+          pons: 64
+          onus: 63
+          unis: 1
+          withFlows: true
+          provisionSubscribers: true
+          workflow: dt
+          withEapol: false
+          withDhcp: false
+          withIgmp: false
+          onosImg: andreacampanella/voltha-onos:4k-dev
+          withMibTemplate: false
+          mibTemplateUrl: 'https://raw.githubusercontent.com/opencord/voltha-openonu-adapter-go/master/templates/BBSM-v0.0.1-BBSM_IMG_00001-v1-1UNI.json'
+          extraHelmFlags: '-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn -f /home/cord/dt-custom-values.yaml'
 
       - 'voltha-scale-measurements':
-            name: 'voltha-scale-measurements-master-1-64-63-tt-subscribers'
-            build-node: 'voltha-scale-1'
-            time-trigger: "H H/4 * * *"
-            olts: 1
-            pons: 64
-            onus: 63
-            unis: 1
-            withFlows: true
-            provisionSubscribers: true
-            workflow: tt
-            withEapol: false
-            withDhcp: true
-            withIgmp: true
-            onosImg: andreacampanella/voltha-onos:4k-dev
-            withMibTemplate: false
-            mibTemplateUrl: 'https://raw.githubusercontent.com/opencord/voltha-openonu-adapter-go/master/templates/BBSM-v0.0.1-BBSM_IMG_00001-v1-1UNI.json'
-            extraHelmFlags: '-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn -f /home/cord/tt-custom-values.yaml'
+          name: 'voltha-scale-measurements-master-1-64-63-tt-subscribers'
+          build-node: 'voltha-scale-1'
+          time-trigger: "H H/4 * * *"
+          olts: 1
+          pons: 64
+          onus: 63
+          unis: 1
+          withFlows: true
+          provisionSubscribers: true
+          workflow: tt
+          withEapol: false
+          withDhcp: true
+          withIgmp: true
+          onosImg: andreacampanella/voltha-onos:4k-dev
+          withMibTemplate: false
+          mibTemplateUrl: 'https://raw.githubusercontent.com/opencord/voltha-openonu-adapter-go/master/templates/BBSM-v0.0.1-BBSM_IMG_00001-v1-1UNI.json'
+          extraHelmFlags: '-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn -f /home/cord/tt-custom-values.yaml'
 
       # multi-stack jobs
       - 'voltha-scale-measurements':
@@ -814,7 +818,7 @@
     bbsimImg: voltha/bbsim:master
     rwCoreImg: voltha/voltha-rw-core:master
     ofAgentImg: voltha/voltha-ofagent-go:master
-    openoltAdapterImg:  voltha/voltha-openolt-adapter:master
+    openoltAdapterImg: voltha/voltha-openolt-adapter:master
     openonuAdapterImg: voltha/voltha-openonu-adapter:master
     openonuAdapterGoImg: voltha/voltha-openonu-adapter-go:master
     onosImg: voltha/voltha-onos:master
@@ -843,7 +847,7 @@
     withMonitoring: true
     withProfiling: false
     withPcap: false
-    withRadius: yes
+    withRadius: true
     openonuAdapterReplicas: 1
     onosReplicas: 3
     atomixReplicas: 3
diff --git a/jjb/voltha-test/voltha-certification.yaml b/jjb/voltha-test/voltha-certification.yaml
index 91e22a5..99a0cfc 100644
--- a/jjb/voltha-test/voltha-certification.yaml
+++ b/jjb/voltha-test/voltha-certification.yaml
@@ -9,8 +9,8 @@
     build-timeout: '300'
 
     with-kind: false
-    power-switch: False
-    power-cycle-olt: False
+    power-switch: false
+    power-cycle-olt: false
     work-flow: 'ATT'
     in-band-management: false
     num-of-openonu: 1
@@ -53,7 +53,7 @@
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
       # Certification (Radisys 1600X) pod with olt/onu - master versions timer based job
@@ -80,7 +80,7 @@
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
       # Certification (Radisys) pod with olt/onu - master versions timer based job
@@ -105,7 +105,7 @@
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
       # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
@@ -134,7 +134,7 @@
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
 
       # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
@@ -163,7 +163,7 @@
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
 
       # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
@@ -192,5 +192,5 @@
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index e34538d..b2c5396 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -971,5 +971,4 @@
       - timed: |
                  TZ=America/Los_Angeles
                  H {time} * * *
-
-# [EOF]
\ No newline at end of file
+# [EOF]
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 4b3114a..19cc0ca 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -9,8 +9,8 @@
     build-timeout: '300'
 
     with-kind: false
-    power-switch: False
-    power-cycle-olt: False
+    power-switch: false
+    power-cycle-olt: false
     work-flow: 'ATT'
     in-band-management: false
     num-of-openonu: '1'
@@ -72,8 +72,8 @@
           config-pod: 'flex-ocp-cord'
           release: 'master'
           branch: 'master'
-          power-switch: True
-          power-cycle-olt: True
+          power-switch: true
+          power-cycle-olt: true
           test-repo: 'voltha-system-tests'
           profile: 'Default'
 
@@ -98,11 +98,11 @@
           config-pod: 'flex-ocp-cord'
           release: '2.8'
           branch: 'voltha-2.8'
-          power-switch: True
+          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
+          # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           disable-job: false
           build-node: 'qa-testvm-pod'
@@ -126,14 +126,14 @@
           branch: 'master'
           name-extension: '_TT'
           work-flow: 'TT'
-          power-switch: True
-          power-cycle-olt: True
+          power-switch: true
+          power-cycle-olt: true
           pipeline-script: 'voltha/master/voltha-tt-physical-functional-tests.groovy'
           test-repo: 'voltha-system-tests'
           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: false
           build-node: 'qa-testvm-pod'
@@ -158,12 +158,12 @@
           branch: 'voltha-2.8'
           name-extension: '_TT'
           work-flow: 'TT'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/voltha-2.8/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
+          # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
           disable-job: false
           build-node: 'qa-testvm-pod'
@@ -190,8 +190,8 @@
           branch: 'master'
           name-extension: '_TT'
           work-flow: 'TT'
-          power-switch: True
-          power-cycle-olt: True
+          power-switch: true
+          power-cycle-olt: true
           pipeline-script: 'voltha/master/voltha-tt-physical-functional-tests.groovy'
           test-repo: 'voltha-system-tests'
           profile: 'TP'
@@ -220,8 +220,8 @@
           branch: 'master'
           test-repo: 'voltha-system-tests'
           profile: '1T4GEM'
-          power-switch: True
-          power-cycle-olt: True
+          power-switch: true
+          power-cycle-olt: true
 
       # Menlo pod with olt/onu - master branch,  Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
@@ -251,8 +251,8 @@
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
-          power-switch: True
-          power-cycle-olt: True
+          power-switch: true
+          power-cycle-olt: true
 
       # Menlo pod with olt/onu - released branch,  Default tech profile and timer based job
       - 'build_voltha_pod_release_timer':
@@ -284,36 +284,7 @@
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
-          power-switch: True
-
-      # Menlo pod with olt/onu - 1T4GEM 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.9'
-          branch: 'voltha-2.9'
-          profile: '1T4GEM'
-          num-of-onos: '3'
-          num-of-atomix: '3'
-          in-band-management: true
-          waitTimerForOltUp: 540
-          VolthaEtcdPort: 9999
-          time: '16'
-          pipeline-script: 'voltha/voltha-2.9/physical-build.groovy'
-
-      # Menlo pod test job - voltha-2.9 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.9'
-          branch: 'voltha-2.9'
-          test-repo: 'voltha-system-tests'
-          profile: '1T4GEM'
-          pipeline-script: 'voltha/voltha-2.9/voltha-physical-functional-tests.groovy'
-          power-switch: True
+          power-switch: true
 
       # ONF Menlo Soak POD build job - voltha-master branch
       - 'build_voltha_pod_manual':
@@ -465,7 +436,7 @@
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
       # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
@@ -493,7 +464,7 @@
           branch: 'master'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
       # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
@@ -520,7 +491,7 @@
           branch: 'voltha-2.8'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
 
       # Berlin pod with olt/onu - voltha-2.8 versions timer based job , two OLTs
@@ -547,7 +518,7 @@
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
 
       # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
@@ -576,10 +547,10 @@
           branch: 'master'
           test-repo: 'voltha-system-tests'
           profile: '1T4GEM-FTTB'
-          power-switch: True
+          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 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'
@@ -597,7 +568,7 @@
           waitTimerForOltUp: 360
           time: '1'
 
-        # Berlin POD test job - zyxel gpon master versions: uses tech profile on voltha branch
+          # Berlin POD test job - zyxel gpon master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           build-node: 'berlin-community-pod-2'
           config-pod: 'berlin-community-pod-2-gpon-zyxel'
@@ -607,10 +578,10 @@
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
-        # Berlin pod with zyxel xgspon olt/onu - master 1T8GEM tech profile and timer based job
+          # Berlin pod with zyxel xgspon 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-xgspon-zyxel'
@@ -628,7 +599,7 @@
           profile: '1T8GEM'
           time: '5'
 
-        # Berlin POD test job - zyxel xgsgpon master versions: uses tech profile on voltha branch
+          # Berlin POD test job - zyxel xgsgpon master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
           build-node: 'berlin-community-pod-2'
           config-pod: 'berlin-community-pod-2-xgspon-zyxel'
@@ -638,10 +609,10 @@
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/master/voltha-dt-physical-functional-tests.groovy'
 
-    # TT workflow on Zyxel XGSPON OLT at Berlin pod - build job
+          # TT workflow on Zyxel XGSPON OLT at Berlin pod - build job
       - 'build_voltha_pod_release_timer':
           disable-job: false
           build-node: 'berlin-community-pod-2'
@@ -656,7 +627,7 @@
           num-of-onos: '3'
           num-of-atomix: '3'
 
-    # TT workflow on Zyxel XGSPON OLT at Berlin pod - test job
+          # TT workflow on Zyxel XGSPON OLT at Berlin pod - test job
       - 'build_voltha_pod_test':
           disable-job: false
           build-node: 'berlin-community-pod-2'
@@ -665,8 +636,8 @@
           branch: 'master'
           name-extension: '_TT'
           work-flow: 'TT'
-          power-switch: True
-          power-cycle-olt: True
+          power-switch: true
+          power-cycle-olt: true
           pipeline-script: 'voltha/master/voltha-tt-physical-functional-tests.groovy'
           test-repo: 'voltha-system-tests'
           profile: 'TP'
@@ -703,7 +674,7 @@
           work-flow: 'DT'
           test-repo: 'voltha-system-tests'
           profile: '1T8GEM'
-          power-switch: True
+          power-switch: true
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
           oltAdapterAppLabel: 'adapter-adtran-olt'
 
diff --git a/vars/installVoltctl.groovy b/vars/installVoltctl.groovy
index db5c7f9..efeed49 100644
--- a/vars/installVoltctl.groovy
+++ b/vars/installVoltctl.groovy
@@ -24,7 +24,7 @@
     // for release so hilight non-frozen until we know for sure.
     def released=[
 	// https://github.com/opencord/voltctl/releases/tag/v1.8.1
-	// 'voltha-2.11' : '1.8.1',
+	// 'voltha-2.11' : '1.8.4',
 	// https://github.com/opencord/voltctl/releases/tag/v1.7.6
 	'voltha-2.10' : '1.7.6',
 	'voltha-2.9'  : '1.7.4',