diff --git a/jenkins-docker/Makefile b/jenkins-docker/Makefile
index 2d2fa6e..5b96932 100644
--- a/jenkins-docker/Makefile
+++ b/jenkins-docker/Makefile
@@ -1,4 +1,4 @@
-SLAVE_DIRS ?= slave-debian slave-chrome slave-node-wct slave-buck slave-bazel-nocache slave-bazel slave-bazel-docker slave-sbt slave-mvn slave-release
+SLAVE_DIRS ?= slave-debian slave-chrome slave-node-wct slave-bazel-nocache slave-bazel slave-bazel-docker slave-sbt slave-mvn slave-release
 ALL_DIRS ?= master $(SLAVE_DIRS)
 NO_CACHE ?= true
 
diff --git a/jenkins-docker/README.md b/jenkins-docker/README.md
index 5f72437..1517d7d 100644
--- a/jenkins-docker/README.md
+++ b/jenkins-docker/README.md
@@ -41,8 +41,6 @@
 
 * gerritforge/gerrit-ci-slave-debian: Base Jenkins slave with OS and prerequisites.
 
-* gerritforge/gerrit-ci-slave-buck: Buck build for older Gerrit until 2.13
-
 * gerritforge/gerrit-ci-slave-bazel: Bazel build for gerrit 2.14+.
 
 * gerritforge/gerrit-ci-slave-bazel-sbt: Setups scala for plugins that use scala.
diff --git a/jenkins-docker/master/config.xml b/jenkins-docker/master/config.xml
index c9604cf..c4ff82a 100644
--- a/jenkins-docker/master/config.xml
+++ b/jenkins-docker/master/config.xml
@@ -197,7 +197,7 @@
           </default>
           <int>1</int>
           <string>PATH</string>
-          <string>/var/lib/jenkins/buck/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin</string>
+          <string>/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin</string>
         </tree-map>
       </envVars>
     </hudson.slaves.EnvironmentVariablesNodeProperty>
diff --git a/jenkins-docker/slave-bazel-nocache/Dockerfile b/jenkins-docker/slave-bazel-nocache/Dockerfile
index 0222661..25f8ea2 100644
--- a/jenkins-docker/slave-bazel-nocache/Dockerfile
+++ b/jenkins-docker/slave-bazel-nocache/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-buck:debian-stretch
+FROM gerritforge/gerrit-ci-slave-node-wct:$NODE_VER-$WCT_VER
 
 ARG BAZEL_VER
 ARG BUILDIFIER_VER
diff --git a/jenkins-docker/slave-bazel-nocache/Makefile b/jenkins-docker/slave-bazel-nocache/Makefile
index b522ffe..882cc74 100644
--- a/jenkins-docker/slave-bazel-nocache/Makefile
+++ b/jenkins-docker/slave-bazel-nocache/Makefile
@@ -3,14 +3,20 @@
 BAZEL_VER=0.26.1
 BUILDIFIER_VER=0.26.0
 BAZELISK_VER=0.0.7
+NODE_VER=10
+WCT_VER=6.8.0
 
 # Targets
 
 build:
+	cat Dockerfile | \
+        BAZEL_VER=${BAZEL_VER} \
+        BUILDIFIER_VER=${BUILDIFIER_VER} \
+        BAZELISK_VER=${BAZELISK_VER} \
+        NODE_VER=${NODE_VER} \
+        WCT_VER=${WCT_VER} envsubst > Dockerfile-subst
 	docker build --no-cache=$(NO_CACHE) \
-        --build-arg BAZEL_VER=${BAZEL_VER} \
-        --build-arg BUILDIFIER_VER=${BUILDIFIER_VER} \
-        --build-arg BAZELISK_VER=${BAZELISK_VER} \
+        -f Dockerfile-subst \
         -t ${IMAGE} .
 
 publish:
diff --git a/jenkins-docker/slave-buck/Dockerfile b/jenkins-docker/slave-buck/Dockerfile
deleted file mode 100644
index 67cb965..0000000
--- a/jenkins-docker/slave-buck/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM gerritforge/gerrit-ci-slave-node-wct:$NODE_VER-$WCT_VER
-
-# Buck build
-
-RUN git clone https://github.com/facebook/buck /opt/buck-java && \
-    cd /opt/buck-java && \
-    git checkout e64a2e2ada022f81e42be750b774024469551398 && \
-    ant && \
-    chown -R jenkins:jenkins /opt/buck-java
-
-COPY set-buck.sh /usr/bin/
-
-COPY default-buck.sh /etc/profile.d/
-
-RUN echo ". /usr/bin/set-buck.sh" >> /usr/bin/set-java.sh
-
-## NOTE ##
-# Watchman can be enabled (to enable buckd) by uncommenting the following
-# lines.  Note that because this caches some build results, it can lead to
-# unpredictable behavior in a continuous integration setting.
-# ENABLE AT YOUR OWN RISK!
-#
-#RUN git clone https://github.com/facebook/watchman.git /opt/watchman && \
-#    cd /opt/watchman && \
-#    ./autogen.sh && \
-#    ./configure && \
-#    make && \
-#    make install
-#
-## END WATCHMAN SECTION ##
-
-# Buck JVM options setup
-COPY buckjavaargs /home/jenkins/.buckjavaargs
-
-# Buck cache warm-up with Gerrit 2.13 build
-USER jenkins
-RUN bash -c '. /usr/bin/set-java.sh 8 && cd /tmp &&  \
-    git clone -b stable-2.13 --recursive https://gerrit.googlesource.com/gerrit && \
-    cd gerrit && buck build gerrit api plugins:core || true  && \
-    buck test --dry-run --no-results-cache --exclude flaky || true  && \
-    rm -Rf /tmp/gerrit /home/jenkins/.gerritcodereview/buck-cache/{cache,locally-built-artifacts}'
-
-# Enable Buck rebuild
-ENV BUCK_CLEAN_REPO_IF_DIRTY y
-
-USER root
diff --git a/jenkins-docker/slave-buck/Makefile b/jenkins-docker/slave-buck/Makefile
deleted file mode 100644
index 83de1d7..0000000
--- a/jenkins-docker/slave-buck/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-NO_CACHE=false
-IMAGE=gerritforge/gerrit-ci-slave-buck:debian-stretch
-NODE_VER ?= 10
-WCT_VER ?= 6.8.0
-
-# Targets
-
-build:
-	cat Dockerfile | NODE_VER=$(NODE_VER) WCT_VER=$(WCT_VER) envsubst > Dockerfile-$(NODE_VER)-$(WCT_VER)
-	docker build -f Dockerfile-$(NODE_VER)-$(WCT_VER) --no-cache=$(NO_CACHE) -t $(IMAGE) .
-
-publish:
-	docker push ${IMAGE}
-
-clean:
-	docker rmi -f ${IMAGE}
-
-.PHONY: clean image publish
-
diff --git a/jenkins-docker/slave-buck/buckjavaargs b/jenkins-docker/slave-buck/buckjavaargs
deleted file mode 100644
index 3eb655b..0000000
--- a/jenkins-docker/slave-buck/buckjavaargs
+++ /dev/null
@@ -1 +0,0 @@
-  -Xms8000m -Xmx12000m
diff --git a/jenkins-docker/slave-buck/default-buck.sh b/jenkins-docker/slave-buck/default-buck.sh
deleted file mode 100755
index d9dbfa1..0000000
--- a/jenkins-docker/slave-buck/default-buck.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-. /usr/bin/set-buck.sh
diff --git a/jenkins-docker/slave-buck/set-buck.sh b/jenkins-docker/slave-buck/set-buck.sh
deleted file mode 100755
index 9b1c4cb..0000000
--- a/jenkins-docker/slave-buck/set-buck.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export PATH=/opt/buck-java/bin:$PATH
-
-echo "Buck set to: $(which buck)"
diff --git a/jenkins/checker_definitions.txt b/jenkins/checker_definitions.txt
index 0340800..1ec3bf3 100644
--- a/jenkins/checker_definitions.txt
+++ b/jenkins/checker_definitions.txt
@@ -16,7 +16,7 @@
     "name": "ReviewDb Build/Tests",
     "description": "Using ReviewDb, builds the code base and executes unit/integration tests",
     "repository": "gerrit",
