diff --git a/manifests/node/controller.pp b/manifests/node/controller.pp
index 85b7d46..97fb00c 100644
--- a/manifests/node/controller.pp
+++ b/manifests/node/controller.pp
@@ -1,17 +1,6 @@
 class kickstack::node::controller inherits kickstack {
 
-  include kickstack::rpc
-  include kickstack::database
-
-  include kickstack::keystone::db
-
-  include kickstack::glance::db
   include kickstack::glance::registry
-  
-  include kickstack::cinder::db
   include kickstack::cinder::scheduler
 
-  include kickstack::quantum::db
-
-  include kickstack::nova::db
 }
diff --git a/manifests/node/infrastructure.pp b/manifests/node/infrastructure.pp
new file mode 100644
index 0000000..1e504e0
--- /dev/null
+++ b/manifests/node/infrastructure.pp
@@ -0,0 +1,12 @@
+class kickstack::node::infrastructure inherits kickstack {
+
+  include kickstack::rpc
+  include kickstack::database
+
+  include kickstack::keystone::db
+  include kickstack::glance::db
+  include kickstack::cinder::db
+  include kickstack::quantum::db
+  include kickstack::nova::db
+
+}