diff --git a/site.conf b/site.conf
index 4c4fa2f..190fbe0 100644
--- a/site.conf
+++ b/site.conf
@@ -41,70 +41,72 @@
   fastd_mesh_vpn = {
     methods = {'salsa2012+umac'},
     mtu = 1426,
-    backbone = {
+    groups = {
+      backbone = {
       limit = 2,
-      peers = {
-        gw02 = {   --[[ mephisto ]]
-          key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0',
-          remotes = {
-            'ipv4 "gw02.ffmuc.net" port 10000',
-            'ipv4 "gw02.freifunk-muenchen.de" port 10000',
+        peers = {
+          gw02 = {   --[[ mephisto ]]
+            key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0',
+            remotes = {
+              'ipv4 "gw02.ffmuc.net" port 10000',
+              'ipv4 "gw02.freifunk-muenchen.de" port 10000',
+            },
           },
-        },
-        gw03 = {   --[[ fpletz ]]
-          key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-          remotes = {
-            'ipv4 "gw03.ffmuc.net" port 10000',
-            'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+          gw03 = {   --[[ fpletz ]]
+            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
+            remotes = {
+              'ipv4 "gw03.ffmuc.net" port 10000',
+              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+            },
           },
-        },
-        gw04 = {
-          key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-          remotes = {
-            'ipv4 "gw04.ffmuc.net" port 10000',
-            'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+          gw04 = {
+            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
+            remotes = {
+              'ipv4 "gw04.ffmuc.net" port 10000',
+              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+            },
           },
-        },
-        gw05 = {
-          key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-          remotes = {
-            'ipv4 "gw05.ffmuc.net" port 10000',
-            'ipv4 "gw05.freifunk-muenchen.de" port 10000',
+          gw05 = {
+            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
+            remotes = {
+              'ipv4 "gw05.ffmuc.net" port 10000',
+              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
+            },
           },
-        },
-        gw06 = {
-          key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
-          remotes = {
-            'ipv4 "gw06.ffmuc.net" port 10000',
-            'ipv4 "gw06.freifunk-muenchen.de" port 10000',
+          gw06 = {
+            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
+            remotes = {
+              'ipv4 "gw06.ffmuc.net" port 10000',
+              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
+            },
           },
-        },
-        gw07 = {
-          key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
-          remotes = {
-            'ipv4 "gw07.ffmuc.net" port 10000',
-            'ipv4 "gw07.freifunk-muenchen.de" port 10000',
+          gw07 = {
+            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
+            remotes = {
+              'ipv4 "gw07.ffmuc.net" port 10000',
+              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
+            },
           },
-        },
-        gw08 = {
-          key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
-          remotes = {
-            'ipv4 "gw08.ffmuc.net" port 10000',
-            'ipv4 "gw08.freifunk-muenchen.de" port 10000',
+          gw08 = {
+            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
+            remotes = {
+              'ipv4 "gw08.ffmuc.net" port 10000',
+              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
+            },
           },
-        },
-        gw09 = {
-          key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
-          remotes = {
-            'ipv4 "gw09.ffmuc.net" port 10000',
-            'ipv4 "gw09.freifunk-muenchen.de" port 10000',
+          gw09 = {
+            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
+            remotes = {
+              'ipv4 "gw09.ffmuc.net" port 10000',
+              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
+            },
           },
-        },
-        gw10 = {
-          key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
-          remotes = {
-            'ipv4 "gw10.ffmuc.net" port 10000',
-            'ipv4 "gw10.freifunk-muenchen.de" port 10000',
+          gw10 = {
+            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
+            remotes = {
+              'ipv4 "gw10.ffmuc.net" port 10000',
+              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
+            },
           },
         },
       },