diff --git a/Makefile b/Makefile
index c78541b..17ea1be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
-GLUON_GIT_REF := v2020.1.3
+GLUON_GIT_REF := v2020.2.1
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf
index c93410b..0440530 100644
--- a/domains/ffrgb_cty.conf
+++ b/domains/ffrgb_cty.conf
@@ -4,7 +4,7 @@
 
   prefix4 = '10.90.32.0/19',
   prefix6 = 'fdef:f10f:1337:cafe::/64',
-  extra_prefixes6 = {'2a00:9d80:6000:0101::/64'},
+  extra_prefixes6 = {'2a00:9d80:6000:0101::/64', '2001:678:ddc:11::/64', '2001:678:e64:12::/64'},
 
   ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
 
diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf
index 68a251c..b2d1d1c 100644
--- a/domains/ffrgb_tst.conf
+++ b/domains/ffrgb_tst.conf
@@ -5,7 +5,7 @@
 
   prefix4 = '10.90.96.0/19',
   prefix6 = 'fdef:f30f:1337:cafe::/64',
-  extra_prefixes6 = {'2a00:9d80:6000:0103::/64', '2001:678:ddc:31::/64'},
+  extra_prefixes6 = {'2a00:9d80:6000:0103::/64', '2001:678:ddc:31::/64', '2001:678:e64:32::/64'},
 
   ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
 
diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf
index bafbf3a..638a793 100644
--- a/domains/ffrgb_uml.conf
+++ b/domains/ffrgb_uml.conf
@@ -4,7 +4,7 @@
 
   prefix4 = '10.90.64.0/19',
   prefix6 = 'fdef:f20f:1337:cafe::/64',
-  extra_prefixes6 = {'2a00:9d80:6000:0102::/64'},
+  extra_prefixes6 = {'2a00:9d80:6000:0102::/64', '2001:678:ddc:21::/64', '2001:678:e64:22::/64'},
 
   ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},