diff --git a/modules/jenkins_jobs/files/projects/openstack/cinder.yml b/modules/jenkins_jobs/files/projects/openstack/cinder.yml
index 5de4a447d8..6691963a81 100644
--- a/modules/jenkins_jobs/files/projects/openstack/cinder.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/cinder.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/glance.yml b/modules/jenkins_jobs/files/projects/openstack/glance.yml
index 186f3c9c9d..8f8a267a78 100644
--- a/modules/jenkins_jobs/files/projects/openstack/glance.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/glance.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/horizon.yml b/modules/jenkins_jobs/files/projects/openstack/horizon.yml
index 4fb85fd920..a876e58e8d 100644
--- a/modules/jenkins_jobs/files/projects/openstack/horizon.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/horizon.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/keystone.yml b/modules/jenkins_jobs/files/projects/openstack/keystone.yml
index 41e2485e39..2b5ea98b95 100644
--- a/modules/jenkins_jobs/files/projects/openstack/keystone.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/keystone.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/melange.yml b/modules/jenkins_jobs/files/projects/openstack/melange.yml
index 96f2836145..eaee4d0621 100644
--- a/modules/jenkins_jobs/files/projects/openstack/melange.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/melange.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/nova.yml b/modules/jenkins_jobs/files/projects/openstack/nova.yml
index 17826837ae..b0e917f046 100644
--- a/modules/jenkins_jobs/files/projects/openstack/nova.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/nova.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml
index d7a2885bb1..7aa113a6f9 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml
index c0d8c89951..7a1485ef5f 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml
index 6ad9f516c2..3e71283aa4 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-melangeclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-melangeclient.yml
index 629c66e379..b5adee9afd 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-melangeclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-melangeclient.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml
index 1f7ccd07de..a472ce7d58 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml
index c67dfbf5f6..f2aab83909 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml
index 53db919998..d9e91f3533 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml
index aefb01ab5d..042777fdec 100644
--- a/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'swift.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/quantum.yml b/modules/jenkins_jobs/files/projects/openstack/quantum.yml
index 99f85b5426..529655c08b 100644
--- a/modules/jenkins_jobs/files/projects/openstack/quantum.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/quantum.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/openstack/swift.yml b/modules/jenkins_jobs/files/projects/openstack/swift.yml
index 8b8147702f..7eb4d533b1 100644
--- a/modules/jenkins_jobs/files/projects/openstack/swift.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/swift.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'openstack'
   review_site: 'review.openstack.org'
   publisher_site: 'nova.openstack.org'
+  node: 'oneiric'
diff --git a/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml b/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml
index 2764778210..0be0195d29 100644
--- a/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml
+++ b/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'stackforge'
   review_site: 'review.stackforge.org'
   publisher_site: 'TODO.stackforge.org'
+  node: 'precise'
diff --git a/modules/jenkins_jobs/files/projects/stackforge/heat.yml b/modules/jenkins_jobs/files/projects/stackforge/heat.yml
index 3969dcf9c4..da1cc755d0 100644
--- a/modules/jenkins_jobs/files/projects/stackforge/heat.yml
+++ b/modules/jenkins_jobs/files/projects/stackforge/heat.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'heat-api'
   review_site: 'review.stackforge.org'
   publisher_site: 'TODO.stackforge.org'
+  node: 'precise'
diff --git a/modules/jenkins_jobs/files/projects/stackforge/mraas.yml b/modules/jenkins_jobs/files/projects/stackforge/mraas.yml
index 4dce98a95a..91e506ca01 100644
--- a/modules/jenkins_jobs/files/projects/stackforge/mraas.yml
+++ b/modules/jenkins_jobs/files/projects/stackforge/mraas.yml
@@ -36,7 +36,7 @@ scm:
   scm: 'false'
 
 assignednode:
-  node: 'oneiric'
+  node: 'precise'
 
 ---
 modules:
@@ -77,4 +77,4 @@ scm:
   scm: 'false'
 
 assignednode:
-  node: 'oneiric'
+  node: 'precise'
diff --git a/modules/jenkins_jobs/files/projects/stackforge/reddwarf.yml b/modules/jenkins_jobs/files/projects/stackforge/reddwarf.yml
index 63c3512130..857c97ad74 100644
--- a/modules/jenkins_jobs/files/projects/stackforge/reddwarf.yml
+++ b/modules/jenkins_jobs/files/projects/stackforge/reddwarf.yml
@@ -7,3 +7,4 @@ values:
   github_org: 'stackforge'
   review_site: 'review.stackforge.org'
   publisher_site: 'TODO.stackforge.org'
+  node: 'precise'
diff --git a/modules/jenkins_jobs/files/templates/python_jobs.yml b/modules/jenkins_jobs/files/templates/python_jobs.yml
index 269d0b1f72..07ac62496b 100644
--- a/modules/jenkins_jobs/files/templates/python_jobs.yml
+++ b/modules/jenkins_jobs/files/templates/python_jobs.yml
@@ -27,7 +27,7 @@ scm:
   scm: 'true'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'
 
 logrotate:
   daysToKeep: 3
@@ -75,7 +75,7 @@ scm:
   scm: 'false'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'
 
 ---
 # python26-gate
@@ -117,7 +117,7 @@ scm:
   scm: 'true'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'
 
 ---
 # python27-gate
@@ -159,7 +159,7 @@ scm:
   scm: 'true'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'
 
 ---
 # docs
@@ -189,7 +189,7 @@ scm:
   scm: 'true'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'
 
 publisher:
   site: '@PUBLISHER_SITE@'
@@ -233,7 +233,7 @@ scm:
   scm: 'false'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'
 
 ---
 # ppa
@@ -260,7 +260,7 @@ scm:
   scm: 'false'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'
 
 ---
 # tarball
@@ -302,7 +302,7 @@ scm:
   scm: 'false'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'
 
 publisher:
   site: '@PUBLISHER_SITE@'
@@ -349,7 +349,7 @@ scm:
   scm: 'false'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'
 
 ---
 # python26-check
@@ -392,7 +392,7 @@ scm:
   scm: 'true'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'
 
 ---
 # python27-check
@@ -435,7 +435,7 @@ scm:
   scm: 'true'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'
 
 ---
 # merge-check
@@ -477,6 +477,6 @@ scm:
   scm: 'false'
 
 assignednode:
-  node: 'oneiric'
+  node: '@NODE@'