-    "query": "branch:stable-2.13 OR branch:stable-2.14 OR branch:stable-2.15 OR branch:stable-2.16",
+    "query": "branch:stable-2.14 OR branch:stable-2.15 OR branch:stable-2.16",
     "blocking": []
   }
 
diff --git a/jenkins/defaults.yaml b/jenkins/defaults.yaml
index 775bf92..e69de29 100644
--- a/jenkins/defaults.yaml
+++ b/jenkins/defaults.yaml
@@ -1,3 +0,0 @@
-- defaults:
-    name: buck-plugin
-    targets: 'plugins/{name}:{name}'
diff --git a/jenkins/gerrit-bazel-plugin-webhooks.yaml b/jenkins/gerrit-bazel-plugin-webhooks.yaml
index 0aaa7fd..cf2a0a7 100644
--- a/jenkins/gerrit-bazel-plugin-webhooks.yaml
+++ b/jenkins/gerrit-bazel-plugin-webhooks.yaml
@@ -1,9 +1,6 @@
 - project:
     name: webhooks
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.16
diff --git a/jenkins/gerrit-buck-bazel-plugin-admin-console.yaml b/jenkins/gerrit-buck-bazel-plugin-admin-console.yaml
index 6b32432..9d0c9a1 100644
--- a/jenkins/gerrit-buck-bazel-plugin-admin-console.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-admin-console.yaml
@@ -1,9 +1,6 @@
 - project:
     name: admin-console
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-avatars-external.yaml b/jenkins/gerrit-buck-bazel-plugin-avatars-external.yaml
index ceea5f3..92dc20f 100644
--- a/jenkins/gerrit-buck-bazel-plugin-avatars-external.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-avatars-external.yaml
@@ -1,9 +1,6 @@
 - project:
     name: avatars-external
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-avatars-gravatar.yaml b/jenkins/gerrit-buck-bazel-plugin-avatars-gravatar.yaml
index 6b24cd4..8d1df0a 100644
--- a/jenkins/gerrit-buck-bazel-plugin-avatars-gravatar.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-avatars-gravatar.yaml
@@ -1,9 +1,6 @@
 - project:
     name: avatars-gravatar
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-cloud-notifications.yaml b/jenkins/gerrit-buck-bazel-plugin-cloud-notifications.yaml
index e734a2a..ef2702e 100644
--- a/jenkins/gerrit-buck-bazel-plugin-cloud-notifications.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-cloud-notifications.yaml
@@ -1,11 +1,8 @@
 - project:
     name: cloud-notifications
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
             - stable-2.14
-            - stable-2.15
\ No newline at end of file
+            - stable-2.15
diff --git a/jenkins/gerrit-buck-bazel-plugin-delete-project.yaml b/jenkins/gerrit-buck-bazel-plugin-delete-project.yaml
index 27db921..ed028a3 100644
--- a/jenkins/gerrit-buck-bazel-plugin-delete-project.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-delete-project.yaml
@@ -1,9 +1,6 @@
 - project:
     name: delete-project
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.16
diff --git a/jenkins/gerrit-buck-bazel-plugin-emoticons.yaml b/jenkins/gerrit-buck-bazel-plugin-emoticons.yaml
index d2ebfc6..8ac7b60 100644
--- a/jenkins/gerrit-buck-bazel-plugin-emoticons.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-emoticons.yaml
@@ -1,11 +1,8 @@
 - project:
     name: emoticons
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.16
             - stable-2.15
-            - stable-2.14
\ No newline at end of file
+            - stable-2.14
diff --git a/jenkins/gerrit-buck-bazel-plugin-events-log.yaml b/jenkins/gerrit-buck-bazel-plugin-events-log.yaml
index 2e529f7..0c380be 100644
--- a/jenkins/gerrit-buck-bazel-plugin-events-log.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-events-log.yaml
@@ -1,9 +1,6 @@
 - project:
     name: events-log
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-force-draft.yaml b/jenkins/gerrit-buck-bazel-plugin-force-draft.yaml
index 274669d..db9eca7 100644
--- a/jenkins/gerrit-buck-bazel-plugin-force-draft.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-force-draft.yaml
@@ -1,9 +1,6 @@
 - project:
     name: force-draft
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.14
diff --git a/jenkins/gerrit-buck-bazel-plugin-gh-template.yaml b/jenkins/gerrit-buck-bazel-plugin-gh-template.yaml
index 88412a1..aa1f79c 100644
--- a/jenkins/gerrit-buck-bazel-plugin-gh-template.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-gh-template.yaml
@@ -35,18 +35,6 @@
           cron: 'H/50 * * * *'
 
 - job-template:
-    name: 'plugin-{name}-gh-{branch}'
-    description: "Plugin {name} {branch} branch build with BUCK owned by {organization} and hosted on GitHub\n"
-    defaults: plugin-gh-template
-    builders:
-      - shell:
-         !include-raw: gerrit-buck-build-plugin.sh
-    publishers:
-      - archive:
-         artifacts: >
-           buck-out/gen/plugins/{name}/{name}.jar*
-
-- job-template:
     name: 'plugin-{name}-gh-bazel-{branch}'
     description: "Plugin {name} {branch} branch build with Bazel owned by {organization} and hosted on GitHub\n"
     defaults: plugin-gh-template
diff --git a/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml b/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml
index 53746d8..f2d5e11 100644
--- a/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-gitblit.yaml
@@ -1,7 +1,6 @@
 - defaults:
     name: 'plugin-gitblit'
     description: "GitBlit plugin {branch} branch build with BUCK\n"
-    defaults: buck-plugin
     wrappers:
       - timeout:
           timeout: 30
