diff --git a/modules b/modules
index e9f073b375bfa562350d838b084fb106aca1ae59..873b3e91da9a136c20565ade9f91d4d14cd8b04f 100644
--- a/modules
+++ b/modules
@@ -2,15 +2,15 @@ GLUON_FEEDS='gluon packages routing'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-24.10
-OPENWRT_COMMIT=38d79aca0eb22218b5dcc2ada98cde4bb734bc9c
+OPENWRT_COMMIT=1e079d790ab3eb2d82990c4d547d6ce2635a25f7
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-24.10
-PACKAGES_PACKAGES_COMMIT=d6dd15f540bef3b0deffe18a60dbf424a078cf56
+PACKAGES_PACKAGES_COMMIT=4e2a57207972a1747a6fb0803007696bbc841f55
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-24.10
-PACKAGES_ROUTING_COMMIT=84d97e684bcb6a63dbfdfbfd9ec7407192861239
+PACKAGES_ROUTING_COMMIT=e87b55c6a642947ad7e24cd5054a637df63d5dbe
diff --git a/patches/openwrt/0009-wifi-scripts-allow-per-IF-mesh-basic-rate-selection.patch b/patches/openwrt/0009-wifi-scripts-allow-per-IF-mesh-basic-rate-selection.patch
deleted file mode 100644
index 9b6b2d98af68ca3e616e3a078b5b97a5252c2b30..0000000000000000000000000000000000000000
--- a/patches/openwrt/0009-wifi-scripts-allow-per-IF-mesh-basic-rate-selection.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: David Bauer <mail@david-bauer.net>
-Date: Tue, 7 Jan 2025 11:43:36 +0100
-Subject: wifi-scripts: allow per-IF mesh basic rate selection
-
-Bringing up a mesh interface using wpa_supplicant already supports a
-per-VIF basic rate selection. Add the same ability when creating a mesh
-VIF without wpa_supplicant.
-
-Signed-off-by: David Bauer <mail@david-bauer.net>
-
-diff --git a/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh b/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
-index 368885246a73b14153ffe3c7d83627f873111742..5b5a7fabda896c978b685b89163a36bae33fcdb6 100755
---- a/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
-+++ b/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
-@@ -841,13 +841,19 @@ mac80211_setup_adhoc() {
- 
- mac80211_setup_mesh() {
- 	json_get_vars ssid mesh_id mcast_rate
-+	json_get_values iface_basic_rate_list basic_rate
- 
- 	mcval=
- 	[ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
- 	[ -n "$mesh_id" ] && ssid="$mesh_id"
- 
-+	brlist="$basic_rate_list"
-+	if [ -n "$iface_basic_rate_list" ]; then
-+		brlist="$iface_basic_rate_list"
-+	fi
-+
- 	brstr=
--	for br in $basic_rate_list; do
-+	for br in $brlist; do
- 		wpa_supplicant_add_rate brstr "$br"
- 	done
- 
diff --git a/targets/armsr.inc b/targets/armsr.inc
index 7aa2b4de81411a3e5ffaaab01e4d4784692bcd5e..5f82be2263c92ea82408b8ca4b0b49809003daa8 100644
--- a/targets/armsr.inc
+++ b/targets/armsr.inc
@@ -2,8 +2,8 @@
 config('TARGET_ROOTFS_EXT4FS', false)
 
 defaults {
-	factory = '-squashfs-combined',
+	factory = '-squashfs-combined-efi',
 	factory_ext = '.img.gz',
-	sysupgrade = '-squashfs-combined',
+	sysupgrade = '-squashfs-combined-efi',
 	sysupgrade_ext = '.img.gz',
 }