diff --git a/modules/jenkins/files/slave_scripts/maven-properties.sh b/modules/jenkins/files/slave_scripts/maven-properties.sh
index 7386acb20c..e585462318 100755
--- a/modules/jenkins/files/slave_scripts/maven-properties.sh
+++ b/modules/jenkins/files/slave_scripts/maven-properties.sh
@@ -5,6 +5,9 @@
 # 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 d3aed9a4ba..da638425bf 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,11 +1,11 @@
+# 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:
       - timeout:
           timeout: 30
@@ -32,9 +32,6 @@
     project-type: maven
     node: precise
 
-    prebuilders:
-      - gerrit-git-prep
-
     wrappers:
       - timeout:
           timeout: 30