diff --git a/site.conf b/site.conf
index d9a8790fa72c0a306bc1d46e9cddaef1d41d3be3..c0470fffc12843338e3938ffc0f1b7cda165c83f 100644
--- a/site.conf
+++ b/site.conf
@@ -40,51 +40,53 @@
                 methods = {'salsa2012+umac'},
                 mtu = 1406,
                 enabled = true,
-                backbone = {
-                        limit = 2,
-                        peers = {
-                                gw01 = {
-                                        key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
-                                        remotes = {'"gw01.freifunk-stuttgart.de" port 10037'},
-                                },
-                                gw02 = {
-                                        key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a',
-                                        remotes = {'"gw02.freifunk-stuttgart.de" port 10037'},
-                                },
-                                gw03 = {
-                                        key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
-                                        remotes = {'"gw03.freifunk-stuttgart.de" port 10037'},
-                                },
-                                gw04 = {
-                                        key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
-                                        remotes = {'"gw04.freifunk-stuttgart.de" port 10037'},
-                                },
-                                gw05 = {
-                                        key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
-                                        remotes = {'"gw05.freifunk-stuttgart.de" port 10037'},
-                                },
-                                gw06 = {
-                                        key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
-                                        remotes = {'"gw06.freifunk-stuttgart.de" port 10037'},
-                                },
-                                gw07 = {
-                                        key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
-                                        remotes = {'"gw07.freifunk-stuttgart.de" port 10037'},
-                                },
-                                gw08 = {
-                                        key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
-                                        remotes = {'"gw08.freifunk-stuttgart.de" port 10037'},
-                                },
-                                gw09 = {
-                                        key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
-                                        remotes = {'"gw09.freifunk-stuttgart.de" port 10037'},
-                                },
-                                gw10 = {
-                                        key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
-                                        remotes = {'"gw10.freifunk-stuttgart.de" port 10037'},
-                                },
-                        },
-                },
+                groups = {
+			backbone = {
+				limit = 2,
+				peers = {
+					gw01 = {
+						key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
+						remotes = {'"gw01.freifunk-stuttgart.de" port 10037'},
+					},
+					gw02 = {
+						key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a',
+						remotes = {'"gw02.freifunk-stuttgart.de" port 10037'},
+					},
+					gw03 = {
+						key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
+						remotes = {'"gw03.freifunk-stuttgart.de" port 10037'},
+					},
+					gw04 = {
+						key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
+						remotes = {'"gw04.freifunk-stuttgart.de" port 10037'},
+					},
+					gw05 = {
+						key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
+						remotes = {'"gw05.freifunk-stuttgart.de" port 10037'},
+					},
+					gw06 = {
+						key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
+						remotes = {'"gw06.freifunk-stuttgart.de" port 10037'},
+					},
+					gw07 = {
+						key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
+						remotes = {'"gw07.freifunk-stuttgart.de" port 10037'},
+					},
+					gw08 = {
+						key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
+						remotes = {'"gw08.freifunk-stuttgart.de" port 10037'},
+					},
+					gw09 = {
+						key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
+						remotes = {'"gw09.freifunk-stuttgart.de" port 10037'},
+					},
+					gw10 = {
+						key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
+						remotes = {'"gw10.freifunk-stuttgart.de" port 10037'},
+					},
+				},
+			},
+		},
         },
 
         autoupdater = {