diff --git a/jenkins/jobs/jenkins-plugin-jobs.yaml b/jenkins/jobs/jenkins-plugin-jobs.yaml
index 23115edf5c..08b632c3d1 100644
--- a/jenkins/jobs/jenkins-plugin-jobs.yaml
+++ b/jenkins/jobs/jenkins-plugin-jobs.yaml
@@ -2,8 +2,8 @@
 # https://issues.jenkins-ci.org/browse/JENKINS-14193
 
 - job-template:
-    name: 'gate-{name}-build'
-    node: ubuntu-trusty
+    name: 'gate-{name}-maven-build-{node}'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -75,7 +75,8 @@
 
 - job-group:
     name: jenkins-plugin-jobs
+    node: ubuntu-trusty
     jobs:
-      - 'gate-{name}-build'
+      - 'gate-{name}-maven-build-{node}'
       - '{name}-hpi-artifact'
       - '{name}-jenkinsci-upload'
diff --git a/jenkins/jobs/maven-plugin-jobs.yaml b/jenkins/jobs/maven-plugin-jobs.yaml
index 85dd97435e..4db4a6d9f6 100644
--- a/jenkins/jobs/maven-plugin-jobs.yaml
+++ b/jenkins/jobs/maven-plugin-jobs.yaml
@@ -2,8 +2,8 @@
 # https://issues.jenkins-ci.org/browse/JENKINS-14193
 
 - job-template:
-    name: '{name}-localrepo-upload'
-    node: ubuntu-trusty
+    name: '{name}-localrepo-upload-{node}'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -52,7 +52,10 @@
 
 - job-group:
     name: maven-plugin-jobs
+    node:
+      - ubuntu-trusty
+      - ubuntu-xenial
     jobs:
-      - 'gate-{name}-build'
-      - '{name}-localrepo-upload'
+      - 'gate-{name}-maven-build-{node}'
+      - '{name}-localrepo-upload-{node}'
       - '{name}-mavencentral-upload'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7aae22f2d1..aa291597a3 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3802,9 +3802,9 @@ projects:
     template:
       - name: merge-check
     check:
-      - gate-gearman-plugin-build
+      - gate-gearman-plugin-maven-build-ubuntu-trusty
     gate:
-      - gate-gearman-plugin-build
+      - gate-gearman-plugin-maven-build-ubuntu-trusty
     post:
       - gearman-plugin-hpi-artifact
     release:
@@ -5057,9 +5057,9 @@ projects:
     template:
       - name: merge-check
     check:
-      - gate-zmq-event-publisher-build
+      - gate-zmq-event-publisher-maven-build-ubuntu-trusty
     gate:
-      - gate-zmq-event-publisher-build
+      - gate-zmq-event-publisher-maven-build-ubuntu-trusty
     post:
       - zmq-event-publisher-hpi-artifact
     release:
@@ -6310,13 +6310,13 @@ projects:
     template:
       - name: merge-check
     check:
-      - gate-clouddocs-maven-plugin-build
+      - gate-clouddocs-maven-plugin-maven-build-ubuntu-xenial
     gate:
-      - gate-clouddocs-maven-plugin-build
+      - gate-clouddocs-maven-plugin-maven-build-ubuntu-xenial
     post:
-      - clouddocs-maven-plugin-localrepo-upload
+      - clouddocs-maven-plugin-localrepo-upload-ubuntu-xenial
     release:
-      - clouddocs-maven-plugin-localrepo-upload:
+      - clouddocs-maven-plugin-localrepo-upload-ubuntu-xenial:
         - clouddocs-maven-plugin-mavencentral-upload
 
   - name: openstack/cloudkitty
@@ -11330,7 +11330,8 @@ projects:
       - gate-monasca-api-python27-ubuntu-trusty
       - gate-monasca-api-pep8-ubuntu-xenial
       - gate-monasca-api-python27-ubuntu-xenial
-      - gate-monasca-api-build
+      - gate-monasca-api-maven-build-ubuntu-trusty
+      - gate-monasca-api-maven-build-ubuntu-xenial
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty
       - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
@@ -11340,13 +11341,15 @@ projects:
       - gate-monasca-api-python27-ubuntu-trusty
       - gate-monasca-api-pep8-ubuntu-xenial
       - gate-monasca-api-python27-ubuntu-xenial
-      - gate-monasca-api-build
+      - gate-monasca-api-maven-build-ubuntu-trusty
+      - gate-monasca-api-maven-build-ubuntu-xenial
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty
       - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
       - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial
     post:
-      - monasca-api-localrepo-upload
+      - monasca-api-localrepo-upload-ubuntu-trusty
+      - monasca-api-localrepo-upload-ubuntu-xenial
 
   - name: openstack/monasca-ceilometer
     template:
@@ -11372,7 +11375,8 @@ projects:
       - gate-monasca-common-python27-ubuntu-trusty
       - gate-monasca-common-pep8-ubuntu-xenial
       - gate-monasca-common-python27-ubuntu-xenial
-      - gate-monasca-common-build
+      - gate-monasca-common-maven-build-ubuntu-trusty
+      - gate-monasca-common-maven-build-ubuntu-xenial
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
       - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
@@ -11382,9 +11386,11 @@ projects:
       - gate-monasca-common-python27-ubuntu-trusty
       - gate-monasca-common-pep8-ubuntu-xenial
       - gate-monasca-common-python27-ubuntu-xenial
-      - gate-monasca-common-build
+      - gate-monasca-common-maven-build-ubuntu-trusty
+      - gate-monasca-common-maven-build-ubuntu-xenial
     post:
-      - monasca-common-localrepo-upload
+      - monasca-common-localrepo-upload-ubuntu-trusty
+      - monasca-common-localrepo-upload-ubuntu-xenial
 
   - name: openstack/monasca-events-api
     template:
@@ -11414,16 +11420,19 @@ projects:
       - gate-monasca-log-api-python27-ubuntu-trusty
       - gate-monasca-log-api-pep8-ubuntu-xenial
       - gate-monasca-log-api-python27-ubuntu-xenial
-      - gate-monasca-log-api-build
+      - gate-monasca-log-api-maven-build-ubuntu-trusty
+      - gate-monasca-log-api-maven-build-ubuntu-xenial
       - gate-tempest-dsvm-monasca-log-api-ubuntu-xenial-nv
     gate:
       - gate-monasca-log-api-pep8-ubuntu-trusty
       - gate-monasca-log-api-python27-ubuntu-trusty
       - gate-monasca-log-api-pep8-ubuntu-xenial
       - gate-monasca-log-api-python27-ubuntu-xenial
-      - gate-monasca-log-api-build
+      - gate-monasca-log-api-maven-build-ubuntu-trusty
+      - gate-monasca-log-api-maven-build-ubuntu-xenial
     post:
-      - monasca-log-api-localrepo-upload
+      - monasca-log-api-localrepo-upload-ubuntu-trusty
+      - monasca-log-api-localrepo-upload-ubuntu-xenial
 
   - name: openstack/monasca-notification
     template:
@@ -11455,7 +11464,8 @@ projects:
       - gate-monasca-persister-python27-ubuntu-trusty
       - gate-monasca-persister-pep8-ubuntu-xenial
       - gate-monasca-persister-python27-ubuntu-xenial
-      - gate-monasca-persister-build
+      - gate-monasca-persister-maven-build-ubuntu-trusty
+      - gate-monasca-persister-maven-build-ubuntu-xenial
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
       - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
@@ -11465,11 +11475,13 @@ projects:
       - gate-monasca-persister-python27-ubuntu-trusty
       - gate-monasca-persister-pep8-ubuntu-xenial
       - gate-monasca-persister-python27-ubuntu-xenial
-      - gate-monasca-persister-build
+      - gate-monasca-persister-maven-build-ubuntu-trusty
+      - gate-monasca-persister-maven-build-ubuntu-xenial
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
       - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
     post:
-      - monasca-persister-localrepo-upload
+      - monasca-persister-localrepo-upload-ubuntu-trusty
+      - monasca-persister-localrepo-upload-ubuntu-xenial
 
   - name: openstack/monasca-statsd
     template:
@@ -11495,15 +11507,18 @@ projects:
     template:
       - name: merge-check
     check:
-      - gate-monasca-thresh-build
+      - gate-monasca-thresh-maven-build-ubuntu-trusty
+      - gate-monasca-thresh-maven-build-ubuntu-xenial
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
       - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
       - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
     gate:
-      - gate-monasca-thresh-build
+      - gate-monasca-thresh-maven-build-ubuntu-trusty
+      - gate-monasca-thresh-maven-build-ubuntu-xenial
     post:
-      - monasca-thresh-localrepo-upload
+      - monasca-thresh-localrepo-upload-ubuntu-trusty
+      - monasca-thresh-localrepo-upload-ubuntu-xenial
 
   - name: openstack/monasca-transform
     template: