diff --git a/host_vars/adm01.home.foo.sh.yml b/host_vars/adm01.home.foo.sh.yml
index d38b1d2..776c391 100644
--- a/host_vars/adm01.home.foo.sh.yml
+++ b/host_vars/adm01.home.foo.sh.yml
@@ -1,3 +1,6 @@
 ---
-interfaces: [[20, "52:54:00:ac:dc:0b"]]
 vmhost: vmhost02.home.foo.sh
+network_interfaces:
+  - device: eth0
+    vlan: 20
+    mac: "52:54:00:ac:dc:0b"
diff --git a/host_vars/git02.home.foo.sh.yml b/host_vars/git02.home.foo.sh.yml
index 4d5952e..85db698 100644
--- a/host_vars/git02.home.foo.sh.yml
+++ b/host_vars/git02.home.foo.sh.yml
@@ -1,3 +1,6 @@
 ---
-interfaces: [[20, "52:54:00:ac:dc:18"]]
 vmhost: vmhost02.home.foo.sh
+network_interfaces:
+  - device: eth0
+    vlan: 20
+    mac: 52:54:00:ac:dc:18
diff --git a/host_vars/gw01.home.foo.sh.yml b/host_vars/gw01.home.foo.sh.yml
index 11502c0..5023553 100644
--- a/host_vars/gw01.home.foo.sh.yml
+++ b/host_vars/gw01.home.foo.sh.yml
@@ -1,3 +1,8 @@
 ---
-interfaces: [[20, "52:54:00:ac:dc:01"], [103]]
 vmhost: vmhost01.home.foo.sh
+network_interfaces:
+  - device: vio0
+    vlan: 20
+    mac: 52:54:00:ac:dc:01
+  - device: vio1
+    vlan: 103
diff --git a/host_vars/ldap01.home.foo.sh.yml b/host_vars/ldap01.home.foo.sh.yml
index a36e55f..97d238e 100644
--- a/host_vars/ldap01.home.foo.sh.yml
+++ b/host_vars/ldap01.home.foo.sh.yml
@@ -1,6 +1,9 @@
 ---
-interfaces: [[20, "52:54:00:ac:dc:1f"]]
 vmhost: vmhost01.home.foo.sh
+network_interfaces:
+  - device: eth0
+    vlan: 20
+    mac: 52:54:00:ac:dc:1f
 datadisks:
   - 10
 
diff --git a/host_vars/ldap02.home.foo.sh.yml b/host_vars/ldap02.home.foo.sh.yml
index fafa6bc..201ec3a 100644
--- a/host_vars/ldap02.home.foo.sh.yml
+++ b/host_vars/ldap02.home.foo.sh.yml
@@ -1,3 +1,6 @@
 ---
-interfaces: [[20, "52:54:00:ac:dc:20"]]
 vmhost: vmhost02.home.foo.sh
+network_interfaces:
+  - device: eth0
+    vlan: 20
+    mac: 52:54:00:ac:dc:20
diff --git a/host_vars/log01.home.foo.sh.yml b/host_vars/log01.home.foo.sh.yml
index a62e360..c5ba054 100644
--- a/host_vars/log01.home.foo.sh.yml
+++ b/host_vars/log01.home.foo.sh.yml
@@ -1,3 +1,6 @@
 ---
-interfaces: [[20, "52:54:00:ac:dc:27"]]
 vmhost: vmhost01.home.foo.sh
+network_interfaces:
+  - device: vio0
+    vlan: 20
+    mac: 52:54:00:ac:dc:27
diff --git a/host_vars/mirror01.home.foo.sh.yml b/host_vars/mirror01.home.foo.sh.yml
index 5e18de2..22303df 100644
--- a/host_vars/mirror01.home.foo.sh.yml
+++ b/host_vars/mirror01.home.foo.sh.yml
@@ -1,3 +1,6 @@
 ---
-interfaces: [[20, "52:54:00:ac:dc:15"]]
 vmhost: vmhost01.home.foo.sh
+network_interfaces:
+  - device: eth0
+    vlan: 20
+    mac: 52:54:00:ac:dc:15
diff --git a/host_vars/proxy01.home.foo.sh.yml b/host_vars/proxy01.home.foo.sh.yml
index 7b3f951..e0fd388 100644
--- a/host_vars/proxy01.home.foo.sh.yml
+++ b/host_vars/proxy01.home.foo.sh.yml
@@ -1,12 +1,13 @@
 ---
-interfaces: [[20, "52:54:00:ac:dc:0d"], [102]]
 vmhost: vmhost01.home.foo.sh
-
-network_ether_interfaces:
+network_interfaces:
   - device: vio0
+    vlan: 20
+    mac: 52:54:00:ac:dc:0d
     ipaddr: 172.20.21.13
     netmask: 255.255.252.0
   - device: vio1
+    vlan: 102
     proto: none
 
 # kludge advskew values for carps
diff --git a/host_vars/proxy02.home.foo.sh.yml b/host_vars/proxy02.home.foo.sh.yml
index 9435f65..436e436 100644
--- a/host_vars/proxy02.home.foo.sh.yml
+++ b/host_vars/proxy02.home.foo.sh.yml
@@ -1,12 +1,13 @@
 ---
-interfaces: [[20, "52:54:00:ac:dc:0e"], [102]]
 vmhost: vmhost02.home.foo.sh
-
-network_ether_interfaces:
+network_interfaces:
   - device: vio0
+    vlan: 20
+    mac: 52:54:00:ac:dc:0e
     ipaddr: 172.20.21.14
     netmask: 255.255.252.0
   - device: vio1
+    vlan: 102
     proto: none
 
 carp8_advskew: 128
diff --git a/playbooks/include/vm-create.yml b/playbooks/include/vm-create.yml
index 4a28766..a6f4c99 100644
--- a/playbooks/include/vm-create.yml
+++ b/playbooks/include/vm-create.yml
@@ -24,11 +24,13 @@
       {% endif %}
 
     virt_install_network: >-
-      {% for item in interfaces %}
-      {%   if item[1] is defined %}
-      --network bridge=br{{ item[0] }},mac={{ item[1] }},model=virtio
-      {%   else %}
-      --network bridge=br{{ item[0] }},model=virtio
+      {% for item in network_interfaces %}
+      {%   if item.vlan is defined %}
+      {%     if item.mac is defined %}
+      --network bridge=br{{ item.vlan }},mac={{ item.mac }},model=virtio
+      {%     else %}
+      --network bridge=br{{ item.vlan }},model=virtio
+      {%     endif %}
       {%   endif %}
       {% endfor %}
 
diff --git a/roles/network/tasks/OpenBSD.yml b/roles/network/tasks/OpenBSD.yml
index 983ba92..6483f44 100644
--- a/roles/network/tasks/OpenBSD.yml
+++ b/roles/network/tasks/OpenBSD.yml
@@ -7,7 +7,7 @@
     mode: 0600
     owner: root
     group: "{{ ansible_wheel }}"
-  with_items: "{{ network_ether_interfaces }}"
+  with_items: "{{ network_interfaces }}"
   notify: restart network
 
 - block: