diff --git a/jenkins-docker/master/config.xml b/jenkins-docker/master/config.xml
index dd731be..3268d5f 100644
--- a/jenkins-docker/master/config.xml
+++ b/jenkins-docker/master/config.xml
@@ -38,7 +38,7 @@
       <templates>
         <com.nirima.jenkins.plugins.docker.DockerTemplate>
           <configVersion>2</configVersion>
-          <labelString>bazel-chrome80</labelString>
+          <labelString>bazel-debian-chrome80</labelString>
           <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
             <sshConnector plugin="ssh-slaves@1.11">
               <port>22</port>
@@ -85,7 +85,7 @@
         </com.nirima.jenkins.plugins.docker.DockerTemplate>
         <com.nirima.jenkins.plugins.docker.DockerTemplate>
           <configVersion>2</configVersion>
-          <labelString>bazel-chrome69</labelString>
+          <labelString>bazel-debian</labelString>
           <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
             <sshConnector plugin="ssh-slaves@1.11">
               <port>22</port>
diff --git a/jenkins/gerrit-bazel-plugin-account.yaml b/jenkins/gerrit-bazel-plugin-account.yaml
index 2be4c9e..054dfd2 100644
--- a/jenkins/gerrit-bazel-plugin-account.yaml
+++ b/jenkins/gerrit-bazel-plugin-account.yaml
@@ -2,7 +2,7 @@
     name: 'plugin-account-bazel-{branch}'
     description: 'Plugin account {branch} branch build with Bazel'
     defaults: plugin-template-bazel
-    node: bazel-chrome80
+    node: bazel-debian
     class: plugins
     project-name: plugins%2Faccount
     scm:
diff --git a/jenkins/gerrit-bazel-plugin-gitblit.yaml b/jenkins/gerrit-bazel-plugin-gitblit.yaml
index 8434250..c137bd9 100644
--- a/jenkins/gerrit-bazel-plugin-gitblit.yaml
+++ b/jenkins/gerrit-bazel-plugin-gitblit.yaml
@@ -38,7 +38,7 @@
     defaults: plugin-gitblit
     project-name: plugins%2Fgitblit
     class: plugins
-    node: bazel-chrome80
+    node: bazel-debian
     scm:
       - git:
           remotes:
diff --git a/jenkins/gerrit-bazel-plugin-its-template.yaml b/jenkins/gerrit-bazel-plugin-its-template.yaml
index da582df..45ff57d 100644
--- a/jenkins/gerrit-bazel-plugin-its-template.yaml
+++ b/jenkins/gerrit-bazel-plugin-its-template.yaml
@@ -38,7 +38,7 @@
     name: 'plugin-its-{name}-bazel-{branch}'
     description: 'Plugin its-{name} {branch} branch build with Bazel'
     defaults: plugin-its-template
-    node: bazel-chrome80
+    node: bazel-debian
     builders:
       - shell: !include-raw: gerrit-bazel-build-its-plugin.sh
       - shell: !include-raw: gerrit-bazel-get-its-plugin-info.sh
@@ -52,7 +52,7 @@
     name: 'plugin-its-{name}-bazel-{branch}-{gerrit-branch}'
     description: 'Plugin its-{name} {branch} branch Bazel build for Gerrit {gerrit-branch}'
     defaults: plugin-its-template
-    node: bazel-chrome80
+    node: bazel-debian
     scm:
       - git:
           remotes:
diff --git a/jenkins/gerrit-bazel-plugin-template.yaml b/jenkins/gerrit-bazel-plugin-template.yaml
index cff3f5a..d5bba0d 100644
--- a/jenkins/gerrit-bazel-plugin-template.yaml
+++ b/jenkins/gerrit-bazel-plugin-template.yaml
@@ -46,7 +46,7 @@
     name: 'plugin-{name}-bazel-{branch}'
     description: 'Plugin {name} {branch} branch build with Bazel'
     defaults: plugin-template-bazel
-    node: bazel-chrome80
+    node: bazel-debian
     class: plugins
     project-name: plugins%2F{name}
     scm:
@@ -75,7 +75,7 @@
 - job-template:
     name: 'plugin-{name}-bazel-{branch}-{gerrit-branch}'
     class: plugins
