diff --git a/aztest-playbook.yml b/aztest-playbook.yml
index 837c14a..347e8ec 100644
--- a/aztest-playbook.yml
+++ b/aztest-playbook.yml
@@ -1,10 +1,35 @@
 ---
-# aztest playbook, for installing OpenCloud
+# aztest playbook, for installing an OpenCloud site
 
-# Prepare the head node and install juju
+- hosts: all
+  tasks:
+  - include_vars: vars/opencloud_defaults.yml
+  - include_vars: vars/aztest.yml
+
+# common setup
+- hosts: all
+  become: yes
+  roles:
+    - common-prep
+    - dell-virt
+
+# Install DNS servers on the head node
+- hosts: head
+  become: yes
+  roles:
+    - dns-nsd
+    - dns-unbound
+
+# Configure DNS serves on all 
+
+- hosts: all
+  become: yes
+  roles:
+    - dns-configure
+
+# prepare the head node, install juju
 - hosts: head
   roles:
-    - { role: common-prep, become: yes }
     - { role: head-prep, become: yes }
     - juju-user-prep
     - juju-setup
@@ -13,10 +38,9 @@
 - hosts: compute
   become: yes
   roles:
-    - { role: common-prep, become: yes }
-    - { role: compute-prep, become: yes }
+    - compute-prep
 
-# Finish the openstack config on head (needs compute nodes up to finish)
+# configure openstack on head node, including compute nodes
 - hosts: head
   roles:
     - juju-openstack-config