diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..d8c3734
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,6 @@
+before_script:
+  - sudo apt-get update -qq && sudo apt-get install -y -qq build-essential gawk unzip libncurses-dev libz-dev libssl-dev wget git subversion python-pip python3-pip
+
+fullbuild:
+  script:
+    - make V=s FORCE_UNSAFE_CONFIGURE=1 GLUON_BRANCH=experimental GLUON_RELEASE=v2018.2.1 GLUON_GIT_REF=7d386a66f36c947f1c0770f64ab71f22cac1b21a
diff --git a/Makefile b/Makefile
index bde1dd1..14d2989 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,31 @@
-GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
-GLUON_GIT_REF := v2018.1
+GLUON_BUILD_DIR ?= gluon-build
+GLUON_GIT_URL ?= https://github.com/freifunk-gluon/gluon
+GLUON_GIT_REF ?= 2ce07ae2fe251bcf8a424dc39aba8da1df7f164d
+
+GLUON_DEPRECATED ?= upgrade
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
 GLUON_TARGETS ?= \
 	ar71xx-generic \
-	ar71xx-tiny \
+	ar71xx-mikrotik \
 	ar71xx-nand \
+	ar71xx-tiny \
 	brcm2708-bcm2708 \
 	brcm2708-bcm2709 \
+	brcm2708-bcm2710 \
+	ipq40xx \
+	ipq806x \
 	mpc85xx-generic \
+	mvebu-cortexa9 \
+	ramips-mt7620 \
 	ramips-mt7621 \
+	ramips-mt76x8 \
 	ramips-rt305x \
+	sunxi-cortexa7 \
 	x86-64 \
 	x86-generic \
-	x86-geode \
-	sunxi
+	x86-geode
 
 
 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
@@ -33,6 +42,7 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
 GLUON_MAKE := ${MAKE} BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
 			GLUON_BRANCH=${GLUON_BRANCH} \
+			GLUON_DEPRECATED=${GLUON_DEPRECATED}
 
 
 all: info
diff --git a/domains/ffrgb.conf b/domains/ffrgb.conf
index be7c5d8..45196ac 100644
--- a/domains/ffrgb.conf
+++ b/domains/ffrgb.conf
@@ -3,12 +3,7 @@
   domain_seed = 'c8951e3a104d55543da98ee732468ea121878e77c6d18cbcbefb5409c292601a',
   hide_domain = true,
 
-  opkg = {
-    --[[ old
-    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
-    ]]
-    lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
-  },
+  opkg = { openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages' },
 
   prefix4 = '10.90.0.0/19',
   prefix6 = 'fdef:f00f:1337:cafe::/64',
diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf
index 5cdea53..6f98889 100644
--- a/domains/ffrgb_cty.conf
+++ b/domains/ffrgb_cty.conf
@@ -2,12 +2,7 @@
   domain_names = { ffrgb_cty = 'Regensburg Stadt' },
   domain_seed = '1124de9b0fe2dde424c8a4c481816b5899e6d1b4b4cf72de42136c4f1f197c7a',
 
-  opkg = {
-    --[[ old
-    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
-    ]]
-    lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
-  },
+  opkg = { openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages' },
 
   prefix4 = '10.90.32.0/19',
   prefix6 = 'fdef:f10f:1337:cafe::/64',
diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf
index c4570a2..96d6704 100644
--- a/domains/ffrgb_tst.conf
+++ b/domains/ffrgb_tst.conf
@@ -3,12 +3,7 @@
   domain_seed = 'bcd0ceca2c68b5b9a5975156a0ec0a04aebe3300d9928a04dc57001cc96db252',
   hide_domain = true,
 
-  opkg = {
-    --[[ old
-    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
-    ]]
-    lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
-  },
+  opkg = { openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages' },
 
   prefix4 = '10.90.96.0/19',
   prefix6 = 'fdef:f30f:1337:cafe::/64',
diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf
index 1c20a10..a3547b8 100644
--- a/domains/ffrgb_uml.conf
+++ b/domains/ffrgb_uml.conf
@@ -2,12 +2,7 @@
   domain_names = { ffrgb_uml = 'Regensburg Umland' },
   domain_seed = 'f3d54e3dfc4108dd3356664bbab4baef3b2920ad943c27edce4b284a68e776fd',
 
-  opkg = {
-    --[[ old
-    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
-    ]]
-    lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
-  },
+  opkg = { openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages' },
 
   prefix4 = '10.90.64.0/19',
   prefix6 = 'fdef:f20f:1337:cafe::/64',
diff --git a/site.conf b/site.conf
index 0b09821..66f59fe 100644
--- a/site.conf
+++ b/site.conf
@@ -4,12 +4,7 @@
   site_code = 'ffrgb',
   default_domain = 'ffrgb',
 
-  opkg = {
-    --[[ old
-    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
-    ]]
-    lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
-  },
+  opkg = { openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages' },
 
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},