diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gerrit-plugin-jobs.yaml
index f1b16c640d..7f03afd82e 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/gerrit-plugin-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/gerrit-plugin-jobs.yaml
@@ -11,20 +11,17 @@
 
     builders:
       - revoke-sudo
+      - install-buck
       - shell: |
           #!/bin/bash -xe
+          export PATH=`pwd`/buck/bin:$PATH
           rm -rf gerrit
           git clone -b {gerrit-branch} {gerrit-project}
           git clone -b {plugin-branch} {plugin-project} gerrit/plugins/{plugin-name}
           cd gerrit/plugins/{plugin-name}
           /usr/local/jenkins/slave_scripts/version-properties.sh
-      - inject:
-          properties-file: gerrit/plugins/{plugin-name}/version.properties
-      - install-buck
-      - shell: |
-          #!/bin/bash -xe
-          export PATH=`pwd`/buck/bin:$PATH
-          cd gerrit
+          source version.properties
+          cd $WORKSPACE/gerrit
           buck clean
           buck build plugins/{plugin-name}:{plugin-name}
           cp ./buck-out/gen/plugins/{plugin-name}/{plugin-name}.jar ./buck-out/gen/plugins/{plugin-name}/{plugin-name}-$PROJECT_VER.jar
@@ -32,7 +29,7 @@
     publishers:
       - war:
           site: '{tarball-site}'
-          warfile: 'gerrit/buck-out/gen/plugins/{plugin-name}/{plugin-name}-${{PROJECT_VER}}.jar'
+          warfile: 'gerrit/buck-out/gen/plugins/{plugin-name}/{plugin-name}-*.jar'
           target: 'tarballs/ci/gerrit/plugins/{plugin-name}'
       - console-log