@@ -38,19 +37,6 @@
           cron: 'H/50 * * * *'
 
 - job-template:
-    name: 'plugin-gitblit-{branch}'
-    description: "GitBlit plugin {branch} branch build with BUCK\n"
-    defaults: plugin-gitblit
-    builders:
-      - shell:
-         !include-raw: gitblit-ant-build.sh
-      - shell:
-         !include-raw: gerrit-buck-build-plugin.sh
-    publishers:
-      - archive:
-         artifacts: 'buck-out/gen/plugins/gitblit/*gitblit*.jar*,buck-out/gen/plugins/gitblit/*gitblit*.json'
-
-- job-template:
     name: 'plugin-gitblit-bazel-{branch}'
     description: "GitBlit plugin Bazel build for Gerrit {branch}\n"
     defaults: plugin-gitblit
diff --git a/jenkins/gerrit-buck-bazel-plugin-gitiles.yaml b/jenkins/gerrit-buck-bazel-plugin-gitiles.yaml
index 6418f71..e9455bc 100644
--- a/jenkins/gerrit-buck-bazel-plugin-gitiles.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-gitiles.yaml
@@ -1,12 +1,6 @@
 - project:
     name: gitiles
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
-      - 'pluginmanual-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.16
diff --git a/jenkins/gerrit-buck-bazel-plugin-go-import.yaml b/jenkins/gerrit-buck-bazel-plugin-go-import.yaml
index bea9e92..d369158 100644
--- a/jenkins/gerrit-buck-bazel-plugin-go-import.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-go-import.yaml
@@ -1,9 +1,6 @@
 - project:
     name: go-import
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-groovy-provider.yaml b/jenkins/gerrit-buck-bazel-plugin-groovy-provider.yaml
index 2b7ab21..c356d17 100644
--- a/jenkins/gerrit-buck-bazel-plugin-groovy-provider.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-groovy-provider.yaml
@@ -1,9 +1,6 @@
 - project:
     name: groovy-provider
     jobs:
-      - 'plugin-scripting-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-scripting-{name}-bazel-{branch}-{gerrit-branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-high-availability.yaml b/jenkins/gerrit-buck-bazel-plugin-high-availability.yaml
index a58af23..169458e 100644
--- a/jenkins/gerrit-buck-bazel-plugin-high-availability.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-high-availability.yaml
@@ -1,9 +1,6 @@
 - project:
     name: high-availability
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.16
diff --git a/jenkins/gerrit-buck-bazel-plugin-imagare.yaml b/jenkins/gerrit-buck-bazel-plugin-imagare.yaml
index e0bb255..c058577 100644
--- a/jenkins/gerrit-buck-bazel-plugin-imagare.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-imagare.yaml
@@ -1,9 +1,6 @@
 - project:
     name: imagare
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-importer.yaml b/jenkins/gerrit-buck-bazel-plugin-importer.yaml
index 0ac24cb..3ef569b 100644
--- a/jenkins/gerrit-buck-bazel-plugin-importer.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-importer.yaml
@@ -1,9 +1,6 @@
 - project:
     name: importer
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.15
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-base.yaml b/jenkins/gerrit-buck-bazel-plugin-its-base.yaml
index fd9eacb..eb39b44 100644
--- a/jenkins/gerrit-buck-bazel-plugin-its-base.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-its-base.yaml
@@ -1,9 +1,6 @@
 - project:
     name: its-base
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-jira.yaml b/jenkins/gerrit-buck-bazel-plugin-its-jira.yaml
index 3fa4e8f..5b65db3 100644
--- a/jenkins/gerrit-buck-bazel-plugin-its-jira.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-its-jira.yaml
@@ -1,9 +1,6 @@
 - project:
     name: jira
     jobs:
-      - 'plugin-its-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-its-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-phabricator.yaml b/jenkins/gerrit-buck-bazel-plugin-its-phabricator.yaml
index 56b220c..632060b 100644
--- a/jenkins/gerrit-buck-bazel-plugin-its-phabricator.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-its-phabricator.yaml
@@ -1,9 +1,6 @@
 - project:
     name: phabricator
     jobs:
-      - 'plugin-its-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-its-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-storyboard.yaml b/jenkins/gerrit-buck-bazel-plugin-its-storyboard.yaml
index 3cfc154..8651854 100644
--- a/jenkins/gerrit-buck-bazel-plugin-its-storyboard.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-its-storyboard.yaml
@@ -1,9 +1,6 @@
 - project:
     name: storyboard
     jobs:
-      - 'plugin-its-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-its-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-its-template.yaml b/jenkins/gerrit-buck-bazel-plugin-its-template.yaml
index 97a7bee..622df37 100644
--- a/jenkins/gerrit-buck-bazel-plugin-its-template.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-its-template.yaml
@@ -37,18 +37,6 @@
           cron: 'H/50 * * * *'
 
 - job-template:
-    name: 'plugin-its-{name}-{branch}'
-    description: "Plugin its-{name} {branch} branch build with BUCK\n"
-    defaults: plugin-its-template
-    builders:
-      - shell:
-         !include-raw: gerrit-buck-build-its-plugin.sh
-    publishers:
-      - archive:
-         artifacts: >
-           buck-out/gen/plugins/its-{name}/its-{name}.jar*
-
-- job-template:
     name: 'plugin-its-{name}-bazel-{branch}'
     description: "Plugin its-{name} {branch} branch build with Bazel\n"
     defaults: plugin-its-template
diff --git a/jenkins/gerrit-buck-bazel-plugin-javamelody.yaml b/jenkins/gerrit-buck-bazel-plugin-javamelody.yaml
index 4636b80..cb8dea8 100644
--- a/jenkins/gerrit-buck-bazel-plugin-javamelody.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-javamelody.yaml
@@ -13,14 +13,6 @@
 - project:
     name: javamelody
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
-          targets: >
-            plugins/javamelody:javamelody-nodep
-            plugins/javamelody:javamelody-deps
-            plugins/javamelody:javamelody-datasource-interceptor
-            plugins/javamelody:javamelody \
       - 'plugin-javamelody-bazel-{branch}':
           branch:
             - stable-2.14
diff --git a/jenkins/gerrit-buck-bazel-plugin-kafka-events.yaml b/jenkins/gerrit-buck-bazel-plugin-kafka-events.yaml
index 43a2349..46e7848 100644
--- a/jenkins/gerrit-buck-bazel-plugin-kafka-events.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-kafka-events.yaml
@@ -1,9 +1,6 @@
 - project:
     name: kafka-events
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.14
diff --git a/jenkins/gerrit-buck-bazel-plugin-labelui.yaml b/jenkins/gerrit-buck-bazel-plugin-labelui.yaml
index 410884d..b32f6db 100644
--- a/jenkins/gerrit-buck-bazel-plugin-labelui.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-labelui.yaml
@@ -1,9 +1,6 @@
 - project:
     name: labelui
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-lfs.yaml b/jenkins/gerrit-buck-bazel-plugin-lfs.yaml
index 1c0f7d0..1388965 100644
--- a/jenkins/gerrit-buck-bazel-plugin-lfs.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-lfs.yaml
@@ -1,9 +1,6 @@
 - project:
     name: lfs
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-manual-template.yaml b/jenkins/gerrit-buck-bazel-plugin-manual-template.yaml
index 526a186..15c4893 100644
--- a/jenkins/gerrit-buck-bazel-plugin-manual-template.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-manual-template.yaml
@@ -41,18 +41,6 @@
          skip-tag: true
 
 - job-template:
