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 acc2c37581..565def805b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -79,24 +79,22 @@
 - builder:
     name: python26
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26"
-      - something:
-          arg: value
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26 {github-org} {project}"
 
 - builder:
     name: python27
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27"
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27 {github-org} {project}"
 
 - builder:
     name: python26-folsom
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26-folsom"
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26-folsom {github-org} {project}"
 
 - builder:
     name: python27-folsom
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27-folsom"
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27-folsom {github-org} {project}"
 
 - builder:
     name: assert-no-extra-files
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 093df6fe92..798093042c 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
@@ -5,7 +5,9 @@
       - timed: '0 6 * * *'
 
     builders:
-      - python26
+      - python26:
+          github-org: '{github-org}'
+          project: '{name}'
 
     publishers:
       - scp:
@@ -36,7 +38,9 @@
       - timed: '0 6 * * *'
 
     builders:
-      - python27
+      - python27:
+          github-org: '{github-org}'
+          project: '{name}'
 
     publishers:
       - scp:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
index 2a03b9ce91..5a1bb35eb7 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
@@ -69,7 +69,9 @@
 
     builders:
       - gerrit-git-prep
-      - python26
+      - python26:
+          github-org: '{github-org}'
+          project: '{name}'
       - assert-no-extra-files
 
     publishers:
@@ -105,7 +107,9 @@
 
     builders:
       - gerrit-git-prep
-      - python26-folsom
+      - python26-folsom:
+          github-org: '{github-org}'
+          project: '{name}'
       - assert-no-extra-files
 
     publishers:
@@ -142,7 +146,9 @@
 
     builders:
       - gerrit-git-prep
-      - python27
+      - python27:
+          github-org: '{github-org}'
+          project: '{name}'
       - assert-no-extra-files
 
     publishers:
@@ -183,7 +189,9 @@
 
     builders:
       - gerrit-git-prep
-      - python27-folsom
+      - python27-folsom:
+          github-org: '{github-org}'
+          project: '{name}'
       - assert-no-extra-files
 
     publishers: