diff --git a/Makefile b/Makefile
index 1697dbd..2d63f37 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 := v2019.1.2
+GLUON_GIT_REF := v2020.1.2
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf
index 92e0196..c93410b 100644
--- a/domains/ffrgb_cty.conf
+++ b/domains/ffrgb_cty.conf
@@ -14,11 +14,6 @@
     ap = {
       ssid = 'regensburg.freifunk.net',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_cty',
-      bssid = '02:0E:8E:1E:61:01',
-      mcast_rate = 12000,
-    },
     mesh = {
       id = 'loo23eWueg11s',
     },
@@ -30,11 +25,6 @@
     ap = {
       ssid = 'regensburg.freifunk.net',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_cty',
-      bssid = '02:0E:8E:1E:61:01',
-      mcast_rate = 12000,
-    },
     mesh = {
       id = 'loo23eWueg11s',
     },
diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf
index 0a8fcfd..09de27a 100644
--- a/domains/ffrgb_tst.conf
+++ b/domains/ffrgb_tst.conf
@@ -15,11 +15,6 @@
     ap = {
       ssid = 'test.ffrgb.net',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_test',
-      bssid = '02:0E:8E:1E:61:03',
-      mcast_rate = 12000,
-    },
     mesh = {
       id = 'mesh_ffrgb_tst_11s',
     },
@@ -31,11 +26,6 @@
     ap = {
       ssid = 'test.freifunk.net',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_test',
-      bssid = '02:0E:8E:1E:61:03',
-      mcast_rate = 12000,
-    },
     mesh = {
       id = 'mesh_ffrgb_tst_11s',
     },
diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf
index f9aa3c8..86a8685 100644
--- a/domains/ffrgb_uml.conf
+++ b/domains/ffrgb_uml.conf
@@ -14,11 +14,6 @@
     ap = {
       ssid = 'land.regensburg.freifunk.net',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_uml',
-      bssid = '02:0E:8E:1E:61:02',
-      mcast_rate = 12000,
-    },
     mesh = {
       id = 'Ishei42esh11s',
     },
@@ -30,11 +25,6 @@
     ap = {
       ssid = 'regensburg.freifunk.net',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_uml',
-      bssid = '02:0E:8E:1E:61:02',
-      mcast_rate = 12000,
-    },
     mesh = {
       id = 'Ishei42esh11s',
     },
diff --git a/site.mk b/site.mk
index d12da09..2fea469 100644
--- a/site.mk
+++ b/site.mk
@@ -215,5 +215,5 @@ GLUON_PRIORITY ?= 0
 
 # Languages to include
 GLUON_LANGS ?= en de
-GLUON_WLAN_MESH := ibss
+GLUON_WLAN_MESH := 11s
 GLUON_MULTIDOMAIN=1