diff --git a/doc/source/stackforge.rst b/doc/source/stackforge.rst
index 8f8962f190..a38afee904 100644
--- a/doc/source/stackforge.rst
+++ b/doc/source/stackforge.rst
@@ -118,7 +118,6 @@ should look something like::
 
   - project:
       name: project-name
-      github-org: stackforge
       node: bare-trusty
       tarball-site: tarballs.openstack.org
 
@@ -133,7 +132,6 @@ used by adding the ``hook-{name}-rtfd`` template to the jobs list::
 
   - project:
       name: project-name
-      github-org: stackforge
       node: bare-trusty
       tarball-site: tarballs.openstack.org
 
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
index 0f49e75600..721c19e67d 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
@@ -11,8 +11,6 @@
       - gerrit-git-prep
       - tox:
           envlist: '{envlist}'
-          github-org: '{github-org}'
-          project: '{name}'
 
     publishers:
       - console-log
@@ -30,8 +28,6 @@
       - gerrit-git-prep
       - tox:
           envlist: 'publishdocs-api'
-          github-org: 'openstack'
-          project: 'api-site'
 
     publishers:
       - console-log
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml b/modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml
index e81712f565..ec2533f9eb 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/elastic-recheck.yaml
@@ -5,9 +5,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - docs:
-          github-org: '{github-org}'
-          project: '{name}'
+      - docs
 
     publishers:
       - ftp:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml b/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml
index da1e80cb86..1699e88a21 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml
@@ -7,7 +7,6 @@
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack-dev hacking
           tox -e integration {target-org} {target-project}
 
     publishers:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml
index c6614dc763..c9c0611e92 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml
@@ -5,9 +5,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - selenium:
-          github-org: openstack
-          project: horizon
+      - selenium
 
     publishers:
       - console-log
@@ -24,7 +22,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - shell: '/usr/local/jenkins/slave_scripts/run-unittests.sh 27dj14 openstack horizon'
+      - shell: '/usr/local/jenkins/slave_scripts/run-unittests.sh 27dj14'
       - assert-no-extra-files
 
     publishers:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/infra-publish-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/infra-publish-jobs.yaml
index d4ee4b41b2..4471f7117f 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/infra-publish-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/infra-publish-jobs.yaml
@@ -5,9 +5,7 @@
     builders:
         - revoke-sudo
         - gerrit-git-prep
-        - docs:
-            github-org: '{github-org}'
-            project: '{name}'
+        - docs
 
     publishers:
         - console-log
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/infra.yaml b/modules/openstack_project/files/jenkins_job_builder/config/infra.yaml
index 4fc230f7a8..5945da65fa 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/infra.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/infra.yaml
@@ -5,7 +5,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - shell: "./tools/run-compare-xml.sh openstack-infra config"
+      - shell: ./tools/run-compare-xml.sh
 
     publishers:
       - console-log
@@ -20,8 +20,6 @@
       - gerrit-git-prep
       - tox:
           envlist: 'irc'
-          github-org: 'openstack-infra'
-          project: 'config'
 
     publishers:
       - console-log
@@ -35,8 +33,7 @@
       - revoke-sudo
       - gerrit-git-prep
       - shell: |
-          source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack-infra config
-          ./tools/run-layout.sh openstack-infra config
+          ./tools/run-layout.sh
 
     publishers:
       - console-log
@@ -50,9 +47,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: config
+      - docs
 
     publishers:
       - scp:
@@ -71,9 +66,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: config
+      - docs
 
     publishers:
       - console-log
@@ -89,8 +82,6 @@
       - gerrit-git-prep
       - tox:
           envlist: projects_alphabetized
-          github-org: openstack-infra
-          project: config
 
     publishers:
       - console-log
@@ -105,8 +96,6 @@
       - gerrit-git-prep
       - tox:
           envlist: upstream
-          github-org: openstack-infra
-          project: config
 
     publishers:
       - console-log
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
index a33d6cd2b9..28b619f921 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
@@ -15,8 +15,6 @@
       - js-build:
           command: 'test'
           envlist: 'grunt'
-          github-org: '{github-org}'
-          project: '{name}'
       - assert-no-extra-files
 
     publishers:
@@ -55,7 +53,6 @@
       - js-build:
           command: 'test:unit'
           envlist: 'grunt'
-          github-org: '{github-org}'
           project: '{name}'
       - assert-no-extra-files
 
@@ -88,7 +85,6 @@
       - js-build:
           command: 'test:integration'
           envlist: 'grunt'
-          github-org: '{github-org}'
           project: '{name}'
       - assert-no-extra-files
 
@@ -121,7 +117,6 @@
       - js-build:
           command: 'test:functional'
           envlist: 'grunt'
-          github-org: '{github-org}'
           project: '{name}'
       - assert-no-extra-files
 
@@ -154,7 +149,6 @@
       - js-build:
           command: 'build'
           envlist: 'grunt'
-          github-org: '{github-org}'
           project: '{name}'
       - assert-no-extra-files
 
@@ -188,8 +182,6 @@
       - js-build:
           command: 'build'
           envlist: 'grunt'
-          github-org: '{github-org}'
-          project: '{name}'
       - shell: |
           #!/bin/bash -xe
           /usr/local/jenkins/slave_scripts/version-properties.sh
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml b/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml
index 12d929c49b..9f6961b64a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml
@@ -6,9 +6,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: jenkins-job-builder
+      - docs
 
     publishers:
       - scp:
