diff --git a/singapore-compute.yml b/singapore-compute.yml
index 70bc008..c342483 100644
--- a/singapore-compute.yml
+++ b/singapore-compute.yml
@@ -1,22 +1,36 @@
 ---
-- hosts: singapore-head
+- hosts: head
   sudo: no
+  user: ubuntu
   tasks:
-  - pause: "Install nova-compute on all unused machines managed by Juju"
+  - name: Remind user what is going to happen
+    pause: prompt="Install nova-compute on all unused machines managed by Juju"
 
   - name: Deploy nova-compute
     script: scripts/juju-compute-setup.py
 
-  - pause: "Wait until services have started"
+  - name: Try to avoid race condition
+    pause: seconds=5
+
+  - name: Wait until nova-compute is deployed
+    script: scripts/wait-for-services.sh
+
+  - name: Make sure we're using KVM
+    shell: juju set nova-compute virt-type=kvm
 
   - name: Add nova-compute relations
     script: scripts/juju-compute-relations.py
 
-  - pause: "Wait until relations are added"
+  - name: Try to avoid race condition
+    pause: seconds=5
+
+  - name: Wait until relations are added
+    script: scripts/wait-for-services.sh
 
 # Play: set up ansible-pull for OpenCloud-specific files on nova-compute nodes
-- hosts: singapore-compute
+- hosts: compute
   sudo: yes
+  user: ubuntu
   vars:
 
     # schedule is fed directly to cron
@@ -31,11 +45,14 @@
     # Directory to where repository will be cloned
     workdir: /var/lib/ansible/local
 
-    # Repository to check out 
+    # Repository to check out
     # repo must contain a local.yml file at top level
     #repo_url: git://github.com/sfromm/ansible-playbooks.git
     repo_url: git://github.com/andybavier/opencloud-nova-compute-ansible.git
 
+    # Branch or tag to checkout
+    repo_version: kilo
+
   tasks:
 
   - name: Install ansible
@@ -53,4 +70,3 @@
 
   - name: Create logrotate entry for ansible-pull.log
     template: src=templates/etc/logrotate.d/ansible-pull.j2 dest=/etc/logrotate.d/ansible-pull owner=root group=root mode=0644
-