diff --git a/modules b/modules
index 16b07abb22..7014af54a9 100644
--- a/modules
+++ b/modules
@@ -1,16 +1,16 @@
 GLUON_FEEDS='gluon packages routing'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
-OPENWRT_BRANCH=openwrt-24.10
-OPENWRT_COMMIT=aa1241e9794c2c03b74f14fef8530507ee4fc2f7
+OPENWRT_BRANCH=main
+OPENWRT_COMMIT=f10ee1e20966bdb86cb61a87338f953de1d86cc6
 
 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=441a0c18cb6f9fb3295eb3d08cdc281c7dc7dc38
+PACKAGES_PACKAGES_BRANCH=master
+PACKAGES_PACKAGES_COMMIT=7cfc21dc1350312d8baa14f158af45c9b0622eb1
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
-PACKAGES_ROUTING_BRANCH=openwrt-24.10
-PACKAGES_ROUTING_COMMIT=d4125fbe02ad9996cc0367ca48f34f5cbf4a964f
+PACKAGES_ROUTING_BRANCH=master
+PACKAGES_ROUTING_COMMIT=5998119c5530fbd4ab844edee3c4da0ea4fec924
diff --git a/patches/openwrt/0002-base-files-disable-reset-button-handling.patch b/patches/openwrt/0002-base-files-disable-reset-button-handling.patch
index 55d95fde31..3444fe0a0e 100644
--- a/patches/openwrt/0002-base-files-disable-reset-button-handling.patch
+++ b/patches/openwrt/0002-base-files-disable-reset-button-handling.patch
@@ -6,7 +6,7 @@ This conflicts with our reset button usage.
 
 diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset
 deleted file mode 100755
-index 2403122ad21d1abd568337908c9d58060e87bf08..0000000000000000000000000000000000000000
+index 84651334710dce09b6a9c342d4b871c64516204d..0000000000000000000000000000000000000000
 --- a/package/base-files/files/etc/rc.button/reset
 +++ /dev/null
 @@ -1,31 +0,0 @@
@@ -35,7 +35,7 @@ index 2403122ad21d1abd568337908c9d58060e87bf08..00000000000000000000000000000000
 -	elif [ "$SEEN" -ge 5 -a -n "$OVERLAY" ]
 -	then
 -		echo "FACTORY RESET" > /dev/console
--		jffs2reset -y && reboot &
+-		factoryreset -y && reboot &
 -	fi
 -;;
 -esac
diff --git a/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch b/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
index 54c9860b5f..5f90ad3f65 100644
--- a/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
+++ b/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
@@ -174,7 +174,7 @@ index 0000000000000000000000000000000000000000..077a563b6066cd1d3aee4b1e82328e8c
 + 
 + int system_bridge_addif(struct device *bridge, struct device *dev)
 diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6
-index 105dc0d344fa82c85b09482e051f35a282a60b08..032dd15bbb2b8603799032647f7a47625751836f 100644
+index 2ea1b7910388f57a7ba3e5868a323618c0838d9c..cf46bf89de743c83410ea0ebd856ce13a8d38ed4 100644
 --- a/target/linux/generic/config-6.6
 +++ b/target/linux/generic/config-6.6
 @@ -716,6 +716,7 @@ CONFIG_BRIDGE=y