diff --git a/README b/README
index d8399e9..47b6e89 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@ Installation
 
 1. Install Python software properties
 
-        $ sudo apt-get install -y python-software-properties 
+        $ sudo apt-get install -y python-software-properties
 
 2. Install the Nova PPA
 
@@ -102,9 +102,7 @@ This will install all of the currently supported openstack components into a sin
 
 run the rake task:
 
-    $ rake build:all
-
-    $ 
+    $ rake build:single
 
 Author
 ------
diff --git a/manifests/hosts.pp b/manifests/hosts.pp
index 4072a74..dcd9eb2 100644
--- a/manifests/hosts.pp
+++ b/manifests/hosts.pp
@@ -20,3 +20,5 @@ host { 'compute':
 host { 'glance':
   ip => '172.21.0.16',
 }
+class { 'apt': }
+class { 'openstack::repo::diablo': }
diff --git a/modules/glance b/modules/glance
index ba246b2..f8b9225 160000
--- a/modules/glance
+++ b/modules/glance
@@ -1 +1 @@
-Subproject commit ba246b2d408fe9c985e7169b83a12bae1a789cf1
+Subproject commit f8b922582dbd6bf22eda39f1281cf9f5685dc236
diff --git a/modules/nova b/modules/nova
index ca8850b..807a437 160000
--- a/modules/nova
+++ b/modules/nova
@@ -1 +1 @@
-Subproject commit ca8850b8fd38f4bc132d9eca66dfdbc6b269a2b4
+Subproject commit 807a43747117f2d9251b049ca5a95ff8d722ccf6
diff --git a/modules/openstack/manifests/repo/diablo.pp b/modules/openstack/manifests/repo/diablo.pp
new file mode 100644
index 0000000..3a5a73f
--- /dev/null
+++ b/modules/openstack/manifests/repo/diablo.pp
@@ -0,0 +1,3 @@
+class openstack::repo::diablo {
+  apt::ppa { 'ppa:openstack-release/2011.3': }
+}
diff --git a/scripts/run.sh b/scripts/run.sh
index c88128a..fcab54e 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-puppet apply /vagrant/manifests/hosts.pp
+puppet apply /vagrant/manifests/hosts.pp --modulepath /vagrant/modules
 puppet apply /vagrant/manifests/site.pp --modulepath /vagrant/modules --graph --certname $* --graphdir /vagrant/graphs