diff --git a/manifests/site.pp b/manifests/site.pp
index 0576c86..e91c807 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -229,13 +229,10 @@ node "planet.openstack.org" {
   }
 }
 
-
-node "devstack-oneiric.template.openstack.org" {
+node /^.*\.template\.openstack\.org$/ {
   include openstack_template
-  include devstack_host
 }
 
-
 #
 # Jenkins slaves:
 #
@@ -256,15 +253,3 @@ node /^oneiric.*\.slave\.openstack\.org$/ {
     require => Package[python-pip],
   }
 }
-
-node /^deploy.*.openstack\.org$/ {
-  include openstack_jenkins_slave
-  include orchestra
-}
-
-node "deploy-rax.1918.openstack.org" {
-  exec { "poweroff":
-    command => "poweroff",
-    path => "/sbin",
-  }
-}