diff --git a/modules b/modules
index eb8b474..086e7f3 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,4 @@
 GLUON_SITE_FEEDS='helgo_packages'
 
-PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunk-helgoland/helgo-packages.git
-PACKAGES_FFHH_PACKAGES_COMMIT=241a9ba370c086ab27b030d6f4a7bda886859d2c
+PACKAGES_HELGO_PACKAGES_REPO=git://github.com/freifunk-helgoland/helgo-packages.git
+PACKAGES_HELGO_PACKAGES_COMMIT=241a9ba370c086ab27b030d6f4a7bda886859d2c
diff --git a/site.conf b/site.conf
index a3020c6..a931f4a 100644
--- a/site.conf
+++ b/site.conf
@@ -57,14 +57,14 @@
 			backbone = {
 				limit = 1,
 				peers = {
-					gateway01 = {
-						key = '2fa171346f800313145064d5e760af52069a3f3c6d1805c0393c747843b0eb8e',
-						remotes = {'"gw01.helgoland.freifunk.net" port 10100'},
-					},
-					gateway02 = {
+					gw02 = {
 						key = '49fed2d52d01e35be758158bdbaa6ca52365c9c847da050cb5f3c67fe32a9d7c',
 						remotes = {'"gw02.helgoland.freifunk.net" port 10000'},
 					},
+					gw03 = {
+						key = '73986bd367e8f276c08126e6595448c9b1976dfc61151ae9a399677cca11ac25',
+						remotes = {'"gw03.helgoland.freifunk.net" port 10000'},
+					},
 				},
 			},
 		},
diff --git a/site.mk b/site.mk
index 3a31a3e..ab4518c 100644
--- a/site.mk
+++ b/site.mk
@@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged
 
-DEFAULT_GLUON_RELEASE := 0.9
+DEFAULT_GLUON_RELEASE := 0.9.1
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)