diff --git a/locations/l5.yml b/locations/l5.yml
index 629ac991f..6696305db 100644
--- a/locations/l5.yml
+++ b/locations/l5.yml
@@ -19,6 +19,10 @@ hosts:
     role: corerouter
     model: "avm_fritzbox-4040"
     wireless_profile: freifunk_default
+    host__packages__to_merge:
+      - -tunnelmanager
+      - tunspace
+      - wireguard-tools
 
   - hostname: l5-nf-o
     role: ap
@@ -62,15 +66,20 @@ networks:
 
   - vid: 50
     role: uplink
-    name: wireguard
-    tunnel_wan_ip: 192.168.0.2/24
-    tunnel_wan_gw: 192.168.0.1
-    tunnel_connections: 1
-    tunnel_timeout: 600
-    tunnel_mtu: 1400
-    tunnel_mesh_prefix_ipv4: 10.31.191.160/29
     untagged: true
 
+  - role: tunnel
+    ifname: ts_wg0
+    mtu: 1280
+    prefix: 10.31.191.160/32
+    wireguard_port: 51820
+
+  - role: tunnel
+    ifname: ts_wg1
+    mtu: 1280
+    prefix: 10.31.191.161/32
+    wireguard_port: 51821
+
 location__channel_assignments_11a_standard__to_merge:
   l5-core: 36-20
   l5-nf-o: 40-20