-    name: 'pluginmanual-{name}-{branch}'
-    description: "Plugin {name} {branch} manual branch build with BUCK\n"
-    defaults: pluginmanual-template
-    builders:
-      - shell:
-         !include-raw: gerrit-buck-build-plugin-manual.sh
-    publishers:
-      - archive:
-         artifacts: >
-           buck-out/gen/plugins/{name}/*{name}*.jar*,
-
-- job-template:
     name: 'pluginmanual-{name}-bazel-{branch}'
     description: "Plugin {name} {branch} manual branch build with Bazel\n"
     defaults: pluginmanual-template
diff --git a/jenkins/gerrit-buck-bazel-plugin-menuextender.yaml b/jenkins/gerrit-buck-bazel-plugin-menuextender.yaml
index 38ce470..4170313 100644
--- a/jenkins/gerrit-buck-bazel-plugin-menuextender.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-menuextender.yaml
@@ -1,9 +1,6 @@
 - project:
     name: menuextender
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-metrics-reporter-graphite.yaml b/jenkins/gerrit-buck-bazel-plugin-metrics-reporter-graphite.yaml
index c1cab1d..9919422 100644
--- a/jenkins/gerrit-buck-bazel-plugin-metrics-reporter-graphite.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-metrics-reporter-graphite.yaml
@@ -1,9 +1,6 @@
 - project:
     name: metrics-reporter-graphite
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.14
diff --git a/jenkins/gerrit-buck-bazel-plugin-metrics-reporter-jmx.yaml b/jenkins/gerrit-buck-bazel-plugin-metrics-reporter-jmx.yaml
index 49723b5..920f5f6 100644
--- a/jenkins/gerrit-buck-bazel-plugin-metrics-reporter-jmx.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-metrics-reporter-jmx.yaml
@@ -1,9 +1,6 @@
 - project:
     name: metrics-reporter-jmx
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.14
diff --git a/jenkins/gerrit-buck-bazel-plugin-oauth.yaml b/jenkins/gerrit-buck-bazel-plugin-oauth.yaml
index c6812c1..d619a2d 100644
--- a/jenkins/gerrit-buck-bazel-plugin-oauth.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-oauth.yaml
@@ -1,9 +1,6 @@
 - project:
     name: oauth
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.14
diff --git a/jenkins/gerrit-buck-bazel-plugin-owners.yaml b/jenkins/gerrit-buck-bazel-plugin-owners.yaml
index f01e375..61e7cf3 100644
--- a/jenkins/gerrit-buck-bazel-plugin-owners.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-owners.yaml
@@ -26,25 +26,9 @@
          artifacts: >
            bazel-bin/plugins/owners/owners.jar*,bazel-bin/plugins/owners/owners-autoassign.jar*
 
-- job-template:
-    name: 'plugin-owners-{branch}'
-    description: "Plugin owners stable-2.13 branch build with BUCK\n"
-    defaults: plugin-template
-    builders:
-      - shell:
-         !include-raw: gerrit-buck-build-owners-plugin.sh
-    publishers:
-      - archive:
-         artifacts: >
-           buck-out/gen/plugins/owners*/owners*.jar*,
-
 - project:
     name: owners
     jobs:
-      - 'plugin-owners-{branch}':
-          targets: 'plugins/owners plugins/owners-autoassign'
-          branch:
-            - stable-2.13
       - 'plugin-owners-bazel-{branch}':
           targets: 'plugins/owners plugins/owners-autoassign'
           branch:
diff --git a/jenkins/gerrit-buck-bazel-plugin-plugin-manager.yaml b/jenkins/gerrit-buck-bazel-plugin-plugin-manager.yaml
index d8cf449..d2e66e1 100644
--- a/jenkins/gerrit-buck-bazel-plugin-plugin-manager.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-plugin-manager.yaml
@@ -2,9 +2,6 @@
     name: plugin-manager
     targets: 'plugins/plugin-manager plugins/plugin-manager:plugin_manager_tests'
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.16
diff --git a/jenkins/gerrit-buck-bazel-plugin-project-download-commands.yaml b/jenkins/gerrit-buck-bazel-plugin-project-download-commands.yaml
index d9bc5f2..64b47da 100644
--- a/jenkins/gerrit-buck-bazel-plugin-project-download-commands.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-project-download-commands.yaml
@@ -1,9 +1,6 @@
 - project:
     name: project-download-commands
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-project-group-structure.yaml b/jenkins/gerrit-buck-bazel-plugin-project-group-structure.yaml
index 8eb8d2b..6cfa808 100644
--- a/jenkins/gerrit-buck-bazel-plugin-project-group-structure.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-project-group-structure.yaml
@@ -1,9 +1,6 @@
 - project:
     name: project-group-structure
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-quota.yaml b/jenkins/gerrit-buck-bazel-plugin-quota.yaml
index f297c99..72e37c1 100644
--- a/jenkins/gerrit-buck-bazel-plugin-quota.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-quota.yaml
@@ -1,9 +1,6 @@
 - project:
     name: quota
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-rabbitmq.yaml b/jenkins/gerrit-buck-bazel-plugin-rabbitmq.yaml
index 5109c1e..91fd0fd 100644
--- a/jenkins/gerrit-buck-bazel-plugin-rabbitmq.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-rabbitmq.yaml
@@ -1,9 +1,6 @@
 - project:
     name: rabbitmq
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-ref-protection.yaml b/jenkins/gerrit-buck-bazel-plugin-ref-protection.yaml
index 8d19d2a..560a94a 100644
--- a/jenkins/gerrit-buck-bazel-plugin-ref-protection.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-ref-protection.yaml
@@ -1,9 +1,6 @@
 - project:
     name: ref-protection
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-reparent.yaml b/jenkins/gerrit-buck-bazel-plugin-reparent.yaml
index b0044b0..6ab26d4 100644
--- a/jenkins/gerrit-buck-bazel-plugin-reparent.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-reparent.yaml
@@ -1,9 +1,6 @@
 - project:
     name: reparent
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-replication.yaml b/jenkins/gerrit-buck-bazel-plugin-replication.yaml
index 62a83c8..850b619 100644
--- a/jenkins/gerrit-buck-bazel-plugin-replication.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-replication.yaml
@@ -1,9 +1,6 @@
 - project:
     name: replication
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-reviewassistant.yaml b/jenkins/gerrit-buck-bazel-plugin-reviewassistant.yaml
index 2504f3f..c175ae8 100644
--- a/jenkins/gerrit-buck-bazel-plugin-reviewassistant.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-reviewassistant.yaml
@@ -1,9 +1,6 @@
 - project:
     name: reviewassistant
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-reviewers-by-blame.yaml b/jenkins/gerrit-buck-bazel-plugin-reviewers-by-blame.yaml
index 6599edd..f7d1b1f 100644
--- a/jenkins/gerrit-buck-bazel-plugin-reviewers-by-blame.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-reviewers-by-blame.yaml
@@ -1,9 +1,6 @@
 - project:
     name: reviewers-by-blame
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-reviewers.yaml b/jenkins/gerrit-buck-bazel-plugin-reviewers.yaml
index 0417247..69a4342 100644
--- a/jenkins/gerrit-buck-bazel-plugin-reviewers.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-reviewers.yaml
@@ -1,9 +1,6 @@
 - project:
     name: reviewers
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-scala-provider.yaml b/jenkins/gerrit-buck-bazel-plugin-scala-provider.yaml
index db04901..4bd2c4e 100644
--- a/jenkins/gerrit-buck-bazel-plugin-scala-provider.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-scala-provider.yaml
@@ -1,9 +1,6 @@
 - project:
     name: scala-provider
     jobs:
