diff --git a/locations/k12-h2.yml b/locations/k12-h2.yml
index 1c4de2ed..5c848583 100644
--- a/locations/k12-h2.yml
+++ b/locations/k12-h2.yml
@@ -59,7 +59,7 @@ networks:
   - vid: 20
     role: mesh
     name: mesh_core_5g
-    prefix: 10.31.158.1129/32
+    prefix: 10.31.158.129/32
     ipv6_subprefix: -20
     mesh_ap: k12-h2-core
     mesh_radio: 11a_standard
@@ -115,7 +115,7 @@ networks:
   - vid: 30
     role: mesh
     name: mesh_lan
-    prefix: 10.31.226.134/32
+    prefix: 10.31.158.134/32
     ipv6_subprefix: -30
     # adjust mesh_metric to prefer this route
     mesh_metric: 128
@@ -155,12 +155,18 @@ networks:
     mtu: 1280
     prefix: 10.31.158.224/32
     wireguard_port: 51820
+    # Make sure tunnel is only last resort backup
+    mesh_metric: 2304
+    mesh_metric_lqm: ['default 0.6']
 
   - role: tunnel
     ifname: ts_wg1
     mtu: 1280
     prefix: 10.31.158.225/32
     wireguard_port: 51821
+    # Make sure tunnel is only last resort backup
+    mesh_metric: 2304
+    mesh_metric_lqm: ['default 0.6']
 
 # AP-id, wifi-channel, bandwidth, txpower
 location__channel_assignments_11a_standard__to_merge:
@@ -186,3 +192,13 @@ dns_servers:
   - 1.0.0.1
   - 2606:4700:4700::1111
   - 2606:4700:4700::1001
+
+# Switch Ports
+# 1: uplink
+# 2: AP
+# 3:
+# 4: CORE
+# 5: AP
+# 6: AP
+# 7: k12-h1-core, VLAN 30
+# 8: segen