diff --git a/jenkins/gerrit-bazel-build-owners-plugin-branch.sh b/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
index 9f219ae..529055b 100644
--- a/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
@@ -7,7 +7,7 @@
 git read-tree -u --prefix=plugins/{name}-plugin origin/{branch}
 git fetch --tags origin
 ln -s plugins/{name}-plugin/owners-common .
-pushd plugins && ln -s owners-plugin/{{owners,owners-autoassign}} . && popd
+pushd plugins && ln -s owners-plugin/owners owners-plugin/owners-a* . && popd
 
 for file in external_plugin_deps.bzl package.json
 do
diff --git a/jenkins/gerrit-bazel-build-owners-plugin.sh b/jenkins/gerrit-bazel-build-owners-plugin.sh
index ea12027..d0b75bd 100644
--- a/jenkins/gerrit-bazel-build-owners-plugin.sh
+++ b/jenkins/gerrit-bazel-build-owners-plugin.sh
@@ -7,7 +7,7 @@
 git read-tree -u --prefix=plugins/{name}-plugin origin/{branch}
 git fetch --tags origin
 ln -s plugins/{name}-plugin/owners-common .
-pushd plugins && ln -s owners-plugin/{{owners,owners-autoassign}} . && popd
+pushd plugins && ln -s owners-plugin/owners owners-plugin/owners-a* . && popd
 
 for file in external_plugin_deps.bzl package.json
 do
diff --git a/jenkins/gerrit-bazel-plugin-owners.yaml b/jenkins/gerrit-bazel-plugin-owners.yaml
index 933e31e..c21db6c 100644
--- a/jenkins/gerrit-bazel-plugin-owners.yaml
+++ b/jenkins/gerrit-bazel-plugin-owners.yaml
@@ -24,7 +24,9 @@
     publishers:
       - archive:
           artifacts: >
-            bazel-bin/plugins/owners/owners.jar*,bazel-bin/plugins/owners/owners-autoassign.jar*
+            bazel-bin/plugins/owners/owners.jar*,bazel-bin/plugins/owners/owners-a*.jar*
+          excludes: >
+            **/*non_stamped*
 
 - job-template:
     name: 'plugin-owners-bazel-{branch}-{gerrit-branch}'
@@ -54,20 +56,22 @@
     publishers:
       - archive:
           artifacts: >
-            bazel-bin/plugins/owners/owners.jar*,bazel-bin/plugins/owners/owners-autoassign.jar*
+            bazel-bin/plugins/owners/owners.jar*,bazel-bin/plugins/owners/owners-a*.jar*
+          excludes: >
+            **/*non_stamped*
 
 - project:
     name: owners
     jobs:
       - 'plugin-owners-bazel-{branch}-{gerrit-branch}':
-          targets: 'plugins/owners plugins/owners-autoassign'
+          targets: 'plugins/owners plugins/owners-a*'
           branch:
             - master
           gerrit-branch:
             - master
             - stable-3.4
       - 'plugin-owners-bazel-{branch}':
-          targets: 'plugins/owners plugins/owners-autoassign'
+          targets: 'plugins/owners plugins/owners-a*'
           branch:
             - stable-3.3
             - stable-3.2