-      - 'plugin-scripting-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-scripting-{name}-bazel-{branch}-{gerrit-branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml b/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml
index a847ba4..b01a789 100644
--- a/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-scripting-template.yaml
@@ -35,18 +35,6 @@
           cron: 'H/50 * * * *'
 
 - job-template:
-    name: 'plugin-scripting-{name}-{branch}'
-    description: "Plugin scripting/{name} {branch} branch build with BUCK\n"
-    defaults: plugin-scripting-template
-    builders:
-      - shell:
-         !include-raw: gerrit-buck-build-plugin.sh
-    publishers:
-      - archive:
-         artifacts: >
-           buck-out/gen/plugins/{name}/{name}.jar*
-
-- job-template:
     name: 'plugin-scripting-{name}-bazel-{branch}'
     description: "Plugin scripting/{name}/{branch} Bazel build for Gerrit\n"
     defaults: plugin-scripting-template
diff --git a/jenkins/gerrit-buck-bazel-plugin-secure-config.yaml b/jenkins/gerrit-buck-bazel-plugin-secure-config.yaml
index 4553d46..283d4a2 100644
--- a/jenkins/gerrit-buck-bazel-plugin-secure-config.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-secure-config.yaml
@@ -1,9 +1,6 @@
 - project:
     name: secure-config
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-server-config.yaml b/jenkins/gerrit-buck-bazel-plugin-server-config.yaml
index 2aa0dee..9be7bae 100644
--- a/jenkins/gerrit-buck-bazel-plugin-server-config.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-server-config.yaml
@@ -1,9 +1,6 @@
 - project:
     name: server-config
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-serviceuser.yaml b/jenkins/gerrit-buck-bazel-plugin-serviceuser.yaml
index 3398232..16d3f10 100644
--- a/jenkins/gerrit-buck-bazel-plugin-serviceuser.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-serviceuser.yaml
@@ -1,9 +1,6 @@
 - project:
     name: serviceuser
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.16
diff --git a/jenkins/gerrit-buck-bazel-plugin-template.yaml b/jenkins/gerrit-buck-bazel-plugin-template.yaml
index a148600..dc168ce 100644
--- a/jenkins/gerrit-buck-bazel-plugin-template.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-template.yaml
@@ -34,19 +34,6 @@
       - pollscm:
           cron: 'H/50 * * * *'
 
-
-- job-template:
-    name: 'plugin-{name}-{branch}'
-    description: "Plugin {name} {branch} branch build with BUCK\n"
-    defaults: plugin-template
-    builders:
-      - shell:
-         !include-raw: gerrit-buck-build-plugin.sh
-    publishers:
-      - archive:
-         artifacts: >
-           buck-out/gen/plugins/{name}/*{name}*.jar*,
-
 - job-template:
     name: 'plugin-{name}-bazel-{branch}'
     description: "Plugin {name} {branch} branch build with Bazel\n"
@@ -87,4 +74,3 @@
       - stable-2.16
       - stable-2.15
       - stable-2.14
-      - stable-2.13
diff --git a/jenkins/gerrit-buck-bazel-plugin-uploadvalidator.yaml b/jenkins/gerrit-buck-bazel-plugin-uploadvalidator.yaml
index 1350d50..07a0561 100644
--- a/jenkins/gerrit-buck-bazel-plugin-uploadvalidator.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-uploadvalidator.yaml
@@ -1,9 +1,6 @@
 - project:
     name: uploadvalidator
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.16
@@ -14,4 +11,4 @@
             - master
           gerrit-branch:
             - master
-            - stable-3.0
\ No newline at end of file
+            - stable-3.0
diff --git a/jenkins/gerrit-buck-bazel-plugin-verify-status.yaml b/jenkins/gerrit-buck-bazel-plugin-verify-status.yaml
index f60c1de..03a45d1 100644
--- a/jenkins/gerrit-buck-bazel-plugin-verify-status.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-verify-status.yaml
@@ -1,9 +1,6 @@
 - project:
     name: verify-status
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-websession-flatfile.yaml b/jenkins/gerrit-buck-bazel-plugin-websession-flatfile.yaml
index 0905ae0..a95d8bb 100644
--- a/jenkins/gerrit-buck-bazel-plugin-websession-flatfile.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-websession-flatfile.yaml
@@ -1,9 +1,6 @@
 - project:
     name: websession-flatfile
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.15
diff --git a/jenkins/gerrit-buck-bazel-plugin-wip.yaml b/jenkins/gerrit-buck-bazel-plugin-wip.yaml
index 5f08159..b2087d4 100644
--- a/jenkins/gerrit-buck-bazel-plugin-wip.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-wip.yaml
@@ -1,9 +1,6 @@
 - project:
     name: wip
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - stable-2.14
diff --git a/jenkins/gerrit-buck-bazel-plugin-x-docs.yaml b/jenkins/gerrit-buck-bazel-plugin-x-docs.yaml
index 78efedf..a23245b 100644
--- a/jenkins/gerrit-buck-bazel-plugin-x-docs.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-x-docs.yaml
@@ -1,9 +1,6 @@
 - project:
     name: x-docs
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-plugin-zuul.yaml b/jenkins/gerrit-buck-bazel-plugin-zuul.yaml
index df96071..ec80a0e 100644
--- a/jenkins/gerrit-buck-bazel-plugin-zuul.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-zuul.yaml
@@ -1,9 +1,6 @@
 - project:
     name: zuul
     jobs:
-      - 'plugin-{name}-{branch}':
-          branch:
-            - stable-2.13
       - 'plugin-{name}-bazel-{branch}':
           branch:
             - master
diff --git a/jenkins/gerrit-buck-bazel-template.yaml b/jenkins/gerrit-buck-bazel-template.yaml
index a751d51..caaf123 100644
--- a/jenkins/gerrit-buck-bazel-template.yaml
+++ b/jenkins/gerrit-buck-bazel-template.yaml
@@ -1,54 +1,3 @@
-- defaults:
-    name: gerrit-buck-defaults
-    wrappers:
-      - timeout:
-          timeout: 90
-          type: absolute
-          fail: false
-      - timestamps
-      - xvfb:
-          installation-name: Xvfb
-          display-name: 1
-          parallel-build: false
-          timeout: 30
-          screen: 1024x768x16
-          additional-options: -fbdir /tmp
-          debug: true
-          shutdown-with-build: false
-      - raw:
-          xml: <jenkins.plugins.logstash.LogstashBuildWrapper plugin="logstash@1.2.0"/>
-    properties:
-       - build-discarder:
-           days-to-keep: 20
-           artifact-days-to-keep: 20
-       - authorization:
-           anonymous:
-             - job-discover
-             - job-read
-             - job-extended-read
-    scm:
-      - git:
-         url: https://gerrit.googlesource.com/gerrit
-         branches:
-           - origin/{branch}
-         submodule:
-           recursive: true
-         skip-tag: true
-         basedir: gerrit
-
-    builders:
-      - shell:
-         !include-raw: gerrit-buck-build.sh
-      - shell:
-         !include-raw: gerrit-buck-test.sh
-    publishers:
-      - archive:
-         artifacts: >
-           gerrit/buck-out/gen/*.war,gerrit/buck-out/gen/plugins/*/*.jar,gerrit/buck-out/gen/*api/*api.jar,
-           gerrit/buck-out/gen/gerrit-acceptance-framework/*.jar
-
-         excludes: 'gerrit/buck-out/gen/plugins/core*/**/*.jar'
-
 - job-template:
     name: 'Gerrit-{branch}'
     project-type: flow
@@ -78,39 +27,12 @@
              - job-extended-read
     dsl: |
       retries = 3
-      type = '{branch}' in ['master', 'stable-3.0', 'stable-2.16', 'stable-2.15', 'stable-2.14'] ? 'bazel' : 'buck'
+      type = 'bazel'
       parallel (
         {{ retry ( retries ) {{ build( "Gerrit-$type-{branch}" ) }} }}
       )
 
 - job-template:
-    name: 'Gerrit-buck-{branch}'
-    description: "{name} {branch} branch build with Buck\n"
-    defaults: gerrit-buck-defaults
-
-- job:
-    name: Gerrit-buck-stable-2.9
-    description: "Gerrit 2.9 branch build with Buck\n"
-    defaults: gerrit-buck-defaults
-    scm:
-      - git:
-         url: https://gerrit.googlesource.com/gerrit
-         branches:
-           - origin/stable-2.9
-         submodule:
-           recursive: true
-         skip-tag: true
-         basedir: gerrit
-    triggers:
-      - pollscm:
-          cron: 'H/10 * * * *'
-    builders:
-      - shell:
-         !include-raw: gerrit-buck-build.sh
-      - shell:
-         !include-raw: gerrit-buck-test-2.9.sh
-
-- job-template:
     name: 'Gerrit-bazel-{branch}'
     description: "{name} {branch} branch build with Bazel\n"
     node: bazel-debian
@@ -169,14 +91,6 @@
          excludes: 'gerrit/bazel-bin/plugins/core*/**/*.jar'
 
 - project:
-    name: Gerrit-buck
-    branch:
-      - stable-2.13
-    jobs:
-      - 'Gerrit-buck-{branch}'
-
-
-- project:
     name: Gerrit-bazel
     branch:
       - master
@@ -195,7 +109,6 @@
       - stable-2.16
       - stable-2.15
       - stable-2.14
-      - stable-2.13
     jobs:
       - 'Gerrit-{branch}'
 
diff --git a/jenkins/gerrit-buck-build-its-plugin.sh b/jenkins/gerrit-buck-build-its-plugin.sh
deleted file mode 100644
index fe0cd58..0000000
--- a/jenkins/gerrit-buck-build-its-plugin.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash -e
-
-# NOTE: All Gerrit plugins currently depend on, at a minimum
-# the bucklets repo, and most plugins don't build outside the
-# Gerrit tree, even with bucklets.  As a result, we need to
-# graft the plugin onto the Gerrit repo.  We do this by checking
-# out the proper version of Gerrit, removing the plugin if it
-# exists, then use git read-tree to put the plugin we're
-# building in place.
-git checkout gerrit/{branch}
-rm -rf plugins/its-{name}
-rm -rf plugins/its-base
-git read-tree -u --prefix=plugins/its-{name} origin/{branch}
-git read-tree -u --prefix=plugins/its-base base/{branch}
-
-rm -Rf buck-out
-
-SOURCE_LEVEL=$(grep "source_level" .buckconfig || echo "source_level=7")
-. set-java.sh $(echo $SOURCE_LEVEL | cut -d '=' -f 2 | tr -d '[[:space:]]')
-
-buck build -v 3 plugins/its-{name}
-
-# Remove duplicate entries
-PLUGIN_JAR=$(ls $(pwd)/buck-out/gen/plugins/its-{name}/its-{name}*.jar)
-mkdir jar-out && pushd jar-out
-jar xf $PLUGIN_JAR && jar cmf META-INF/MANIFEST.MF $PLUGIN_JAR .
-popd
-
-# Extract version information
-PLUGIN_VERSION=$(git describe --always origin/{branch})
-echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-jar ufm $PLUGIN_JAR MANIFEST.MF && rm MANIFEST.MF
-
-echo "$PLUGIN_VERSION" > $PLUGIN_JAR-version
diff --git a/jenkins/gerrit-buck-build-owners-plugin.sh b/jenkins/gerrit-buck-build-owners-plugin.sh
deleted file mode 100755
index c9ff06f..0000000
--- a/jenkins/gerrit-buck-build-owners-plugin.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash -e
-
-# NOTE: All Gerrit plugins currently depend on, at a minimum
-# the bucklets repo, and most plugins don't build outside the
-# Gerrit tree, even with bucklets.  As a result, we need to
-# graft the plugin onto the Gerrit repo.  We do this by checking
-# out the proper version of Gerrit, removing the plugin if it
-# exists, then use git read-tree to put the plugin we're
-# building in place.
-git checkout -f gerrit/{branch}
-git read-tree -u --prefix=plugins/owners-plugin origin/{branch}
-cd plugins && ln -s owners-plugin/owners* . && cd ..
-cat plugins/owners-plugin/.buckconfig >> .buckconfig
-
-TARGETS=$(echo "{targets}" | sed -e 's/{{owners}}/owners/g')
-
-. set-java.sh 8
-
-buck build -v 3 $TARGETS
-
-for JAR in $(find buck-out/gen/plugins/ -regex '.*/owners\(-autoassign\)*\.jar')
-do
-    PLUGIN_VERSION=$(git describe  --always origin/{branch})
-    echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-    zip -d $JAR META-INF/services/com.fasterxml.jackson.core.JsonFactory
-    jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
-    DEST_JAR=buck-out/gen/plugins/{name}/$(basename $JAR)
-    [ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
-    echo "$PLUGIN_VERSION" > buck-out/gen/plugins/{name}/$(basename $JAR-version)
-done
diff --git a/jenkins/gerrit-buck-build-plugin-manual.sh b/jenkins/gerrit-buck-build-plugin-manual.sh
deleted file mode 100644
index 4f8933f..0000000
--- a/jenkins/gerrit-buck-build-plugin-manual.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash -e
-
-# NOTE: All Gerrit plugins currently depend on, at a minimum
-# the bucklets repo, and most plugins don't build outside the
-# Gerrit tree, even with bucklets.  As a result, we need to
-# graft the plugin onto the Gerrit repo.  We do this by checking
-# out the proper version of Gerrit, removing the plugin if it
-# exists, then use git read-tree to put the plugin we're
-# building in place.
-git checkout gerrit/{branch}
-rm -rf plugins/{name}
-git fetch https://gerrit.googlesource.com/plugins/{name} $REFS_CHANGE
-git read-tree -u --prefix=plugins/{name} FETCH_HEAD
-
-TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
-
-SOURCE_LEVEL=$(grep "source_level" .buckconfig || echo "source_level=7")
-. set-java.sh $(echo $SOURCE_LEVEL | cut -d '=' -f 2 | tr -d '[[:space:]]')
-
-buck build -v 3 $TARGETS
-
-for JAR in $(buck targets --show_output $TARGETS | awk '{{print $2}}')
-do
-    PLUGIN_VERSION=$(git describe  --always origin/{branch})
-    echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-    jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
-
-    DEST_JAR=buck-out/gen/plugins/{name}/$(basename $JAR)
-    [ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
-    echo "$PLUGIN_VERSION" > buck-out/gen/plugins/{name}/$(basename $JAR-version)
-done
diff --git a/jenkins/gerrit-buck-build-plugin.sh b/jenkins/gerrit-buck-build-plugin.sh
deleted file mode 100644
index 4a25f44..0000000
--- a/jenkins/gerrit-buck-build-plugin.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash -e
-
-# NOTE: All Gerrit plugins currently depend on, at a minimum
-# the bucklets repo, and most plugins don't build outside the
-# Gerrit tree, even with bucklets.  As a result, we need to
-# graft the plugin onto the Gerrit repo.  We do this by checking
-# out the proper version of Gerrit, removing the plugin if it
-# exists, then use git read-tree to put the plugin we're
-# building in place.
-git checkout -f gerrit/{branch}
-rm -rf plugins/{name}
-git read-tree -u --prefix=plugins/{name} origin/{branch}
-
-TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
-
-SOURCE_LEVEL=$(grep "source_level" .buckconfig || echo "source_level=7")
-. set-java.sh $(echo $SOURCE_LEVEL | cut -d '=' -f 2 | tr -d '[[:space:]]')
-
-buck build -v 3 $TARGETS
-
-for JAR in $(buck targets --show_output $TARGETS | awk '{{print $2}}')
-do
-    PLUGIN_VERSION=$(git describe  --always origin/{branch})
-    echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-    jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
-    DEST_JAR=buck-out/gen/plugins/{name}/$(basename $JAR)
-    [ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
-    echo "$PLUGIN_VERSION" > buck-out/gen/plugins/{name}/$(basename $JAR-version)
-done
diff --git a/jenkins/gerrit-buck-build.sh b/jenkins/gerrit-buck-build.sh
deleted file mode 100644
index f93c8a7..0000000
--- a/jenkins/gerrit-buck-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-
-cd gerrit
-
-SOURCE_LEVEL=$(grep "source_level" .buckconfig || echo "source_level=7")
-. set-java.sh $(echo $SOURCE_LEVEL | cut -d '=' -f 2 | tr -d '[[:space:]]')
-
-buck build -v 3 api plugins:core release
-
-tools/maven/api.sh install buck
-
-mv $(find buck-out -name '*.war') buck-out/gen/gerrit.war
diff --git a/jenkins/gerrit-buck-plugin-github-groups.yaml b/jenkins/gerrit-buck-plugin-github-groups.yaml
deleted file mode 100644
index 2e86cd9..0000000
--- a/jenkins/gerrit-buck-plugin-github-groups.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: github-groups
-    branch:
-      - master
-    jobs:
-      - 'plugin-{name}-{branch}'
-
diff --git a/jenkins/gerrit-buck-plugin-github-profile.yaml b/jenkins/gerrit-buck-plugin-github-profile.yaml
deleted file mode 100644
index b62310f..0000000
--- a/jenkins/gerrit-buck-plugin-github-profile.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: github-profile
-    branch:
-      - master
-    jobs:
-      - 'plugin-{name}-{branch}'
-
diff --git a/jenkins/gerrit-buck-plugin-github-pullrequest.yaml b/jenkins/gerrit-buck-plugin-github-pullrequest.yaml
deleted file mode 100644
index 705f0c4..0000000
--- a/jenkins/gerrit-buck-plugin-github-pullrequest.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: github-pullrequest
-    branch:
-      - master
-    jobs:
-      - 'plugin-{name}-{branch}'
-
diff --git a/jenkins/gerrit-buck-plugin-github-replication.yaml b/jenkins/gerrit-buck-plugin-github-replication.yaml
deleted file mode 100644
index 7fbf560..0000000
--- a/jenkins/gerrit-buck-plugin-github-replication.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: github-replication
-    branch:
-      - master
-    jobs:
-      - 'plugin-{name}-{branch}'
-
diff --git a/jenkins/gerrit-buck-plugin-github-webhooks.yaml b/jenkins/gerrit-buck-plugin-github-webhooks.yaml
deleted file mode 100644
index 213ccc4..0000000
--- a/jenkins/gerrit-buck-plugin-github-webhooks.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: github-webhooks
-    branch:
-      - master
-    jobs:
-      - 'plugin-{name}-{branch}'
-
diff --git a/jenkins/gerrit-buck-test-2.9.sh b/jenkins/gerrit-buck-test-2.9.sh
deleted file mode 100644
index 4d70f98..0000000
--- a/jenkins/gerrit-buck-test-2.9.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash -e
-
-cd gerrit
-
-SOURCE_LEVEL=$(grep "source_level" .buckconfig || echo "source_level=7")
-. set-java.sh $(echo $SOURCE_LEVEL | cut -d '=' -f 2 | tr -d '[[:space:]]')
-
-echo 'Test in default DB mode'
-echo '----------------------------------------------'
-buck test --all --exclude slow
diff --git a/jenkins/gerrit-buck-test.sh b/jenkins/gerrit-buck-test.sh
deleted file mode 100644
index 827c43b..0000000
--- a/jenkins/gerrit-buck-test.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash -e
-
-cd gerrit
-
-SOURCE_LEVEL=$(grep "source_level" .buckconfig || echo "source_level=7")
-. set-java.sh $(echo $SOURCE_LEVEL | cut -d '=' -f 2 | tr -d '[[:space:]]')
-
-BUCK_OPTIONS="--no-results-cache"
-if ([ "$TARGET_BRANCH" == "stable-2.9" ])
-then
-  BUCK_OPTIONS="--all"
-fi
-
-echo 'Test in default DB mode'
-echo '----------------------------------------------'
-buck test $BUCK_OPTIONS --exclude flaky
diff --git a/jenkins/gerrit-buck-verifier-test.sh b/jenkins/gerrit-buck-verifier-test.sh
deleted file mode 100644
index f84ee80..0000000
--- a/jenkins/gerrit-buck-verifier-test.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-set +x
-
-cd gerrit
-
-SOURCE_LEVEL=$(grep "source_level" .buckconfig || echo "source_level=7")
-. set-java.sh $(echo $SOURCE_LEVEL | cut -d '=' -f 2 | tr -d '[[:space:]]')
-
-echo "Test with mode=$MODE"
-echo '----------------------------------------------'
-
-BUCK_OPTIONS="--no-results-cache"
-if ([ "$TARGET_BRANCH" == "stable-2.9" ])
-then
-  BUCK_OPTIONS="--all"
-fi
-
-if [[ "$MODE" == *"reviewdb"* ]]
-then
-  buck test $BUCK_OPTIONS --exclude flaky
-fi
-
diff --git a/jenkins/gerrit-mvn-plugin-github.yaml b/jenkins/gerrit-mvn-plugin-github.yaml
index 1c3418c..aca2068 100644
--- a/jenkins/gerrit-mvn-plugin-github.yaml
+++ b/jenkins/gerrit-mvn-plugin-github.yaml
@@ -7,7 +7,6 @@
       - stable-2.16
       - stable-2.15
       - stable-2.14
-      - stable-2.13
     jobs:
       - 'plugin-{repo}-mvn-{branch}'
 
diff --git a/jenkins/gerrit-mvn-plugin-maintainer.yaml b/jenkins/gerrit-mvn-plugin-maintainer.yaml
index 2f0da52..5c79cb5 100644
--- a/jenkins/gerrit-mvn-plugin-maintainer.yaml
+++ b/jenkins/gerrit-mvn-plugin-maintainer.yaml
@@ -3,7 +3,6 @@
     repo: maintainer
     branch:
       - master
-      - stable-2.13
     jobs:
       - 'plugin-{repo}-mvn-{branch}'
 
diff --git a/jenkins/gerrit-mvn-plugin-slack-integration.yaml b/jenkins/gerrit-mvn-plugin-slack-integration.yaml
deleted file mode 100644
index 40c851c..0000000
--- a/jenkins/gerrit-mvn-plugin-slack-integration.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- project:
-    name: slack-integration-mvn
-    repo: slack-integration
-    branch:
-      - stable-2.13
-    jobs:
-      - 'plugin-{repo}-mvn-{branch}'
-
diff --git a/jenkins/gerrit-plugin-saml.yaml b/jenkins/gerrit-plugin-saml.yaml
index 449655a..673282a 100644
--- a/jenkins/gerrit-plugin-saml.yaml
+++ b/jenkins/gerrit-plugin-saml.yaml
@@ -8,6 +8,5 @@
             - stable-2.14
       - 'plugin-{name}-sbt-{branch}':
           branch:
-            - stable-2.13
             - stable-2.12
             - stable-2.11
diff --git a/jenkins/gerrit-verifier-change.groovy b/jenkins/gerrit-verifier-change.groovy
index b8fab36..34e2c8e 100644
--- a/jenkins/gerrit-verifier-change.groovy
+++ b/jenkins/gerrit-verifier-change.groovy
@@ -140,7 +140,7 @@
   Object build
 
   GerritCheck(name, changeNum, sha1, build) {
-    this.uuid = "gerritforge:" + name.replaceAll("(buck/|bazel/)", "") + Globals.gerritRepositoryNameSha1Suffix
+    this.uuid = "gerritforge:" + name.replaceAll("(bazel/)", "") + Globals.gerritRepositoryNameSha1Suffix
     this.changeNum = changeNum
     this.sha1 = sha1
     this.build = build
@@ -351,9 +351,7 @@
   runSh(cwd, 'git config user.email "jenkins@gerritforge.com"')
   runSh(cwd, 'git merge --no-commit --no-edit --no-ff FETCH_HEAD')
 
-  if(new java.io.File("$cwd/BUCK").exists()) {
-    tools += ["buck"]
-  } else if(new java.io.File("$cwd/BUILD").exists()) {
+  if(new java.io.File("$cwd/BUILD").exists()) {
     tools += ["bazel"]
   }
 
diff --git a/jenkins/gerrit-verifier-flow.groovy b/jenkins/gerrit-verifier-flow.groovy
index 117f711..7eda79c 100644
--- a/jenkins/gerrit-verifier-flow.groovy
+++ b/jenkins/gerrit-verifier-flow.groovy
@@ -51,7 +51,7 @@
 println ""
 println "Querying Gerrit for last modified changes since ${since} ..."
 
-def gerritQuery = "status:open project:gerrit since:\"" + since + "\""
+def gerritQuery = "status:open project:gerrit (branch:stable-2.14 OR branch:stable-2.15 OR branch:stable-2.16 or branch:stable-3.0 OR branch:master) since:\"" + since + "\""
 
 queryUrl = new URL(Globals.gerrit + "changes/?pp=0&o=CURRENT_REVISION&o=DETAILED_ACCOUNTS&o=DETAILED_LABELS&n=" + Globals.maxChanges + "&q=" +
                       gerritQuery.encodeURL())
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index 781f584..2561b86 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -102,28 +102,6 @@
       - groovy-postbuild:
           script: "(manager.logContains('timed out') || manager.logContains('TIMEOUT in ')) ? manager.buildAborted() : false"
 
-
-- job:
-    name: Gerrit-verifier-buck
-    description: "Gerrit build of open change with BUCK\n"
-    defaults: verifier-defaults
-
-    builders:
-      - merge-target-branch
-      - fetch-all-submodules
-      - shell:
-         !include-raw-escape: gerrit-buck-build.sh
-      - shell:
-         !include-raw-escape: gerrit-buck-verifier-test.sh
-
-    publishers:
-      - archive:
-          artifacts: >
-            gerrit/buck-out/gen/*.war,gerrit/buck-out/gen/plugins/*/*.jar,gerrit/buck-out/gen/*api/*api.jar,
-            gerrit/buck-out/gen/gerrit-acceptance-framework/*.jar
-
-          excludes: 'gerrit/buck-out/gen/plugins/core*/**/*.jar'
-
 - job:
     name: Gerrit-verifier-bazel
     description: "Gerrit build of open change with Bazel\n"