diff --git a/jenkins/gerrit-bazel-build-owners-plugin-branch.sh b/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
new file mode 100644
index 0000000..0170cfa
--- /dev/null
+++ b/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -e
+
+git checkout -f gerrit/{gerrit-branch}
+git read-tree -u --prefix=plugins/{name}-plugin origin/{branch}
+pushd plugins && ln -s owners-plugin/owners* . && popd
+
+if [ -f plugins/{name}-plugin/external_plugin_deps.bzl ]
+then
+  cp -f plugins/{name}-plugin/external_plugin_deps.bzl plugins/
+fi
+
+TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
+
+. set-java.sh 8
+
+bazel build --spawn_strategy=standalone --genrule_strategy=standalone $TARGETS
+
+for JAR in $(find bazel-genfiles/plugins/ -name {name}*.jar)
+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=bazel-genfiles/plugins/{name}/$(basename $JAR)
+    [ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
+    echo "$PLUGIN_VERSION" > bazel-genfiles/plugins/{name}/$(basename $JAR-version)
+done
diff --git a/jenkins/gerrit-buck-bazel-plugin-owners.yaml b/jenkins/gerrit-buck-bazel-plugin-owners.yaml
index 4ac68ae..c969879 100644
--- a/jenkins/gerrit-buck-bazel-plugin-owners.yaml
+++ b/jenkins/gerrit-buck-bazel-plugin-owners.yaml
@@ -11,6 +11,20 @@
            bazel-genfiles/plugins/{name}*/*{name}*.jar*
 
 - job-template:
+    name: 'plugin-owners-bazel-{branch}-{gerrit-branch}'
+    description: "Plugin owners {branch} branch Bazel build for Gerrit {gerrit-branch}\n"
+    defaults: plugin-template
+    builders:
+      - shell:
+         !include-raw: gerrit-bazel-build-owners-plugin-branch.sh
+      - shell:
+         !include-raw: gerrit-bazel-get-plugin-info.sh
+    publishers:
+      - archive:
+         artifacts: >
+           bazel-genfiles/plugins/{name}*/*{name}*.jar*,bazel-genfiles/plugins/{name}*/*{name}*.json
+
+- job-template:
     name: 'plugin-owners-{branch}'
     description: "Plugin owners stable-2.13 branch build with BUCK\n"
     defaults: plugin-template
@@ -30,11 +44,14 @@
           branch:
             - stable-2.11
             - stable-2.10
-      - 'plugin-owners-bazel-{branch}':
-          targets: 'plugins/owners plugins/owners-autoassign'
-          branch:
-            - master
       - 'plugin-owners-{branch}':
           targets: 'plugins/owners plugins/owners-autoassign'
           branch:
             - stable-2.13
+      - 'plugin-owners-bazel-{branch}-{gerrit-branch}':
+          targets: 'plugins/owners plugins/owners-autoassign'
+          branch:
+            - master
+          gerrit-branch:
+            - master
+            - stable-2.14