diff --git a/jjb/docker-publish.yaml b/jjb/docker-publish.yaml
index ad09132..e829892 100644
--- a/jjb/docker-publish.yaml
+++ b/jjb/docker-publish.yaml
@@ -95,7 +95,7 @@
       - string:
           name: maintainers
           default: '{maintainers}'
-          description: "The person that sould be notified if this job fails"
+          description: "The person that should be notified if this job fails"
 
       - string:
           name: extraEnvironmentVars
diff --git a/jjb/pipeline/xos-core.groovy b/jjb/pipeline/xos-core.groovy
index a5cfe0c..6913b46 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, onf-bat-admin@opennetworking.org", sendToIndividuals: false])
+         step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "kailash@opennetworking.org, releng+voltha-build@linuxfoundation.org", sendToIndividuals: false])
 
     }
   }
diff --git a/jjb/verify/att-workflow-driver.yaml b/jjb/verify/att-workflow-driver.yaml
index a1cab88..2e5255b 100644
--- a/jjb/verify/att-workflow-driver.yaml
+++ b/jjb/verify/att-workflow-driver.yaml
@@ -23,7 +23,7 @@
     name: 'publish-att-workflow-driver-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org, andy@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.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 25a66e9..f49e61a 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -77,7 +77,7 @@
     name: 'publish-bbsim-sadis-server-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index a5a8f55..1104b64 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -129,7 +129,7 @@
     name: 'publish-bbsim-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag_wildcard'
       - 'github-release':
diff --git a/jjb/verify/fabric-crossconnect.yaml b/jjb/verify/fabric-crossconnect.yaml
index 0cfa9e8..8e57de0 100644
--- a/jjb/verify/fabric-crossconnect.yaml
+++ b/jjb/verify/fabric-crossconnect.yaml
@@ -22,7 +22,7 @@
     name: 'publish-fabric-crossconnect-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index 4263699..a444977 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -23,7 +23,7 @@
     name: 'publish-fabric-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
index 82e080c..60ef0da 100644
--- a/jjb/verify/olt-service.yaml
+++ b/jjb/verify/olt-service.yaml
@@ -22,7 +22,7 @@
     name: 'publish-olt-service-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
index 1b15eab..cc40715 100644
--- a/jjb/verify/rcord.yaml
+++ b/jjb/verify/rcord.yaml
@@ -23,7 +23,7 @@
     name: 'publish-rcord-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.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 4eced6c..cd0325a 100644
--- a/jjb/verify/tt-workflow-driver.yaml
+++ b/jjb/verify/tt-workflow-driver.yaml
@@ -21,7 +21,7 @@
     name: 'publish-tt-workflow-driver-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org, andy@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org, andy@opennetworking.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/voltha-northbound-bbf-adapter.yaml b/jjb/verify/voltha-northbound-bbf-adapter.yaml
index c16d7d7..6c994e9 100644
--- a/jjb/verify/voltha-northbound-bbf-adapter.yaml
+++ b/jjb/verify/voltha-northbound-bbf-adapter.yaml
@@ -51,7 +51,7 @@
     name: 'publish-voltha-northbound-bbf-adapter-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'voltha'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
index 2d3d5b8..d70d0c0 100644
--- a/jjb/verify/vrouter.yaml
+++ b/jjb/verify/vrouter.yaml
@@ -21,7 +21,7 @@
     name: 'publish-vrouter-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/xos-gui.yaml b/jjb/verify/xos-gui.yaml
index 0d4bf60..54ecd4b 100644
--- a/jjb/verify/xos-gui.yaml
+++ b/jjb/verify/xos-gui.yaml
@@ -41,7 +41,7 @@
     name: 'publish-xos-gui-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.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 909e75f..8754779 100644
--- a/jjb/verify/xos-rest-gw.yaml
+++ b/jjb/verify/xos-rest-gw.yaml
@@ -41,7 +41,7 @@
     name: 'publish-xos-rest-gw-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'
 
diff --git a/jjb/verify/xos-tosca.yaml b/jjb/verify/xos-tosca.yaml
index 221cc78..9d90822 100644
--- a/jjb/verify/xos-tosca.yaml
+++ b/jjb/verify/xos-tosca.yaml
@@ -41,7 +41,7 @@
     name: 'publish-xos-tosca-jobs'
     jobs:
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org, scottb@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.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 5d02a5d..64d40bc 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -63,7 +63,7 @@
           pypi-index: 'pypi'
           dependency-jobs: 'version-tag_wildcard'
       - 'docker-publish':
-          maintainers: "onf-bat-admin@opennetworking.org"
+          maintainers: "releng+voltha-build@linuxfoundation.org"
           build-timeout: 30
           docker-repo: 'xosproject'
           dependency-jobs: 'version-tag_wildcard'