-    node: bazel-chrome80
+    node: bazel-debian
     description: 'Plugin {name} {branch} branch Bazel build for Gerrit {gerrit-branch}'
     defaults: plugin-template-bazel
     scm:
@@ -99,7 +99,7 @@
 - job-template:
     name: 'module-{name}-bazel-{branch}-{gerrit-branch}'
     class: modules
-    node: bazel-chrome80
+    node: bazel-debian
     description: 'Lib module {name} {branch} branch Bazel build for Gerrit {gerrit-branch}'
     defaults: plugin-template-bazel
     scm:
@@ -123,7 +123,7 @@
 - job-template:
     name: 'module-{name}-bazel-{branch}'
     class: modules
-    node: bazel-chrome80
+    node: bazel-debian
     description: 'Lib module {name} {branch} branch Bazel build'
     defaults: plugin-template-bazel
     scm:
diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
index cd5fd62..b8b78e9 100644
--- a/jenkins/gerrit-bazel-template.yaml
+++ b/jenkins/gerrit-bazel-template.yaml
@@ -1,6 +1,6 @@
 - defaults:
     name: gerrit-bazel-defaults
-    node: bazel-chrome80
+    node: bazel-debian
     properties:
       - build-discarder:
           days-to-keep: 20
@@ -52,16 +52,15 @@
           excludes: 'gerrit/bazel-bin/plugins/core*/**/*.jar'
 
 - job-template:
-    name: 'Gerrit-bazel-{branch}-{config}'
-    description: '{name} {branch} branch build with Bazel on {config}'
+    name: 'Gerrit-bazel-{branch}'
+    description: '{name} {branch} branch build with Bazel'
     defaults: gerrit-bazel-defaults
-    node: bazel-{config}
+    node: bazel-debian
 
 - job-template:
-    name: 'Gerrit-bazel-java11-{branch}-{config}'
-    description: '{name} {branch} branch build with Bazel and Java 11 on {config}'
+    name: 'Gerrit-bazel-java11-{branch}'
+    description: '{name} {branch} branch build with Bazel and Java 11'
     defaults: gerrit-bazel-defaults
-    node: bazel-{config}
     properties:
       - build-discarder:
           days-to-keep: 20
@@ -79,35 +78,23 @@
             --java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
 
 - project:
-    name: Gerrit-bazel-chrome69
-    config:
-      - chrome69
+    name: Gerrit-bazel
     branch:
+      - master
+      - stable-3.2
       - stable-3.1
       - stable-3.0
       - stable-2.16
     jobs:
-      - 'Gerrit-bazel-{branch}-{config}'
+      - 'Gerrit-bazel-{branch}'
 
 - project:
-    name: Gerrit-bazel-chrome80
-    config:
-      - chrome80
+    name: Gerrit-bazel-java11
     branch:
       - master
       - stable-3.2
     jobs:
-      - 'Gerrit-bazel-{branch}-{config}'
-
-- project:
-    name: Gerrit-bazel-java11-chrome80
-    config:
-      - chrome80
-    branch:
-      - master
-      - stable-3.2
-    jobs:
-      - 'Gerrit-bazel-java11-{branch}-{config}'
+      - 'Gerrit-bazel-java11-{branch}'
 
 - view:
     name: Gerrit
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index c110018..dc69949 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -105,7 +105,7 @@
     name: Gerrit-verifier-bazel
     description: 'Gerrit build of open change with Bazel'
     defaults: verifier-defaults
-    node: bazel-chrome69
+    node: bazel-debian
     properties:
       - inject:
           properties-content: >
@@ -160,7 +160,7 @@
     name: Gerrit-codestyle
     description: 'Gerrit code-style checker for an open change'
     defaults: verifier-defaults
-    node: bazel-chrome80
+    node: bazel-debian
     builders:
       - merge-target-branch
       - fetch-all-submodules
diff --git a/jenkins/jgit.yaml b/jenkins/jgit.yaml
index 80dd040..ec67f49 100644
--- a/jenkins/jgit.yaml
+++ b/jenkins/jgit.yaml
@@ -1,7 +1,7 @@
 - job:
     name: 'jgit-master'
     description: 'JGit Bazel build on master'
-    node: bazel-chrome80
+    node: bazel-debian
     wrappers:
       - timeout:
           timeout: 30