diff --git a/site.conf b/site.conf
index 57384f6..e67d15f 100644
--- a/site.conf
+++ b/site.conf
@@ -1,10 +1,10 @@
 {
     hostname_prefix = 'tdf',
     site_name = 'Freifunk Troisdorf',
-    site_code = 'tdf',
+    site_code = 'tdf-',
     opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
-    prefix4 = '10.188.0.0/16',
-    prefix6 = '2a03:2260:121::/64',
+    prefix4 = '10.188.0.0/19',
+    prefix6 = '2a03:2260:121:0001::/64',
     timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
     ntp_servers = {
         'ntp1.infra.fftdf',
@@ -18,9 +18,9 @@
         ap = {
             ssid = 'Freifunk',
         },
-        mesh = {		
-            id = 'troisdorf-ff-mesh',		
-            mcast_rate = 12000,		
+        mesh = {        
+            id = 'troisdorf-tdf-mesh',      
+            mcast_rate = 12000,     
         },        
     },
     wifi5 = {
@@ -28,20 +28,20 @@
         ap = {
             ssid = 'Freifunk',
         },
-        mesh = {		
-            id = 'troisdorf-ff-mesh',		
-            mcast_rate = 12000,		
+        mesh = {        
+            id = 'troisdorf-tdf-mesh',      
+            mcast_rate = 12000,     
         },
     },
     next_node = {
         ip4 = '10.188.0.1',
-        ip6 = '2a03:2260:121::1',
+        ip6 = '2a03:2260:121:0001::1',
         mac = '04:74:05:d0:4f:aa',
     },
     mesh = {
-    	batman_adv = {
-      		gw_sel_class = 3,
-		},
+        batman_adv = {
+            gw_sel_class = 3,
+        },
     },
     autoupdater = {
         enabled = true,
@@ -50,9 +50,9 @@
             stable = {
                 name = 'stable',
                 mirrors = {
-                    'http://update1.infra.fftdf/stable/sysupgrade',
-                    'http://update2.infra.fftdf/stable/sysupgrade',
-                    'http://update3.infra.fftdf/stable/sysupgrade'
+                    'http://update1.infra.fftdf/tdf/stable/sysupgrade',
+                    'http://update2.infra.fftdf/tdf/stable/sysupgrade',
+                    'http://update3.infra.fftdf/tdf/stable/sysupgrade'
                 },
                 probability = 1.00,
                 good_signatures = 2,
@@ -72,9 +72,9 @@
             beta = {
                 name = 'beta',
                 mirrors = {
-                    'http://update1.infra.fftdf/beta/sysupgrade',
-                    'http://update2.infra.fftdf/beta/sysupgrade',
-                    'http://update3.infra.fftdf/beta/sysupgrade'
+                    'http://update1.infra.fftdf/tdf/beta/sysupgrade',
+                    'http://update2.infra.fftdf/tdf/beta/sysupgrade',
+                    'http://update3.infra.fftdf/tdf/beta/sysupgrade'
                 },
                 probability = 1.00,
                 good_signatures = 1,
@@ -93,9 +93,9 @@
             experimental = {
                 name = 'experimental',
                 mirrors = {
-                    'http://update1.infra.fftdf/experimental/sysupgrade',
-                    'http://update2.infra.fftdf/experimental/sysupgrade',
-                    'http://update3.infra.fftdf/experimental/sysupgrade'
+                    'http://update1.infra.fftdf/tdf/experimental/sysupgrade',
+                    'http://update2.infra.fftdf/tdf/experimental/sysupgrade',
+                    'http://update3.infra.fftdf/tdf/experimental/sysupgrade'
                 },
                 probability = 1.00,
                 good_signatures = 1,
@@ -111,25 +111,14 @@
                     'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2'      -- Michael
                 },
             },
-            daily = {
-                name = 'daily',
-                mirrors = {
-                    'http://update1.infra.fftdf/daily/sysupgrade'
-                },
-                probability = 1.00,
-                good_signatures = 1,
-                pubkeys = {
-                    '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
-                },
-            },
         },
     },
     tunneldigger_mesh_vpn = {
         mtu = 1312,
         brokers = {
-        	'tunneldigger1.freifunk-troisdorf.de:53842',
-        	'tunneldigger2.freifunk-troisdorf.de:53842'
-        	},
+            'tdf1.freifunk-troisdorf.de:53842',
+            'tdf2.freifunk-troisdorf.de:53840'
+            },
     },
     roles = {
         default = 'node',