diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 261296520d989ab1d5dc02d315ea88b42b75096b..1907bd5455d6bf21aeb16af45b1ec33c51627be7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,109 +32,10 @@ stages:
       - gluon/openwrt/feeds
     key: "target-$GLUON_TARGET"
  
-target:ar71xx-generic:
+target:brcm2708-bcm2711:
   extends: .target
-  only: 
-    - tags
-    - schedules
-    - web
   variables:
-    GLUON_TARGET: ar71xx-generic
- 
-target:ar71xx-nand:
-  extends: .target
-  only: 
-    - tags
-    - schedules
-    - web
-  variables:
-    GLUON_TARGET: ar71xx-nand
- 
-target:ar71xx-tiny:
-  extends: .target
-  only: 
-    - tags
-    - schedules
-    - web
-  variables:
-    GLUON_TARGET: ar71xx-tiny
- 
-target:brcm2708-bcm2708:
-  extends: .target
-  only: 
-    - tags
-    - schedules
-    - web
-  variables:
-    GLUON_TARGET: brcm2708-bcm2708
- 
-target:brcm2708-bcm2709:
-  extends: .target
-  only: 
-    - tags
-    - schedules
-    - web
-  variables:
-    GLUON_TARGET: brcm2708-bcm2709
- 
-target:mpc85xx-generic:
-  extends: .target
-  only: 
-    - tags
-    - schedules
-    - web
-  variables:
-    GLUON_TARGET: mpc85xx-generic
- 
-target:ipq40xx:
-  extends: .target
-  only: 
-    - tags
-    - schedules
-    - web
-  variables:
-    GLUON_TARGET: ipq40xx
- 
-target:ramips-mt7621:
-  extends: .target
-  only: 
-    - tags
-    - schedules
-    - web
-  variables:
-    GLUON_TARGET: ramips-mt7621
- 
-target:ramips-mt76x8:
-  extends: .target
-  only: 
-    - tags
-    - schedules
-    - web
-  variables:
-    GLUON_TARGET: ramips-mt76x8
- 
-target:x86-generic:
-  extends: .target
-  only: 
-    - tags
-    - schedules
-    - web
-  variables:
-    GLUON_TARGET: x86-generic
- 
-target:x86-geode:
-  extends: .target
-  only: 
-    - tags
-    - schedules
-    - web
-  variables:
-    GLUON_TARGET: x86-geode
- 
-target:x86-64:
-  extends: .target
-  variables:
-    GLUON_TARGET: x86-64
+    GLUON_TARGET: brcm2708-bcm2711
 
 package:
   stage: package
diff --git a/.gitmodules b/.gitmodules
index ccc1200fc219463f90212b8e828116d02fbeccfc..609bfdea20b6818d1951e2e8ccf4c24e4878204a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "gluon"]
 	path = gluon
 	url = https://gitlab.freifunk-stuttgart.de/firmware/gluon.git
+	branch = 0x4A6F-rpi4
diff --git a/gluon b/gluon
index 9f827678c92603179021c9c302a2dbd7fb08a7da..1eb869fd4416b09530a56bef010fbd11ac1a3979 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit 9f827678c92603179021c9c302a2dbd7fb08a7da
+Subproject commit 1eb869fd4416b09530a56bef010fbd11ac1a3979
diff --git a/site.conf b/site.conf
index 7cd579f20f7100a9682041d77e49a4bf63e32b77..c854142138c51ee3f2b79b07731e74c3aada4490 100644
--- a/site.conf
+++ b/site.conf
@@ -20,9 +20,6 @@
 
     wifi24 = {
         channel = 1,
-        --disables 802.11b rates
-        supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-        basic_rate = {6000, 9000, 18000, 36000, 54000},
         ap = {
             ssid = 'Freifunk',
         },
diff --git a/site.mk b/site.mk
index 7c0b5c4f6780928cdacbe3136f6b3f2dadc6c008..91a38ddc520f1d53264c639d9791acf32235fa0c 100644
--- a/site.mk
+++ b/site.mk
@@ -62,3 +62,8 @@ GLUON_PRIORITY ?= 0.1
 
 #enable generation of images for ath10k devices with ibss mode
 GLUON_WLAN_MESH ?= 11s
+
+# Do not build images for deprecated devices
+GLUON_DEPRECATED ?= full
+
+BROKEN ?= true