diff --git a/infrastructure.yml b/infrastructure.yml
index fcc232b..ae3a558 100644
--- a/infrastructure.yml
+++ b/infrastructure.yml
@@ -4,7 +4,7 @@ cookbooks:
 - openssh: #used by base role
   - 0.8.0
 - apt: #used by erlang
-  - 1.4.4
+  - 1.4.5
 - yum: #used by erlang
   - 0.6.2
 - build-essential: # used by mysql
@@ -12,15 +12,11 @@ cookbooks:
 - erlang: #used by rabbitmq-server role
   - 1.0.0
 - rabbitmq: #used by rabbitmq-server role
-  - 1.5.0
+  - 1.5.1
 - openssl: #used by mysql
   - 1.0.0
-- chef_handler: #used by windows
-  - 1.0.6
-- windows: #used by mysql
-  - 1.3.0
 - mysql: #used by mysql-master role
-  - 1.2.6
+  - 1.2.7
 - postgresql: #required by database
   - 0.99.4
 - aws: #required by database
@@ -29,12 +25,16 @@ cookbooks:
   - 1.0.0
 - database: #required by keystone
   - 1.2.0
+- sysctl: #required by nova
+  - 0.1.2
 - osops-utils: #required by keystone
   - 1.0.3
 - keystone: #used by keystone role
   - 5.0.0
 - glance: #used by glance role
   - 5.0.0
+- nova: #used by glance role
+  - 5.0.0
 
 environments:
 
@@ -50,6 +50,7 @@ roles:
   - glance-api:
   - glance-registry:
   - glance:
+  - nova-setup:
   - single-compute:
   - single-controller:
   - allinone:
diff --git a/roles/nova-setup.rb b/roles/nova-setup.rb
new file mode 100644
index 0000000..76efbde
--- /dev/null
+++ b/roles/nova-setup.rb
@@ -0,0 +1,8 @@
+name "nova-setup"
+description "Where the setup operations for nova get run"
+run_list(
+  "role[base]",
+  "role[os-database]",
+  "role[os-networks]",
+  "recipe[nova::nova-setup]"
+)
diff --git a/roles/os-database.rb b/roles/os-database.rb
index 59a376e..c375a37 100644
--- a/roles/os-database.rb
+++ b/roles/os-database.rb
@@ -1,15 +1,9 @@
 name "os-database"
 description "Define the database settings you're going to use with OpenStack."
-run_list(
-  "recipe[build-essential]"
-  )
 
 override_attributes(
   "mysql" => {
     "allow_remote_root" => true,
     "root_network_acl" => "%"
-  },
-  "build-essential" => {
-    "compiletime" => true
   }
   )
diff --git a/roles/os-networks.rb b/roles/os-networks.rb
index c54fd86..d9aeb81 100644
--- a/roles/os-networks.rb
+++ b/roles/os-networks.rb
@@ -4,14 +4,14 @@ description "Define the networks you're going to use with OpenStack. These will
 override_attributes(
   "osops_networks" => {
     "public" => "10.0.111.0/24",
-    "management" => "192.168.1.0/24",
+    "management" => "10.0.200.0/24",
     "nova" => "10.0.111.0/24"
   },
   "nova" => {
     "networks" => [
       {
         "label" => "public",
-        "ipv4_cidr" => "10.0.100.0/24",
+        "ipv4_cidr" => "192.168.100.0/24",
         "num_networks" => "1",
         "network_size" => "255",
         "bridge" => "br100",
@@ -21,7 +21,7 @@ override_attributes(
       },
       {
         "label" => "private",
-        "ipv4_cidr" => "10.0.200.0/24",
+        "ipv4_cidr" => "192.168.200.0/24",
         "num_networks" => "1",
         "network_size" => "255",
         "bridge" => "br101",
diff --git a/roles/single-controller.rb b/roles/single-controller.rb
index db05db6..f2846c5 100644
--- a/roles/single-controller.rb
+++ b/roles/single-controller.rb
@@ -5,5 +5,6 @@ run_list(
   "role[mysql-master]",
   "role[rabbitmq-server]",
   "role[keystone]",
-  "role[glance]"
+  "role[glance]",
+  "role[nova-setup]"
 )