diff --git a/site.conf b/site.conf
index 26c2e35..5a9147f 100644
--- a/site.conf
+++ b/site.conf
@@ -6,48 +6,42 @@
     prefix4 = '10.188.0.0/16',
     prefix6 = 'fda0:747e:ab29:7405::/64',
     timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
+    authorized_keys = { 
+                        'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCVxoI2GdqqnK0eKsx5xXiYca19toxB+s9lHb9u9gdmJ52tsl75XZVT2R44o5Yu8KciSPx+khzj7vL3RWieVTrPGhlbYQnOuK73x420rGejjAyDFPQWQxw98Bx0a7VHBsSUpndcnlLBMPe6bIOLI8j7c/sV26rEOAF7LshuONq4E5SMUTL4bp2dhfBgC8SjGdevBpwR1rCBIt51jhvS/asBIUZNrabG3NPwNoaRLELUbFZm7vLF777GWuBzM0G41iImb8nuC1q9WSt66ShhSxLthvl1wdyvixgCgY5yM3eOVJHheMWR6mwE2ZdAeLAFjfXKBqoH5My7a4K96wyUMptD nodeadmin@update1',
+                        'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDb1l5B82IeYYmapacMPR1KQV7r24Qc7K9v33Wtfyi3GuF6sz/Z014ZvtI6TwodvjWH5yx0yh+zY8BQzgb29zQm6vCjnAzDX2QdJJtAruNcl3Ib8rnp4dIRtSRwxwTP/QSltuSokMMoCoKI3Zl0i4MvlCCezjSVWzmfeTr8OA9pDz1eJ9hZn87IaBghVIOIpZYvoxhE7GAbctqA+Jx3XUoWyY4LJpgMA4Y2q9YjQ9bWNyQb5FuwCp4akapwDFEvbTDY0DyAHKmm7txv+5q5RkxfFq3K/DtcILbm0wtAsqM7VZu2TYOj+KiEHJmJMAq+yYNEWzMTsnr7mjqz8I5uOA0V jan@gefion',
+                        'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQChIgl4pLbIHIk1XqFvtgkJKjBBKa1Ad1E6XpL8w1fkh1sDOfSR3rtbIk8KJGpTHACzOypbguPlhva/Y6hvgSYCjkamEichTMC2iIjwyY0ONiCinPz1WRjSoX4yiO0mfokxXZGJnRFXd5dV1UY6lGt1fWcxa6tXu+X35d6XvYCQCjKKNBoCQMDRfySNFc8wB2vwb4TiwLYsXYr2QPXQkuovKJzvZwElqpkEjyBLFUYZ8OvKljCcopLWHCw4vgTuBISaOUBYQ76/UfUm2IUo+xE30+vlH0+XV1YzOPx3AF1uoeuMGt1bcadTh9+jdq2KA9VcDSk+qAnTGm7gMfXPT0B6ue7ZrsuxfhKBuNW4SwJsyFqUIk1T9ZBdpFRQdGcFBeXbNWpaoEeaEgiO7eJt0ONnM+L5/ONtC5VQCspwQxL6PHWSBvuFwUf+JRjDIxOOmDaHO/RX+YynSaBeE7G2BMEZq4puCAmobWE2nnvHYGRcmyOCnhYHEtdhCNGZiIRYiTjC06Srg2XIvnKV3MOrQEMhqs+fvNIAtfci1N1CQAhOwaU0NGeS/9TgiT9rwZIJZtcBcfEcZAb9vJfnELletivuguXYTder+XjM+XAuRQ6FTvYKmSmJ8BmuBrFpTpdjNebaxiLceCOd7n/tj0blzsQRpm14NSdp1TqzqhFxILkGlw== marconi@loki',
+                        'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUlPYUqsisJoBT5iDOc7OQXadZyFgI2Z+n+ARPg7OLgkw4SCORAOd53x6KYQZFhq9LP6Dv+kNkk3Qvd/uIr8avG3nxRcHWSIU9ICUmGzEp+W7dT1ExzhVkFxQG7f219ifjRO95xeQNI45MdVKBytQoQGNMoNLXTOZfW5mYr5yQWePa2OmdJLPWrAoHpS2PgrcqWzqdSBuKLdPQgr8KKHGvn9Wf/t9/6/foYfBlzf+emfxZY0M7vJUcCkpK+m66ECE2/eu9aE3m4oBOImivy9/yCta2BASJKCycYoTijRlihcllT3zSt2AGlK7OKpZRDlvFOPuL4yw1LsreBRkkdcAZ reka',
+                        'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAgEAos0JvQsyAsP3FcsqDCBTDqzUGBeoxMKDj/SSRoy5MBDPUaWm37b93Lqmg1wMj0qvUURBKpWsRiRUzzRAaQrIdhcZjo0Gkw4vv7tpFQCmvWqxUpzH00GDKjLrMvNfcv+5b0Ctl06Bo+e4nb2SVsFhjaP9MLIjHiKpgivIPx9aKwxKx/VjsW920eWOG+VaDKIJTxPGUYedaUgIktvhutAbOyRR/OJlIZ3Qs0cnyT4KTM4pe4br2p3+mNs6J7G+z8Lw99WiUBfUwsRLVO68nJA2PKlJNEUGJycngqV06iQpcDfei88DFRMetN9bhVYxWFIzCQfjjqs8dkomEhfFQwfOTYiOouhaycZABwU4pPmQwZIkp1q4KduodU/KYsf78WitYgavHVInWBQuAUljafwQpTLHy8AI6M3XmbKi5rvNZiy4hoxfaT7rYJGuBoTwsZEHI7Sf26XsyQKJdu29mmIYPpzPKP7VAyjAVLqruLX1Yy0oZuM22YFFj5MHuoEN3WdXOYymvZyOM05xXeQk6gVh3EE6MpbK8CFz1KPNEjd+vce1zUyACDvqdt6ZIjqmUdivBsvHDTqMgH9mSxjjjwLy+Sd7snXx0bqksTdPChAlXN9vs3ez8FJl0P4inzjza8l8zGqaa2A1CsO8dRcyojohczLYoTHWQTB3tVIdcj55UIE= roman',
+                        'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDM0d9uUUdkK80fYEAz+IwxbhQO2qsr87Q4uxxwqQCvjVWryL+IuKMBJJGroWDMz2d9UJcIXEYdMz4436U0DoPJuoXe5iDsVvum3Vz3276My+tqx1bZWCktPa8Isft7mO/wfELNjRNQduUiwh2y712s7/3GQI+5Rs/65HuLHTnpLKrlfptqmsmYw+IUFDzGwBLJ6sqP90ywjKkperPCAH3IWcTsQwnW3EJFPToMg6BrQslZlxx/z+co3e6jCWzUuuIRP9jp4SmNVfYaVGb1cOFdL1p1P0qWHBHdGUnXHZ+c773VKVSj+spUBxKGqNC1EhRCYTsPDLVrYrhKl2BRLcgB stefan@Stefan-Linux',
+                        'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDi7B1k6TgOHl9twS0MMV4UXhOezFLlE2Zg3W3CrdTm4MnN1i6PqKAlfk++ZH6ZiS5fXNHeOi++P54S88y4V/mFdFPtz85fSUMJ4OSzpq6CBaivFZ1tdVKWSspbRA1UMS8U8GqeQmGqCobA5RP9xOIx2HDRcvGSALAp/w65j1EWv1O9KvgAKv2EtSXz3J8mpyCEUWVKM2F8xWkdZfLGMiKW08l7MaHheICjKOwbZd/WAV5KNzcUCVuHYy5N+W/FlYV8YrVflWTq+jGrW64YmBWCCj79OwO67r7a0MBYsww9Ddo4N5ytf9K3VMNietBN7IVQ0+14IB67sTo3TnTV5v9xi9bx4lU8YLd0BhLHTBQvaZqBIwD8/DHBEynBCvGjuqt0diBLaQPCOUrGiOM+8wJU8HDDEtpo2nE5RSwTKlgTaeA3HgCUGRiIwCUBEuCxq7nvqfnmqJw8j4t7aIwXbcXCFRzwfHqXW/++tnSkh2EWfseZRndc5m0uqbFaFkKkPf2OHRW5dIpuOvZtpoDg2B03PGSMKna2Li6Ofq/2fwFjpy0NtEo4ubi7/Y/ZOkZHcmy+vipWWUox/xE9j5zRQG1wIixcDwrmmV5ztG1AUHIr4m/JmWKg661/aqCHHppBTkCXW2D6fLMX2S8Z39X88uocN6aFk0B4km1XMocq0+evUQ== stefan@MacBook'
+                    },
     ntp_servers = {
         '0.de.pool.ntp.org',
         '1.de.pool.ntp.org',
     },
     regdom = 'DE',
     wifi24 = {
-    	channel = 5,
-    	htmode = 'HT40-',
-    	ap = {
-    		ssid = 'Freifunk',
-    	},
-    	mesh = {
-    		id = 'troisdorf-ff-mesh',
-    		mcast_rate = 12000,
-    	},
-    	ibbs = {
-    		ssid = 'troisdorf-ff-mesh',
-    		bssid = '02:74:05:d0:4f:00',
-    		mcast_rate = 12000,
-    	},
+        ssid = 'Freifunk',
+        channel = 11,
+        htmode = 'HT20',
+        mesh_ssid = 'event-freifunk-mesh',
+        mesh_bssid = '02:74:05:d0:4f:00',
+        mesh_mcast_rate = 12000,
     },
     wifi5 = {
-    	channel = 44,
-    	htmode = 'HT40+',
-    	ap = {
-    		ssid = 'Freifunk',
-    	},
-    	mesh = {
-    		id = 'troisdorf-ff-mesh',
-    		mcast_rate = 12000,
-    	},
-    	ibbs = {
-    		ssid = 'troisdorf-ff-mesh',
-    		bssid = '02:74:05:d0:4f:00',
-    		mcast_rate = 12000,
-    	},
+        ssid = 'Freifunk',
+        channel = 44,
+        htmode = 'HT40+',
+        mesh_ssid = 'event-freifunk-mesh',
+        mesh_bssid = '02:74:05:d0:4f:00',
+        mesh_mcast_rate = 12000,
     },
     next_node = {
         ip4 = '10.188.0.1',
         ip6 = 'fda0:747e:ab29:7405::1',
         mac = '04:74:05:d0:4f:aa',
     },
+    mesh_on_wan = true,
     fastd_mesh_vpn = {
         methods = {
             'salsa2012+umac',
@@ -103,7 +97,7 @@
                 }
             },
     },
-    autoupdater = {
+        autoupdater = {
         enabled = true,
         branch = 'stable',
         branches = {
@@ -159,6 +153,23 @@
                     'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0'   -- Marconi
                 },
             },
+            event = {
+                name = 'event',
+                mirrors = {
+                    'http://update1.infra.fftdf/event/sysupgrade',
+                    'http://update2.infra.fftdf/event/sysupgrade',
+                    'http://update3.infra.fftdf/event/sysupgrade'
+                },
+                probability = 1.00,
+                good_signatures = 1,
+                pubkeys = {
+                    '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
+                    '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
+                    '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
+                    '043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14',  -- Thorsten
+                    'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0'   -- Marconi
+                },
+            },
         },
     },
     roles = {
@@ -170,6 +181,9 @@
             'service',
         },
     },
+   setup_mode = {
+        skip = true,
+    },
     simple_tc = {
         mesh_vpn = {
             ifname = 'mesh-vpn',