diff --git a/modules/jenkins/files/slave_scripts/maven-properties.sh b/modules/jenkins/files/slave_scripts/maven-properties.sh
index e585462318..7386acb20c 100755
--- a/modules/jenkins/files/slave_scripts/maven-properties.sh
+++ b/modules/jenkins/files/slave_scripts/maven-properties.sh
@@ -5,9 +5,6 @@
 # pass to maven build commands so that we can generate
 # versioned builds within the gerrit workflow.
 
-# work around for jenkins bug: https://issues.jenkins-ci.org/browse/JENKINS-14193
-/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org http://zuul.openstack.org
-
 # get version info from scm
 SCM_TAG=`git describe --abbrev=0 --tags` || true
 SCM_SHA=`git rev-parse --short HEAD` || true
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
index 794d79d5e7..f31047dedc 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
@@ -1,15 +1,16 @@
-# need to run gerrit-git-prep in maven-properties.sh script to work
-# around jenkins bug: https://issues.jenkins-ci.org/browse/JENKINS-14193
-
 - job-template:
     name: 'gate-{name}-build'
     project-type: maven
     node: precise
 
+    prebuilders:
+      - gerrit-git-prep
+
     wrappers:
       - inject:
-          properties-file: maven.properties
           script-file: /usr/local/jenkins/slave_scripts/maven-properties.sh
+      - inject:
+          properties-file: ${WORKSPACE}/maven.properties
 
     maven:
       maven-name: Maven3
@@ -27,10 +28,14 @@
     project-type: maven
     node: precise
 
+    prebuilders:
+      - gerrit-git-prep
+
     wrappers:
       - inject:
-          properties-file: maven.properties
           script-file: /usr/local/jenkins/slave_scripts/maven-properties.sh
+      - inject:
+          properties-file: ${WORKSPACE}/maven.properties
 
     maven:
       maven-name: Maven3