diff --git a/site.conf b/site.conf
index eb276c080517c1cf88239b8af9bb91a6e71dd844..7e91cc655826538f8083d0ea6e4a2f507b229db9 100644
--- a/site.conf
+++ b/site.conf
@@ -4,7 +4,6 @@
 	site_code = 'ffnw',
 
 	opkg = {
-		openwrt = 'http://mirror.ffnw.de/openwrt/%n/%v/%S/packages',
 		extra = {
 			modules = 'http://mirror.ffnw.de/modules/gluon-%GS-%GR/%S',
 		},
@@ -12,13 +11,9 @@
 
 	prefix6 = 'fd74:fdaa:9dc4::/64',
 
-	mesh_on_wan = false,
-
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 
-	ntp_servers = {
-		'ntp.ffnw',
-	},
+	ntp_servers = {'ntp.ffnw'},
 
 	regdom = 'DE',
 
@@ -30,7 +25,6 @@
 		ap = {
 			ssid = 'testing.nordwest.freifunk.net',
 		},
-
 		ibss = {
 			ssid = 'testing.mesh.ffnw',
 			bssid = '02:CA:FF:EE:BA:BE',
@@ -69,28 +63,35 @@
 		},
 	},
 
-	fastd_mesh_vpn = {
-		methods = { 'salsa2012+umac' },
+	mesh_vpn = {
 		enabled = true,
-		configurable = true,
 		mtu = 1312,
-		groups = {
-			backbone = {
-				limit = 1,
-				peers = {
-					default06 = {
-						key ='22e270ff9b2d1017c3a0b00dd22a58ef7e5915a355eeb16f0b8b52d7eb377869',
-						remotes = {'"default06.ffnw.de" port 11111'},
+		fastd = {
+			methods = { 'salsa2012+umac' },
+			configurable = true,
+			groups = {
+				backbone = {
+					limit = 1,
+					peers = {
+						default06 = {
+							key ='22e270ff9b2d1017c3a0b00dd22a58ef7e5915a355eeb16f0b8b52d7eb377869',
+							remotes = {'"default06.ffnw.de" port 11111'},
+						},
 					},
 				},
 			},
 		},
+--		tunneldigger = {
+--			brokers = {'vpn1.alpha-centauri.freifunk.net'}
+--		},
 		bandwidth_limit = {
 			enabled = false,
 			egress = 1200,
 			ingress = 12000,
 		},
 	},
+	mesh_on_wan = false,
+	mesh_on_lan = false,
 
 	autoupdater = {
 		enabled = 1,