diff --git a/Makefile b/Makefile
index 0bc392f6..109e10ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2023.1
+GLUON_GIT_REF := dc841ea4a37b4e74777e07617042bc92aad2483b # master at 2023-12-13
 
 PATCH_DIR := ./patches
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
diff --git a/patches/targets-drop-TP-Link-RE305.patch b/patches/targets-drop-TP-Link-RE305.patch
deleted file mode 100644
index c183e57d..00000000
--- a/patches/targets-drop-TP-Link-RE305.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 30742c681eccafd2a47fa705b47ce730ffe178d8 Mon Sep 17 00:00:00 2001
-From: Grische <10663446-grische@users.noreply.gitlab.com>
-Date: Fri, 3 Nov 2023 00:27:40 +0100
-Subject: [PATCH] targets: drop TP-Link RE305
-
-The flash size is not sufficient to host updated packages
----
- targets/ramips-mt76x8 | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/targets/ramips-mt76x8 b/targets/ramips-mt76x8
-index 52fb71be..1e27ac35 100644
---- a/targets/ramips-mt76x8
-+++ b/targets/ramips-mt76x8
-@@ -62,10 +62,6 @@ device('tp-link-re200-v2', 'tplink_re200-v2')
- 
- device('tp-link-re200-v3', 'tplink_re200-v3')
- 
--device('tp-link-re305', 'tplink_re305-v1', {
--	class = 'tiny', -- Only 6M of usable Firmware space
--})
--
- device('tp-link-tl-mr3020-v3', 'tplink_tl-mr3020-v3', {
- 	factory = false,
- 	extra_images = {
--- 
-2.25.1
-
diff --git a/patches/targets-drop-TP-Link-RE450-and-RE355.patch b/patches/targets-drop-TP-Link-RE450-and-RE355.patch
deleted file mode 100644
index 563c885b..00000000
--- a/patches/targets-drop-TP-Link-RE450-and-RE355.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b5fb157e3b67b2d39f5b7c391ef39f0b19e4cf2e Mon Sep 17 00:00:00 2001
-From: Christian <github@grische.xyz>
-Date: Fri, 18 Aug 2023 17:02:22 +0200
-Subject: [PATCH] targets: drop TP-Link RE450 and RE355
-
-The flash size is not sufficient to host the minimal set of FFMuc packages
----
- targets/ath79-generic | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/targets/ath79-generic b/targets/ath79-generic
-index 7a5140c9..32a03ce3 100644
---- a/targets/ath79-generic
-+++ b/targets/ath79-generic
-@@ -474,23 +474,6 @@ device('tp-link-eap225-outdoor-v1', 'tplink_eap225-outdoor-v1', {
- 	packages = ATH10K_PACKAGES_QCA9888,
- })
- 
--device('tp-link-re355-v1', 'tplink_re355-v1', {
--	manifest_aliases = {
--		'tp-link-re355', -- upgrade from OpenWrt 19.07
--	},
--	packages = ATH10K_PACKAGES_SMALLBUFFERS_QCA9880,
--	broken = true, -- OOM with 5GHz enabled in most environments if device is 64M RAM variant
--	class = 'tiny', -- Only 6M of usable Firmware space
--})
--
--device('tp-link-re450-v1', 'tplink_re450-v1', {
--	packages = ATH10K_PACKAGES_QCA9880,
--	manifest_aliases = {
--		'tp-link-re450', -- upgrade from OpenWrt 19.07
--	},
--	class = 'tiny', -- Only 6M of usable Firmware space
--})
--
- device('tp-link-tl-wdr3500-v1', 'tplink_tl-wdr3500-v1')
- device('tp-link-tl-wdr3600-v1', 'tplink_tl-wdr3600-v1')
- device('tp-link-tl-wdr4300-v1', 'tplink_tl-wdr4300-v1')
--- 
-2.25.1
-
diff --git a/patches/targets-raspberry-pi-4.patch b/patches/targets-raspberry-pi-4.patch
index 0c71d24b..644f7f40 100644
--- a/patches/targets-raspberry-pi-4.patch
+++ b/patches/targets-raspberry-pi-4.patch
@@ -3,11 +3,12 @@ new file mode 100644
 index 00000000..ba631911
 --- /dev/null
 +++ b/targets/bcm27xx-bcm2711
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,10 @@
 +include 'bcm27xx.inc'
 +
-+device('raspberry-pi-4-model-b', 'rpi-4', {
++device('raspberrypi-4-model-b', 'rpi-4', {
 +	manifest_aliases = {
++		'raspberry-pi-4-model-b',
 +		'raspberry-pi-4-model-b-rev-1.1',
 +		'raspberry-pi-4-model-b-rev-1.2',
 +		'raspberry-pi-4-model-b-rev-1.4',
@@ -17,9 +18,9 @@ diff --git a/targets/targets.mk b/targets/targets.mk
 index 92b58ab8..05a74935 100644
 --- a/targets/targets.mk
 +++ b/targets/targets.mk
-@@ -22,5 +22,6 @@ $(eval $(call GluonTarget,x86,64))
- 
- ifneq ($(BROKEN),)
+@@ -26,5 +26,6 @@ $(eval $(call GluonTarget,x86,64))
+
+ ifeq ($(BROKEN),1)
  $(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested
 +$(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: Untested
  $(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
diff --git a/scripts/install_build_dependencies.sh b/scripts/install_build_dependencies.sh
index a0f7f268..b39e49a4 100755
--- a/scripts/install_build_dependencies.sh
+++ b/scripts/install_build_dependencies.sh
@@ -33,6 +33,7 @@ apt-get -y --no-install-recommends install \
     patch \
     perl \
     python3 \
+    python3-distutils \
     qemu-utils \
     rsync \
     tar \