diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index 2c66a282ee..79c6719b40 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -3,6 +3,14 @@
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org"
 
+- builder:
+    name: branch-git-prep
+    builders:
+      - shell: |
+          #!/bin/bash
+          export BRANCH={branch}
+          /usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org
+
 - builder:
     name: revoke-sudo
     builders:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
index cef272f45a..97d982ec6b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
@@ -9,6 +9,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: '{branch}'
       - python26:
           github-org: '{github-org}'
           project: '{name}'
@@ -18,12 +20,6 @@
       - test-results
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/{github-org}/{name}'
-          branches:
-            - 'origin/{branch}'
-
     node: bare-centos6
 
 
@@ -38,6 +34,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: '{branch}'
       - python27:
           github-org: '{github-org}'
           project: '{name}'
@@ -47,12 +45,6 @@
       - test-results
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/{github-org}/{name}'
-          branches:
-            - 'origin/{branch}'
-
     node: '{node}'
 
 
@@ -67,6 +59,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: '{branch}'
       - docs:
           github-org: '{github-org}'
           project: '{name}'
@@ -74,12 +68,6 @@
     publishers:
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/{github-org}/{name}'
-          branches:
-            - 'origin/{branch}'
-
     node: '{node}'
 
 
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
index 120a6073a7..0817af070c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
@@ -18,6 +18,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: master
       - shell: |
           #!/bin/bash -xe
           /usr/local/jenkins/slave_scripts/propose_translation_update.sh {github-org} {name}
@@ -25,12 +27,6 @@
     publishers:
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/{github-org}/{name}'
-          branches:
-            - 'origin/master'
-
     node: 'proposal'
 
 - job:
@@ -68,6 +64,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: master
       - shell: |
           #!/bin/bash -xe
           /usr/local/jenkins/slave_scripts/propose_translation_update_manuals.sh {name}
@@ -75,12 +73,6 @@
     publishers:
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/{github-org}/{name}'
-          branches:
-            - 'origin/master'
-
     node: 'proposal'
 
 - job-group:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
index fb17d75284..913cdf93e0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
@@ -45,6 +45,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: master
       - python27:
           github-org: 'openstack-infra'
           project: 'zuul'
@@ -53,10 +55,4 @@
       - test-results
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/openstack-infra/zuul'
-          branches:
-            - 'origin/master'
-
     node: bare-precise