diff --git a/vars/aztest.yml b/vars/aztest.yml
index 4e37651..fd11cd8 100644
--- a/vars/aztest.yml
+++ b/vars/aztest.yml
@@ -1,8 +1,11 @@
 ---
 # file: group_vars/aztest.yml
 
-# Prefix for DNS zones
-mgmt_net_prefix: 192.168.250
+# IP prefix for VMs
+mgmtbr_prefix: 192.168.250
+
+# site domain suffix
+site_suffix: aztest.infra.opencloud.us
 
 # NSD/Unbound settings
 
@@ -18,3 +21,13 @@
 unbound_interfaces:
   #  - 192.168.250.1/24
   - 206.207.253.10/28
+
+# resolv.conf settings
+dns_servers:
+  - 206.207.253.10
+
+dns_search:
+  - aztest.infra.opencloud.us
+  - opencloud.cs.arizona.edu
+
+
diff --git a/vars/opencloud_defaults.yml b/vars/opencloud_defaults.yml
index 2d3ef92..41628a8 100644
--- a/vars/opencloud_defaults.yml
+++ b/vars/opencloud_defaults.yml
@@ -6,6 +6,7 @@
 
 head_vm_list:
   - name: "juju-1"
+    service: "juju"
     aliases:
        - "juju"
     ipv4_last_octet: 10
@@ -14,6 +15,7 @@
     diskGB: 20
 
   - name: "ceilometer-1"
+    service: "ceilometer"
     aliases:
       - "ceilometer"
     ipv4_last_octet: 20
@@ -24,6 +26,7 @@
       - { ext: 8777, int: 8777 }
 
   - name: "glance-1"
+    service: "glance"
     aliases:
       - "glance"
     ipv4_last_octet: 30
@@ -34,6 +37,7 @@
       - { ext: 9292, int: 9292 }
 
   - name: "keystone-1"
+    service: "keystone"
     aliases:
       - "keystone"
     ipv4_last_octet: 40
@@ -46,6 +50,7 @@
       - { ext: 5000, int: 5000 }
 
   - name: "mysql-1"
+    service: "mysql"
     aliases:
       - "mysql"
     ipv4_last_octet: 50
@@ -54,6 +59,7 @@
     diskGB: 40
 
   - name: "nagios-1"
+    service: "nagios"
     aliases:
       - "nagios"
     ipv4_last_octet: 60
@@ -64,6 +70,7 @@
       - { ext: 3128, int: 80 }
 
   - name: "neutron-api-1"
+    service: "neutron-api"
     aliases:
       - "neutron-api"
     ipv4_last_octet: 70
@@ -74,6 +81,7 @@
       - { ext: 9696, int: 9696 }
 
   - name: "neutron-gateway-1"
+    service: "neutron-gateway"
     aliases:
       - "neutron-gateway"
     ipv4_last_octet: 80
@@ -82,6 +90,7 @@
     diskGB: 40
 
   - name: "nova-cloud-controller-1"
+    service: "nova-cloud-controller"
     aliases:
       - "nova-cloud-controller"
     ipv4_last_octet: 90
@@ -92,6 +101,7 @@
       - { ext: 8774, int: 8774 }
 
   - name: "openstack-dashboard-1"
+    service: "openstack-dashboard"
     aliases:
       - "openstack-dashboard"
     ipv4_last_octet: 100
@@ -102,6 +112,7 @@
       - { ext: 8080, int: 80 }
 
   - name: "rabbitmq-server-1"
+    service: "rabbitmq-server"
     aliases:
       - "rabbitmq-server"
     ipv4_last_octet: 110