diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
index b4a8d7b..6058c1e 100644
--- a/jenkins/gerrit-bazel-template.yaml
+++ b/jenkins/gerrit-bazel-template.yaml
@@ -64,10 +64,15 @@
     description: '{name} {branch} branch build with Bazel'
     defaults: gerrit-bazel-defaults
     node: bazel-debian
+    properties:
+      - inject:
+          properties-content: >
+            BAZEL_OPTS=--java_toolchain=//tools:error_prone_warnings_toolchain
 
 - job-template:
-    name: 'Gerrit-bazel-java11-{branch}'
-    description: '{name} {branch} branch build with Bazel and Java 11'
+    name: 'Gerrit-bazel-java11-stable-{ver}'
+    branch: stable-3.2
+    description: '{name} stable-{ver} branch build with Bazel and Java 11'
     defaults: gerrit-bazel-defaults
     properties:
       - build-discarder:
@@ -85,10 +90,15 @@
             --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
             --java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
 
+- job-template:
+    name: 'Gerrit-bazel-java11-{branch}'
+    description: '{name} {branch} branch build with Bazel'
+    defaults: gerrit-bazel-defaults
+    node: bazel-debian
+
 - project:
     name: Gerrit-bazel
     branch:
-      - master
       - stable-3.2
       - stable-3.1
       - stable-3.0
@@ -100,10 +110,16 @@
     name: Gerrit-bazel-java11
     branch:
       - master
-      - stable-3.2
     jobs:
       - 'Gerrit-bazel-java11-{branch}'
 
+- project:
+    name: Gerrit-bazel-java11-stable-3.2
+    ver:
+      - 3.2
+    jobs:
+      - 'Gerrit-bazel-java11-stable-{ver}'
+
 - view:
     name: Gerrit
     view-type: list
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index 0eff16a..8f4ed55 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -76,6 +76,7 @@
       - inject:
           properties-content: >
             BAZEL_OPTS=--remote_cache=https://gerrit-ci.gerritforge.com/cache
+            --java_toolchain=//tools:error_prone_warnings_toolchain
     scm:
       - git:
           url: https://gerrit.googlesource.com/a/gerrit