diff --git a/cloudlab-setup.yml b/cloudlab-setup.yml
index 09839e7..3030556 100644
--- a/cloudlab-setup.yml
+++ b/cloudlab-setup.yml
@@ -61,6 +61,9 @@
   - name: Get trusty image for uvtool
     shell: uvt-simplestreams-libvirt sync --source http://cloud-images.ubuntu.com/daily release=trusty arch=amd64
 
+  - name: Change the subnet of virbr0 to 192.168.100.0/24
+    shell: sed -i 's/192.168.122/192.168.100/g' /etc/libvirt/qemu/networks/default.xml
+
   - name: Create VMs to host OpenCloud services
     sudo: no
     script: scripts/create-vms.sh
diff --git a/scripts/wait-for-services.sh b/scripts/wait-for-services.sh
new file mode 100755
index 0000000..da4ef1f
--- /dev/null
+++ b/scripts/wait-for-services.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Wait for there to be no services in pending state
+while $( juju status --format=summary|grep -q pending )
+do
+  sleep 10
+done