diff --git a/site.conf b/site.conf
index f61c021..8873320 100644
--- a/site.conf
+++ b/site.conf
@@ -2,7 +2,6 @@
 	hostname_prefix = 'ffhb',
 	site_name = 'Freifunk Bremen',
 	site_code = 'ffhb',
-	release = '0.3.101-nightly' . nightly,
 
 	prefix4 = '10.196.0.0/20',
 	prefix6 = 'fd2f:5119:0f2c::/64',
diff --git a/site.mk b/site.mk
index a41f78e..a751c30 100644
--- a/site.mk
+++ b/site.mk
@@ -14,3 +14,8 @@ GLUON_SITE_PACKAGES := \
 	kmod-ipt-nathelper \
 	firewall \
 	haveged
+
+DEFAULT_GLUON_RELEASE := 0.3.101-nightly$(shell date '+%Y%m%d'),
+
+# Allow overriding the release number from the command line
+GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)