@@ -27,7 +25,6 @@
       - revoke-sudo
       - gerrit-git-prep
       - shell: |
-          source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack-infra jenkins-job-builder
           ./tools/run-compare-xml.sh
 
     publishers:
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 8b18a1e035..91d36660a0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -23,12 +23,12 @@
 - builder:
     name: coverage
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-cover.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-cover.sh"
 
 - builder:
     name: docs
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-docs.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-docs.sh"
 
 - builder:
     name: maven-test
@@ -62,17 +62,17 @@
 - builder:
     name: bashate
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-bashate.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-bashate.sh"
 
 - builder:
     name: pep8
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-pep8.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-pep8.sh"
 
 - builder:
     name: pylint
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-pylint.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-pylint.sh"
 
 - builder:
     name: npm-install
@@ -171,47 +171,47 @@
 - builder:
     name: run-tests
     builders:
-      - shell: "./run-tests.sh {github-org} {project}"
+      - shell: "./run-tests.sh"
 
 - builder:
     name: selenium
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-selenium.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-selenium.sh"
 
 - builder:
     name: js-build
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-jsbuild.sh {command} {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-jsbuild.sh {command}"
 
 - builder:
     name: python26
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 26 {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 26"
 
 - builder:
     name: python27
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 27 {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 27"
 
 - builder:
     name: python33
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 33 {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 33"
 
 - builder:
     name: python34
     builders:
-      - shell:  "/usr/local/jenkins/slave_scripts/run-unittests.sh 34 {github-org} {project}"
+      - shell:  "/usr/local/jenkins/slave_scripts/run-unittests.sh 34"
 
 - builder:
     name: pypy
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh py {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh py"
 
 - builder:
     name: tox
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {envlist} {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {envlist}"
 
 - builder:
     name: assert-no-extra-files
@@ -233,8 +233,8 @@
     builders:
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/run-tarball.sh {github-org} {project}
-          /usr/local/jenkins/slave_scripts/run-wheel.sh {github-org} {project}
+          /usr/local/jenkins/slave_scripts/run-tarball.sh
+          /usr/local/jenkins/slave_scripts/run-wheel.sh
 
 - builder:
     name: devstack-checkout
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
index 0d91cbe5c1..e805d6914a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
@@ -11,8 +11,6 @@
       - gerrit-git-prep
       - tox:
           envlist: '{envlist}'
-          github-org: '{github-org}'
-          project: '{name}'
       - assert-no-extra-files
 
     publishers:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
index 77348ce496..6a404cdce6 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
@@ -15,9 +15,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - run-tests:
-          github-org: '{github-org}'
-          project: '{name}'
+      - run-tests
 
     publishers:
       - console-log
@@ -30,9 +28,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - bashate:
-          github-org: '{github-org}'
-          project: '{name}'
+      - bashate
 
     publishers:
       - console-log
@@ -45,7 +41,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - shell: '/usr/local/jenkins/slave_scripts/run-unittests.sh {env} {github-org} {name}'
+      - shell: '/usr/local/jenkins/slave_scripts/run-unittests.sh {env}'
       - assert-no-extra-files
 
     publishers:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/nodepool.yaml b/modules/openstack_project/files/jenkins_job_builder/config/nodepool.yaml
index cb35249ad5..0c5b9a1b1a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/nodepool.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/nodepool.yaml
@@ -6,9 +6,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: nodepool
+      - docs
 
     publishers:
       - scp:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml
index b8ce36d5f4..58eea91e41 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml
@@ -5,9 +5,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - docs:
-          github-org: '{github-org}'
-          project: '{name}'
+      - docs
 
     publishers:
       - ftp:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index e9c50120d1..bb770f8ae6 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1,6 +1,5 @@
 - project:
     name: aviator
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -9,7 +8,6 @@
 
 - project:
     name: freezer
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -19,7 +17,6 @@
 
 - project:
     name: gantt
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -32,7 +29,6 @@
 
 - project:
     name: graffiti
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -41,7 +37,6 @@
 
 - project:
     name: training-guides
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -50,7 +45,6 @@
 
 - project:
     name: fuel-specs
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -60,7 +54,6 @@
 
 - project:
     name: mistral
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -70,7 +63,6 @@
 
 - project:
     name: mistral-extra
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -80,7 +72,6 @@
 
 - project:
     name: mistral-dashboard
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -90,7 +81,6 @@
 
 - project:
     name: monasca-agent
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -100,7 +90,6 @@
 
 - project:
     name: monasca-ceilometer
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -109,7 +98,6 @@
 
 - project:
     name: monasca-common
-    github-org: stackforge
     node: bare-trusty
     tarball-site: tarballs.openstack.org
 
@@ -118,7 +106,6 @@
 
 - project:
     name: monasca-notification
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -128,7 +115,6 @@
 
 - project:
     name: monasca-thresh
-    github-org: stackforge
     node: bare-trusty
     tarball-site: tarballs.openstack.org
 
@@ -137,7 +123,6 @@
 
 - project:
     name: monasca-ui
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -147,7 +132,6 @@
 
 - project:
     name: python-mistralclient
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -157,7 +141,6 @@
 
 - project:
     name: murano
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -167,7 +150,6 @@
 
 - project:
     name: murano-agent
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -176,7 +158,6 @@
 
 - project:
     name: murano-dashboard
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -185,7 +166,6 @@
 
 - project:
     name: python-congressclient
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -194,7 +174,6 @@
 
 - project:
     name: python-ganttclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -207,7 +186,6 @@
 
 - project:
     name: python-monascaclient
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -218,7 +196,6 @@
 
 - project:
     name: python-muranoclient
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -228,7 +205,6 @@
 
 - project:
     name: magnetodb
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -239,7 +215,6 @@
 
 - project:
     name: blazar
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -249,7 +224,6 @@
 
 - project:
     name: blazar-nova
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -258,7 +232,6 @@
 
 - project:
     name: python-blazarclient
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -267,7 +240,6 @@
 
 - project:
     name: config
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -279,7 +251,6 @@
 
 - project:
     name: gitdm
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -292,7 +263,6 @@
 
 - project:
     name: infra-manual
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     doc-publisher-site: docs.openstack.org
     doc-publisher-folder: manual
@@ -302,7 +272,6 @@
 
 - project:
     name: infra-specs
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -310,7 +279,6 @@
 
 - project:
     name: sahara
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -325,7 +293,6 @@
 
 - project:
     name: sahara-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -333,7 +300,6 @@
 
 - project:
     name: python-saharaclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -345,7 +311,6 @@
 
 - project:
     name: satori
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -355,7 +320,6 @@
 
 - project:
     name: sahara-dashboard
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -365,7 +329,6 @@
 
 - project:
     name: sahara-extra
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -375,7 +338,6 @@
 
 - project:
     name: sahara-image-elements
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -385,7 +347,6 @@
 
 - project:
     name: sqlalchemy-migrate
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -411,7 +372,6 @@
 
 - project:
     name: tacker
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -419,7 +379,6 @@
 
 - project:
     name: kwapi
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -427,7 +386,6 @@
 
 - project:
     name: ceilometer
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -450,7 +408,6 @@
 
 - project:
     name: python-tackerclient
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -458,7 +415,6 @@
 
 - project:
     name: cinder
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -473,7 +429,6 @@
 
 - project:
     name: cinder-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -483,7 +438,6 @@
 
 - project:
     name: compute-api
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -494,7 +448,6 @@
 
 - project:
     name: hacking
-    github-org: openstack-dev
     node: 'bare-precise || bare-trusty'
     doc-publisher-site: docs.openstack.org
     tarball-site: tarballs.openstack.org
@@ -510,7 +463,6 @@
 
 - project:
     name: pbr
-    github-org: openstack-dev
     node: 'bare-precise || bare-trusty'
     doc-publisher-site: docs.openstack.org
     tarball-site: tarballs.openstack.org
@@ -523,7 +475,6 @@
 
 - project:
     name: os-loganalyze
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -532,7 +483,6 @@
 
 - project:
     name: gerrit-powered-agenda
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -541,7 +491,6 @@
 
 - project:
     name: gerritbot
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -551,7 +500,6 @@
 
 - project:
     name: elastic-recheck
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -563,7 +511,6 @@
 
 - project:
     name: statusbot
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -574,7 +521,6 @@
 
 - project:
     name: gerritlib
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -586,7 +532,6 @@
 
 - project:
     name: jeepyb
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -598,7 +543,6 @@
 
 - project:
     name: pypi-mirror
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -610,7 +554,6 @@
 
 - project:
     name: gear
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -622,7 +565,6 @@
 
 - project:
     name: gearman-plugin
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -631,7 +573,6 @@
 
 - project:
     name: clouddocs-maven-plugin
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -666,7 +607,6 @@
 
 - project:
     name: zmq-event-publisher
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -676,7 +616,6 @@
 
 - project:
     name: git-review
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     jobs:
@@ -686,7 +625,6 @@
 
 - project:
     name: git-upstream
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -696,7 +634,6 @@
 
 - project:
     name: glance
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -710,7 +647,6 @@
 
 - project:
     name: glance-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -718,7 +654,6 @@
 
 - project:
     name: glance.store
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -731,7 +666,6 @@
 
 - project:
     name: heat
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -744,7 +678,6 @@
 
 - project:
     name: heat-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -752,7 +685,6 @@
 
 - project:
     name: python-heatclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -765,7 +697,6 @@
 
 - project:
     name: heat-cfntools
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -778,7 +709,6 @@
 
 - project:
     name: heat-cfnclient
-    github-org: openstack-dev
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -788,7 +718,6 @@
 
 - project:
     name: horizon
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -801,7 +730,6 @@
 
 - project:
     name: django_openstack_auth
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -814,7 +742,6 @@
 
 - project:
     name: identity-api
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -825,7 +752,6 @@
 
 - project:
     name: keystone-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -833,7 +759,6 @@
 
 - project:
     name: image-api
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -844,7 +769,6 @@
 
 - project:
     name: jenkins-job-builder
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -854,7 +778,6 @@
 
 - project:
     name: keystone
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -868,7 +791,6 @@
 
 - project:
     name: keystonemiddleware
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -880,7 +802,6 @@
 
 - project:
     name: kite
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -889,7 +810,6 @@
 
 - project:
     name: netconn-api
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -900,7 +820,6 @@
 
 - project:
     name: nodepool
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -911,7 +830,6 @@
 
 - project:
     name: nose-html-output
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -922,7 +840,6 @@
 
 - project:
     name: nova
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -936,7 +853,6 @@
 
 - project:
     name: nova-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -945,7 +861,6 @@
 
 - project:
     name: nova-docker
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -955,7 +870,6 @@
 
 - project:
     name: object-api
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -966,7 +880,6 @@
 
 - project:
     name: swift-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -975,7 +888,6 @@
 
 - project:
     name: oslosphinx
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -988,7 +900,6 @@
 
 - project:
     name: oslotest
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1001,7 +912,6 @@
 
 - project:
     name: oslo.config
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1014,7 +924,6 @@
 
 - project:
     name: oslo-cookiecutter
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -1023,7 +932,6 @@
 
 - project:
     name: oslo.db
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1036,7 +944,6 @@
 
 - project:
     name: oslo.i18n
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1050,7 +957,6 @@
 
 - project:
     name: oslo.messaging
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1064,7 +970,6 @@
 
 - project:
    name: oslo.middleware
-   github-org: openstack
    node: 'bare-precise || bare-trusty'
    tarball-site: tarballs.openstack.org
    doc-publisher-site: docs.openstack.org
@@ -1075,7 +980,6 @@
 
 - project:
     name: oslo.rootwrap
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1085,7 +989,6 @@
 
 - project:
     name: oslo.serialization
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1097,7 +1000,6 @@
 
 - project:
     name: oslo.utils
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1110,7 +1012,6 @@
 
 - project:
     name: oslo.version
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1123,7 +1024,6 @@
 
 - project:
     name: oslo.vmware
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1137,7 +1037,6 @@
 
 - project:
     name: oslo-incubator
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1148,7 +1047,6 @@
 
 - project:
     name: oslo-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -1156,7 +1054,6 @@
 
 - project:
     name: python-ceilometerclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1169,7 +1066,6 @@
 
 - project:
     name: python-cinderclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1182,7 +1078,6 @@
 
 - project:
     name: python-glanceclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1195,7 +1090,6 @@
 
 - project:
     name: python-keystoneclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1208,7 +1102,6 @@
 
 - project:
     name: python-jenkins
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1220,7 +1113,6 @@
 
 - project:
     name: python-kiteclient
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1231,7 +1123,6 @@
 
 - project:
     name: python-novaclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1244,7 +1135,6 @@
 
 - project:
     name: python-openstackclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1257,7 +1147,6 @@
 
 - project:
     name: python-opentsdbclient
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1267,7 +1156,6 @@
 
 - project:
     name: python-neutronclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1280,7 +1168,6 @@
 
 - project:
     name: python-swiftclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1293,7 +1180,6 @@
 
 - project:
     name: neutron
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1332,7 +1218,6 @@
 
 - project:
     name: neutron-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -1340,7 +1225,6 @@
 
 - project:
     name: trove
-    github-org: openstack
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
     node: 'bare-precise || bare-trusty'
@@ -1361,7 +1245,6 @@
 
 - project:
     name: python-troveclient
-    github-org: openstack
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
     node: 'bare-precise || bare-trusty'
@@ -1374,7 +1257,6 @@
 
 - project:
     name: libra
-    github-org: stackforge
     tarball-site: tarballs.openstack.org
     node: 'bare-precise || bare-trusty'
 
@@ -1384,7 +1266,6 @@
 
 - project:
     name: python-libraclient
-    github-org: stackforge
     tarball-site: tarballs.openstack.org
     node: 'bare-precise || bare-trusty'
 
@@ -1395,7 +1276,6 @@
 
 - project:
     name: healthnmon
-    github-org: stackforge
     tarball-site: tarballs.openstack.org
     node: 'bare-precise || bare-trusty'
 
@@ -1404,7 +1284,6 @@
 
 - project:
     name: marconi
-    github-org: openstack
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
     node: 'bare-precise || bare-trusty'
@@ -1416,7 +1295,6 @@
 
 - project:
     name: marconi-specs
-    github-org: openstack
     node: bare-precise
 
     jobs:
@@ -1424,7 +1302,6 @@
 
 - project:
     name: python-marconiclient
-    github-org: openstack
     tarball-site: tarballs.openstack.org
     node: 'bare-precise || bare-trusty'
 
@@ -1434,7 +1311,6 @@
 
 - project:
     name: designate
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1447,7 +1323,6 @@
 
 - project:
     name: designate-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -1455,7 +1330,6 @@
 
 - project:
     name: billingstack
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1467,7 +1341,6 @@
 
 - project:
     name: bindep
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1478,7 +1351,6 @@
 
 - project:
     name: packstack
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1488,7 +1360,6 @@
 
 - project:
     name: python-designateclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1501,7 +1372,6 @@
 
 - project:
     name: bufunfa
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1512,7 +1382,6 @@
 
 - project:
     name: reviewday
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1523,7 +1392,6 @@
 
 - project:
     name: reviewstats
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1535,7 +1403,6 @@
 
 - project:
     name: bugdaystats
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1545,7 +1412,6 @@
 
 - project:
     name: requirements
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1558,7 +1424,6 @@
 
 - project:
     name: storyboard
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1569,7 +1434,6 @@
 
 - project:
     name: storyboard-webclient
-    github-org: openstack-infra
     node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1582,7 +1446,6 @@
 
 - project:
     name: vinz
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1592,7 +1455,6 @@
 
 - project:
     name: vinz-webclient
-    github-org: openstack-infra
     node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1605,7 +1467,6 @@
 
 - project:
     name: swift
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1635,7 +1496,6 @@
 
 - project:
     name: swift-bench
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1713,7 +1573,6 @@
 
 - project:
     name: devstack
-    github-org: openstack-dev
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -1732,7 +1591,6 @@
 
 - project:
     name: tempest
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1744,7 +1602,6 @@
 
 - project:
     name: qa-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -1752,7 +1609,6 @@
 
 - project:
     name: zuul
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1763,7 +1619,6 @@
 
 - project:
     name: pyghmi
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1773,7 +1628,6 @@
 
 - project:
     name: diskimage-builder
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1783,7 +1637,6 @@
 
 - project:
     name: dib-utils
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1793,7 +1646,6 @@
 
 - project:
     name: os-apply-config
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1803,7 +1655,6 @@
 
 - project:
     name: os-cloud-config
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -1815,7 +1666,6 @@
 
 - project:
     name: os-collect-config
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1825,7 +1675,6 @@
 
 - project:
     name: os-refresh-config
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1835,7 +1684,6 @@
 
 - project:
     name: ceilometer-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -1843,7 +1691,6 @@
 
 - project:
     name: tripleo-heat-templates
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1853,7 +1700,6 @@
 
 - project:
     name: tripleo-image-elements
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1863,7 +1709,6 @@
 
 - project:
     name: tripleo-incubator
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     doc-publisher-site: docs.openstack.org
     tarball-site: tarballs.openstack.org
@@ -1874,7 +1719,6 @@
 
 - project:
     name: tripleo-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -1882,7 +1726,6 @@
 
 - project:
     name: puppet-glance
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1893,7 +1736,6 @@
 
 - project:
     name: puppet-keystone
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1904,7 +1746,6 @@
 
 - project:
     name: puppet-ceilometer
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1915,7 +1756,6 @@
 
 - project:
     name: puppet-cinder
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1926,7 +1766,6 @@
 
 - project:
     name: puppet-heat
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1937,7 +1776,6 @@
 
 - project:
     name: puppet-ironic
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1948,7 +1786,6 @@
 
 - project:
     name: puppet-nova
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1959,7 +1796,6 @@
 
 - project:
     name: puppet-horizon
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1970,7 +1806,6 @@
 
 - project:
     name: puppet-openstack
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1981,7 +1816,6 @@
 
 - project:
     name: puppet-openstacklib
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -1992,7 +1826,6 @@
 
 - project:
     name: puppet-openstack_extras
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -2003,7 +1836,6 @@
 
 - project:
     name: puppet-sahara
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2014,7 +1846,6 @@
 
 - project:
     name: sahara-ci-config
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2023,7 +1854,6 @@
 
 - project:
     name: sahara-guestagent
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2033,7 +1863,6 @@
 
 - project:
     name: puppet-swift
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2044,7 +1873,6 @@
 
 - project:
     name: puppet-tempest
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2055,7 +1883,6 @@
 
 - project:
     name: puppet-trove
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2066,7 +1893,6 @@
 
 - project:
     name: puppet-neutron
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2077,7 +1903,6 @@
 
 - project:
     name: puppet-vswitch
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2088,7 +1913,6 @@
 
 - project:
     name: puppet-ceph
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2099,7 +1923,6 @@
 
 - project:
     name: puppet-designate
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2110,7 +1933,6 @@
 
 - project:
     name: openstack-chef-repo
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2118,7 +1940,6 @@
 
 - project:
     name: openstack-chef-specs
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2126,7 +1947,6 @@
 
 - project:
     name: cookbook-ceph
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2136,7 +1956,6 @@
 
 - project:
     name: cookbook-monasca-agent
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2146,7 +1965,6 @@
 
 - project:
     name: cookbook-monasca-api
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2156,7 +1974,6 @@
 
 - project:
     name: cookbook-monasca-notification
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2166,7 +1983,6 @@
 
 - project:
     name: cookbook-monasca-persister
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2176,7 +1992,6 @@
 
 - project:
     name: cookbook-monasca-thresh
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2186,7 +2001,6 @@
 
 - project:
     name: cookbook-openstack-client
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2196,7 +2010,6 @@
 
 - project:
     name: cookbook-openstack-data-processing
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2206,7 +2019,6 @@
 
 - project:
     name: cookbook-openstack-database
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2216,7 +2028,6 @@
 
 - project:
     name: cookbook-openstack-common
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2226,7 +2037,6 @@
 
 - project:
     name: cookbook-openstack-compute
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2236,7 +2046,6 @@
 
 - project:
     name: cookbook-openstack-block-storage
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2246,7 +2055,6 @@
 
 - project:
     name: cookbook-openstack-telemetry
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2256,7 +2064,6 @@
 
 - project:
     name: cookbook-openstack-network
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2266,7 +2073,6 @@
 
 - project:
     name: cookbook-openstack-object-storage
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2276,7 +2082,6 @@
 
 - project:
     name: cookbook-openstack-dashboard
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2286,7 +2091,6 @@
 
 - project:
     name: cookbook-openstack-image
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2296,7 +2100,6 @@
 
 - project:
     name: cookbook-openstack-identity
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2306,7 +2109,6 @@
 
 - project:
     name: cookbook-openstack-orchestration
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2316,7 +2118,6 @@
 
 - project:
     name: cookbook-openstack-ops-database
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2326,7 +2127,6 @@
 
 - project:
     name: cookbook-openstack-ops-messaging
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2336,7 +2136,6 @@
 
 - project:
     name: cookbook-openstack-integration-test
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2346,7 +2145,6 @@
 
 - project:
     name: ironic-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2354,7 +2152,6 @@
 
 - project:
     name: ironic
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -2381,7 +2178,6 @@
 
 - project:
     name: python-ironicclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -2393,7 +2189,6 @@
 
 - project:
     name: ironic-python-agent
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -2403,7 +2198,6 @@
 
 - project:
     name: inception
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2411,7 +2205,6 @@
 
 - project:
     name: barbican
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -2424,7 +2217,6 @@
 
 - project:
     name: barbican-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2432,7 +2224,6 @@
 
 - project:
     name: python-barbicanclient
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2442,7 +2233,6 @@
 
 - project:
     name: taskflow
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -2459,7 +2249,6 @@
 
 - project:
     name: cl-openstack-client
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2467,7 +2256,6 @@
 
 - project:
     name: stackalytics
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2478,7 +2266,6 @@
 
 - project:
     name: anvil
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2488,7 +2275,6 @@
 
 - project:
     name: pycadf
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
@@ -2500,7 +2286,6 @@
 
 - project:
     name: pecan
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2541,7 +2326,6 @@
 
 - project:
     name: stevedore
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     rtfd-id: 4157
     tarball-site: tarballs.openstack.org
@@ -2553,7 +2337,6 @@
 
 - project:
     name: cliff
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2572,7 +2355,6 @@
 
 - project:
     name: python-tuskarclient
-    github-org: openstack
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
     node: 'bare-precise || bare-trusty'
@@ -2583,7 +2365,6 @@
 
 - project:
     name: warm
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2592,7 +2373,6 @@
 
 - project:
     name: wsme
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2602,7 +2382,6 @@
 
 - project:
     name: tuskar
-    github-org: openstack
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
     node: 'bare-precise || bare-trusty'
@@ -2613,7 +2392,6 @@
 
 - project:
     name: tuskar-ui
-    github-org: openstack
     tarball-site: tarballs.openstack.org
     node: 'bare-precise || bare-trusty'
 
@@ -2623,7 +2401,6 @@
 
 - project:
     name: rally
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2638,7 +2415,6 @@
 
 - project:
     name: python-rallyclient
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2647,7 +2423,6 @@
 
 - project:
     name: osprofiler
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2657,7 +2432,6 @@
 
 - project:
     name: logaas
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2668,7 +2442,6 @@
 
 - project:
     name: openstack-manuals
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     oldmanual:
@@ -2683,7 +2456,6 @@
 
 - project:
     name: docs-specs
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2691,7 +2463,6 @@
 
 - project:
     name: operations-guide
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2700,7 +2471,6 @@
 
 - project:
     name: security-doc
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2709,7 +2479,6 @@
 
 - project:
     name: manila
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2719,7 +2488,6 @@
 
 - project:
     name: python-manilaclient
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2728,7 +2496,6 @@
 
 - project:
     name: milk
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2737,7 +2504,6 @@
 
 - project:
     name: solum
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2747,7 +2513,6 @@
 
 - project:
     name: solum-specs
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2756,7 +2521,6 @@
 
 - project:
     name: congress
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2765,7 +2529,6 @@
 
 - project:
     name: congress-specs
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2774,7 +2537,6 @@
 
 - project:
     name: rubick
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2783,7 +2545,6 @@
 
 - project:
     name: refstack
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2792,7 +2553,6 @@
 
 - project:
     name: refstack-client
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2801,7 +2561,6 @@
 
 - project:
     name: swift-ceph-backend
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2810,7 +2569,6 @@
 
 - project:
     name: swift3
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2824,7 +2582,6 @@
 
 - project:
     name: swiftsync
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2833,7 +2590,6 @@
 
 - project:
     name: tooz
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2844,7 +2600,6 @@
 
 - project:
     name: sphinxcontrib-docbookrestapi
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2858,7 +2613,6 @@
 
 - project:
     name: tomograph
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2868,7 +2622,6 @@
 
 - project:
     name: turbo-hipster
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2878,7 +2631,6 @@
 
 - project:
     name: python-solumclient
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2888,7 +2640,6 @@
 
 - project:
     name: solum-dashboard
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2898,7 +2649,6 @@
 
 - project:
     name: solum-infra-guestagent
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2908,7 +2658,6 @@
 
 - project:
     name: heat-translator
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2917,7 +2666,6 @@
 
 - project:
     name: release-tools
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2926,7 +2674,6 @@
 
 - project:
     name: entropy
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2935,7 +2682,6 @@
 
 - project:
     name: openstack-doc-tools
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2947,7 +2693,6 @@
 
 - project:
     name: api-site
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2956,7 +2701,6 @@
 
 - project:
     name: driverlog
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2965,7 +2709,6 @@
 
 - project:
     name: volume-api
-    github-org: openstack
     node: 'bare-precise || bare-trusty'
 
     jobs:
@@ -2973,7 +2716,6 @@
 
 - project:
     name: python-openstacksdk
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2983,7 +2725,6 @@
 
 - project:
     name: gce-api
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -2992,7 +2733,6 @@
 
 - project:
     name: ec2-api
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3001,7 +2741,6 @@
 
 - project:
     name: gnocchi
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3014,7 +2753,6 @@
 
 - project:
     name: groups
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3027,7 +2765,6 @@
 
 - project:
     name: groups-static-pages
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3036,7 +2773,6 @@
 
 - project:
     name: openstackid
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3049,7 +2785,6 @@
 
 - project:
     name: compass-core
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3058,7 +2793,6 @@
 
 - project:
     name: requests-mock
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3068,7 +2802,6 @@
 
 - project:
     name: stacktach
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3077,7 +2810,6 @@
 
 - project:
     name: bashate
-    github-org: openstack-dev
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3087,7 +2819,6 @@
 
 - project:
     name: cloudkitty
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3096,7 +2827,6 @@
 
 - project:
     name: cachemonkey
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3105,7 +2835,6 @@
 
 - project:
     name: octavia
-    github-org: stackforge
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3114,7 +2843,6 @@
 
 - project:
     name: subunit2sql
-    github-org: openstack-infra
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
 
@@ -3123,7 +2851,6 @@
 
 - project:
     name: python-magnetodbclient
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3134,7 +2861,6 @@
 
 - project:
     name: tacker-specs
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3144,7 +2870,6 @@
 
 - project:
     name: xstatic-angular
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3154,7 +2879,6 @@
 
 - project:
     name: xstatic-angular-cookies
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3164,7 +2888,6 @@
 
 - project:
     name: xstatic-angular-mock
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3174,7 +2897,6 @@
 
 - project:
     name: xstatic-bootstrap-datepicker
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3184,7 +2906,6 @@
 
 - project:
     name: xstatic-bootstrap-scss
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3194,7 +2915,6 @@
 
 - project:
     name: xstatic-d3
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3204,7 +2924,6 @@
 
 - project:
     name: xstatic-hogan
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3214,7 +2933,6 @@
 
 - project:
     name: xstatic-jasmine
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3224,7 +2942,6 @@
 
 - project:
     name: xstatic-jquery-migrate
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3234,7 +2951,6 @@
 
 - project:
     name: xstatic-jquery.bootstrap.wizard
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3244,7 +2960,6 @@
 
 - project:
     name: xstatic-jquery.quicksearch
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3254,7 +2969,6 @@
 
 - project:
     name: xstatic-jquery.tablesorter
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3264,7 +2978,6 @@
 
 - project:
     name: xstatic-jsencrypt
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3274,7 +2987,6 @@
 
 - project:
     name: xstatic-qunit
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3284,7 +2996,6 @@
 
 - project:
     name: xstatic-spin
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3294,7 +3005,6 @@
 
 - project:
     name: xstatic-rickshaw
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3304,7 +3014,6 @@
 
 - project:
     name: doc8
-    github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -3314,7 +3023,6 @@
 
 - project:
     name: rack
-    github-org: stackforge
     node: bare-trusty
     tarball-site: tarballs.openstack.org
 
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 1fd5ffdddd..64fe209c12 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
@@ -10,9 +10,7 @@
       - revoke-sudo
       - branch-git-prep:
           branch: '{branch}'
-      - python26:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python26
       - assert-no-extra-files
 
     publishers:
@@ -34,9 +32,7 @@
       - revoke-sudo
       - branch-git-prep:
           branch: '{branch}'
-      - python27:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python27
       - assert-no-extra-files
 
     publishers:
@@ -58,9 +54,7 @@
       - revoke-sudo
       - branch-git-prep:
           branch: '{branch}'
-      - docs:
-          github-org: '{github-org}'
-          project: '{name}'
+      - docs
 
     publishers:
       - console-log
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 a462d697f9..057513b5f7 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
@@ -9,9 +9,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - coverage:
-          github-org: '{github-org}'
-          project: '{name}'
+      - coverage
 
     publishers:
       - coverage-log
@@ -26,9 +24,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - pep8:
-          github-org: '{github-org}'
-          project: '{name}'
+      - pep8
 
     publishers:
       - console-log
@@ -42,8 +38,6 @@
       - revoke-sudo
       - gerrit-git-prep
       - pep8:
-          github-org: '{github-org}'
-          project: '{name}'
       - zuul_swift_upload_logs_with_console:
           upload_source: '.tox/pep8/log'
 
@@ -58,9 +52,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - pylint:
-          github-org: '{github-org}'
-          project: '{name}'
+      - pylint
 
     publishers:
       - console-log
@@ -85,9 +77,7 @@
           rpm -ql libffi-devel
       - revoke-sudo
       - gerrit-git-prep
-      - python26:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python26
       - assert-no-extra-files
 
     publishers:
@@ -107,9 +97,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - python27:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python27
       - assert-no-extra-files
 
     publishers:
@@ -129,9 +117,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - python33:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python33
       - assert-no-extra-files
 
     publishers:
@@ -151,9 +137,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - python34:
-          github-org: '{github-org}'
-          project: '{name}'
+      - python34
       - assert-no-extra-files
 
     publishers:
@@ -173,9 +157,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - pypy:
-          github-org: '{github-org}'
-          project: '{name}'
+      - pypy
       - assert-no-extra-files
 
     publishers:
@@ -190,9 +172,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - docs:
-          github-org: '{github-org}'
-          project: '{name}'
+      - docs
 
     publishers:
       - console-log
@@ -213,8 +193,6 @@
       - gerrit-git-prep
       - tox:
           envlist: '{envlist}'
-          github-org: '{github-org}'
-          project: '{name}'
       - assert-no-extra-files
 
     publishers:
@@ -230,9 +208,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - tarball:
-          github-org: '{github-org}'
-          project: '{name}'
+      - tarball
 
     publishers:
       - tarball:
@@ -251,9 +227,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - tarball:
-          github-org: '{github-org}'
-          project: '{name}'
+      - tarball
       - shell: |
           #!/bin/bash -xe
           BRANCH=$ZUUL_REFNAME
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/specs-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/specs-jobs.yaml
index 77a5189dce..cf01876d95 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/specs-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/specs-jobs.yaml
@@ -4,25 +4,24 @@
     name: '{name}-publish-specs'
     node: 'bare-precise || bare-trusty'
 
-    # We want to publish to {github-org}/{name} but the scp publisher
-    # cannot remove paths, so use a shell builder to move the content
-    # in the right place and publish from there.
+    # We want to publish to org/name but the scp publisher cannot remove paths,
+    # so use a shell builder to move the content in the right place and publish
+    # from there.
     builders:
       - revoke-sudo
       - gerrit-git-prep
       - docs:
-          github-org: '{github-org}'
           project: '{name}'
       - shell: |
-          mkdir {github-org}
-          mv doc/build/html {github-org}/{name}
+          mkdir `dirname $ZUUL_PROJECT`
+          mv doc/build/html $ZUUL_PROJECT
 
     publishers:
       - scp:
           site: 'static.openstack.org'
           files:
             - target: 'specs/'
-              source: '{github-org}/{name}/**'
+              source: '$ZUUL_PROJECT/**'
               keep-hierarchy: true
               copy-after-failure: false
       - console-log
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml b/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
index b835901403..c28e4db124 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
@@ -6,9 +6,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: storyboard
+      - docs
 
     publishers:
       - scp:
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 94e9b9da86..3f06fd9b00 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
@@ -22,7 +22,7 @@
           branch: master
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/propose_translation_update.sh {github-org} {name}
+          /usr/local/jenkins/slave_scripts/propose_translation_update.sh {name}
 
     publishers:
       - console-log
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tuskar-ui.yaml b/modules/openstack_project/files/jenkins_job_builder/config/tuskar-ui.yaml
index 0a12a21ab6..c14c527b49 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/tuskar-ui.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/tuskar-ui.yaml
@@ -5,9 +5,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - selenium:
-          github-org: openstack
-          project: tuskar-ui
+      - selenium
 
     publishers:
       - console-log
@@ -21,8 +19,6 @@
       - gerrit-git-prep
       - tox:
           envlist: jshint
-          github-org: openstack
-          project: tuskar-ui
 
     publishers:
       - console-log
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml b/modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml
index 9088950ab8..ebfbedc876 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml
@@ -6,9 +6,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: vinz
+      - docs
 
     publishers:
       - scp:
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 cffae1b1f9..81a79da18d 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
@@ -6,9 +6,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - docs:
-          github-org: openstack-infra
-          project: zuul
+      - docs
 
     publishers:
       - scp:
@@ -26,9 +24,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - coverage:
-          github-org: openstack-infra
-          project: zuul
+      - coverage
 
     publishers:
       - coverage-log
@@ -46,9 +42,7 @@
       - revoke-sudo
       - branch-git-prep:
           branch: master
-      - python27:
-          github-org: 'openstack-infra'
-          project: 'zuul'
+      - python27
 
     publishers:
       - test-results
diff --git a/tools/run-compare-xml.sh b/tools/run-compare-xml.sh
index 2349a2aa99..8663f161ad 100755
--- a/tools/run-compare-xml.sh
+++ b/tools/run-compare-xml.sh
@@ -16,20 +16,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-org=$1
-project=$2
-
-if [[ -z "$org" || -z "$project" ]]
-then
-  echo "Usage: $0 ORG PROJECT"
-  echo
-  echo "ORG: The project organization (eg 'openstack')"
-  echo "PROJECT: The project name (eg 'nova')"
-  #TODO: make fatal in subsequent change: exit 1
-else
-  /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
-fi
-
 rm -fr .test
 mkdir .test
 cd .test
diff --git a/tools/run-layout.sh b/tools/run-layout.sh
index eb8f10797d..0d3cb1343e 100755
--- a/tools/run-layout.sh
+++ b/tools/run-layout.sh
@@ -14,26 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-org=$1
-project=$2
-
-if [[ -z "$org" || -z "$project" ]]
-then
-  echo "Usage: $0 ORG PROJECT"
-  echo
-  echo "ORG: The project organization (eg 'openstack')"
-  echo "PROJECT: The project name (eg 'nova')"
-  exit 1
-else
-  if [ -f /usr/local/jenkins/slave_scripts/select-mirror.sh ]
-  then
-      /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
-  else
-      echo "No mirror script /usr/local/jenkins/slave_scripts/select-mirror.sh,"
-      echo "assuming local environment is configured properly."
-  fi
-fi
-
 mkdir -p .test
 cd .test
 [ -d zuul ] || git clone https://review.openstack.org/p/openstack-infra/zuul --depth 1