diff --git a/aztest.yml b/aztest-playbook.yml
similarity index 67%
rename from aztest.yml
rename to aztest-playbook.yml
index 61c4f62..837c14a 100644
--- a/aztest.yml
+++ b/aztest-playbook.yml
@@ -1,17 +1,23 @@
 ---
 # aztest playbook, for installing OpenCloud
 
+# Prepare the head node and install juju
 - hosts: head
   roles:
     - { role: common-prep, become: yes }
     - { role: head-prep, become: yes }
     - juju-user-prep
     - juju-setup
-    - juju-openstack-config
 
+# prepare the compute nodes
 - hosts: compute
   become: yes
   roles:
     - { role: common-prep, become: yes }
     - { role: compute-prep, become: yes }
 
+# Finish the openstack config on head (needs compute nodes up to finish)
+- hosts: head
+  roles:
+    - juju-openstack-config
+
diff --git a/group_vars/arizona.yml b/group_vars/arizona.yml
new file mode 100644
index 0000000..d945d36
--- /dev/null
+++ b/group_vars/arizona.yml
@@ -0,0 +1,5 @@
+---
+# file: group_vars/arizona.yml
+
+mgmt_net_prefix: 192.168.102
+cloudlab: false
diff --git a/group_vars/aztest b/group_vars/aztest.yml
similarity index 62%
rename from group_vars/aztest
rename to group_vars/aztest.yml
index 33268ca..ef3310d 100644
--- a/group_vars/aztest
+++ b/group_vars/aztest.yml
@@ -1,6 +1,6 @@
 ---
-# file: group_vars/aztest
+# file: group_vars/aztest.yml
 
 mgmt_net_prefix: 192.168.250
-
 cloudlab: false
+
diff --git a/group_vars/cloudlab.yml b/group_vars/cloudlab.yml
new file mode 100644
index 0000000..340ac15
--- /dev/null
+++ b/group_vars/cloudlab.yml
@@ -0,0 +1,6 @@
+---
+# file: group_vars/cloudlab.yml
+
+mgmt_net_prefix: 192.168.100
+cloudlab: true
+
diff --git a/group_vars/cord-test.yml b/group_vars/cord-test.yml
new file mode 100644
index 0000000..9836d41
--- /dev/null
+++ b/group_vars/cord-test.yml
@@ -0,0 +1,4 @@
+---
+# file: group_vars/cord-test.yml
+
+
diff --git a/group_vars/cord.yml b/group_vars/cord.yml
new file mode 100644
index 0000000..3b1cf22
--- /dev/null
+++ b/group_vars/cord.yml
@@ -0,0 +1,3 @@
+---
+# file: group_vars/cord.yml
+
diff --git a/group_vars/princeton.yml b/group_vars/princeton.yml
new file mode 100644
index 0000000..7c1e6ba
--- /dev/null
+++ b/group_vars/princeton.yml
@@ -0,0 +1,6 @@
+---
+# file: group_vars/princeton.yml
+
+mgmt_net_prefix: 192.168.100
+cloudlab: false
+
diff --git a/group_vars/singapore.yml b/group_vars/singapore.yml
new file mode 100644
index 0000000..85ba602
--- /dev/null
+++ b/group_vars/singapore.yml
@@ -0,0 +1,5 @@
+---
+# file: group_vars/singapore.yml
+
+mgmt_net_prefix: 192.168.103
+cloudlab: false
diff --git a/group_vars/stanford.yml b/group_vars/stanford.yml
new file mode 100644
index 0000000..fee7f1c
--- /dev/null
+++ b/group_vars/stanford.yml
@@ -0,0 +1,6 @@
+---
+# file: group_vars/stanford.yml
+
+mgmt_net_prefix: 192.168.101
+cloudlab: false
+