diff --git a/roles/cloudlab-prep/defaults/main.yml b/roles/cloudlab-prep/defaults/main.yml
new file mode 100644
index 0000000..00a4575
--- /dev/null
+++ b/roles/cloudlab-prep/defaults/main.yml
@@ -0,0 +1,6 @@
+---
+# roles/cloudlab-prep/defaults/main.yml
+
+cloudlab_extrafs:
+  - /var/lib/nova
+  #  - /var/lib/uvtool/libvirt/images
diff --git a/roles/cloudlab-prep/tasks/main.yml b/roles/cloudlab-prep/tasks/main.yml
index e23168b..3dc0985 100644
--- a/roles/cloudlab-prep/tasks/main.yml
+++ b/roles/cloudlab-prep/tasks/main.yml
@@ -1,7 +1,15 @@
 ---
 # roles/cloudlab-prep/tasks/main.yml
 
-- name:  Set up extra disk space
-  command: /usr/testbed/bin/mkextrafs -f /var/lib/uvtool/libvirt/images
-    creates=/var/lib/uvtool/libvirt/images/lost+found
+- name: create directories to mount extra filesystems
+  file: 
+    dest={{ item }}
+    state=directory
+  with_items: "{{ cloudlab_extrafs }}"
+
+
+- name: Set up extra disk space
+  command: /usr/testbed/bin/mkextrafs -f {{ item }}
+    creates={{ item }}/lost+found
+  with_items: "{{ cloudlab_extrafs }}"
 
diff --git a/roles/config-virt/defaults/main.yml b/roles/config-virt/defaults/main.yml
new file mode 100644
index 0000000..8a1faf1
--- /dev/null
+++ b/roles/config-virt/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+# roles/config-virt/defaults/main.yml
+
+mgmtbr_name: virbr0
diff --git a/roles/config-virt/tasks/main.yml b/roles/config-virt/tasks/main.yml
index 76f14ae..d74d4f3 100644
--- a/roles/config-virt/tasks/main.yml
+++ b/roles/config-virt/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# roles/config-virt/main/tasks.yml
+# roles/config-virt/tasks/main.yml
 
 - name: Get ubuntu image for uvtool
   command: uvt-simplestreams-libvirt sync --source http://cloud-images.ubuntu.com/daily \
diff --git a/roles/config-virt/templates/default.xml.j2 b/roles/config-virt/templates/default.xml.j2
index 5183aca..7914a2e 100644
--- a/roles/config-virt/templates/default.xml.j2
+++ b/roles/config-virt/templates/default.xml.j2
@@ -1,6 +1,6 @@
 <network>
   <name>default</name>
-  <bridge name="virbr0"/>
+  <bridge name="{{ mgmtbr_name }}"/>
   <forward/>
   <domain name="{{ site_suffix }}" localonly="no"/>
   <dns>
diff --git a/roles/dns-unbound/templates/unbound.conf.j2 b/roles/dns-unbound/templates/unbound.conf.j2
index 1583028..2e1c89f 100644
--- a/roles/dns-unbound/templates/unbound.conf.j2
+++ b/roles/dns-unbound/templates/unbound.conf.j2
@@ -15,7 +15,7 @@
 
   # allow from local networks
   {% for cidr_ipv4 in unbound_interfaces %}
-  access-control: {{ cidr_ipv4 | ipaddr('network') }}/28 allow
+  access-control: {{ cidr_ipv4 }} allow
   {% endfor %}
 
 {% if nsd_zones is defined %}