diff --git a/roles/net-ifaces/files/vmhost0.pyrocufflink.blue.sh b/roles/net-ifaces/files/vmhost0.pyrocufflink.blue.sh
index 51b3849..eceea7b 100644
--- a/roles/net-ifaces/files/vmhost0.pyrocufflink.blue.sh
+++ b/roles/net-ifaces/files/vmhost0.pyrocufflink.blue.sh
@@ -26,22 +26,38 @@ make_bond() {
 }
 
 
+make_bridge() {
+    local bridge=$1
+    local phy=$2
+
+    ip link add ${bridge} type bridge
+    ip link set ${phy} master ${bridge}
+    ip link set ${bridge} up
+}
+
+
+make_vlan() {
+    local id=$1
+    local phy=$2
+
+    ip link add link ${phy} name vlan${id} type vlan id ${id}
+}
+
 # VM Network
 make_bond bond0
 add_slave bond0 enp10s0f0
 add_slave bond0 enp10s0f1
 
-ip link add link bond0 name vlan30 type vlan id 30
-ip link add link bond0 name vlan101 type vlan id 101
+make_vlan 10 bond0   # Management
+make_vlan 30 bond0   # pyrocufflink.blue
+make_vlan 99 bond0   # Home Assistant
+make_vlan 101 bond0  # pyrocufflink.red
 ip link set bond0 up
 
-ip link add br0 type bridge
-ip link set vlan30 master br0
-ip link set br0 up
-
-ip link add br1 type bridge
-ip link set vlan101 master br1
-ip link set br1 up
+make_bridge br0 vlan30
+make_bridge br1 vlan101
+make_bridge mgmt vlan10
+make_bridge hass vlan99
 
 
 # Storage Network
diff --git a/roles/net-ifaces/files/vmhost1.pyrocufflink.blue.sh b/roles/net-ifaces/files/vmhost1.pyrocufflink.blue.sh
index 51b3849..eceea7b 100644
--- a/roles/net-ifaces/files/vmhost1.pyrocufflink.blue.sh
+++ b/roles/net-ifaces/files/vmhost1.pyrocufflink.blue.sh
@@ -26,22 +26,38 @@ make_bond() {
 }
 
 
+make_bridge() {
+    local bridge=$1
+    local phy=$2
+
+    ip link add ${bridge} type bridge
+    ip link set ${phy} master ${bridge}
+    ip link set ${bridge} up
+}
+
+
+make_vlan() {
+    local id=$1
+    local phy=$2
+
+    ip link add link ${phy} name vlan${id} type vlan id ${id}
+}
+
 # VM Network
 make_bond bond0
 add_slave bond0 enp10s0f0
 add_slave bond0 enp10s0f1
 
-ip link add link bond0 name vlan30 type vlan id 30
-ip link add link bond0 name vlan101 type vlan id 101
+make_vlan 10 bond0   # Management
+make_vlan 30 bond0   # pyrocufflink.blue
+make_vlan 99 bond0   # Home Assistant
+make_vlan 101 bond0  # pyrocufflink.red
 ip link set bond0 up
 
-ip link add br0 type bridge
-ip link set vlan30 master br0
-ip link set br0 up
-
-ip link add br1 type bridge
-ip link set vlan101 master br1
-ip link set br1 up
+make_bridge br0 vlan30
+make_bridge br1 vlan101
+make_bridge mgmt vlan10
+make_bridge hass vlan99
 
 
 # Storage Network