diff --git a/modules b/modules
index e7a1b189..21d18329 100644
--- a/modules
+++ b/modules
@@ -2,15 +2,15 @@ GLUON_FEEDS='packages routing gluon'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-22.03
-OPENWRT_COMMIT=f7541aecdc0658051f492016733a64a1de4904bd
+OPENWRT_COMMIT=0a32f66fea95cabc5d21c945678d918bed8cca47
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-22.03
-PACKAGES_PACKAGES_COMMIT=3dbffe64bf36c3a8f4407654ae8569273e4c4cbd
+PACKAGES_PACKAGES_COMMIT=f06652bc117bb5af42db5f87fe5371a071a38064
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-22.03
-PACKAGES_ROUTING_COMMIT=83bc4fc999855f7d2507e936ea8206f06ba6c62b
+PACKAGES_ROUTING_COMMIT=cc1dd763e08cc03926883a8943212f7edf2bf2ce
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=04d2b6ffbb6ee02012f2733b7752d8db0d12eaff
diff --git a/targets/ath79-generic b/targets/ath79-generic
index 1a8ddcc7..339f0b27 100644
--- a/targets/ath79-generic
+++ b/targets/ath79-generic
@@ -1,7 +1,3 @@
--- modify kernel builds slightly to work around a boot hang on various device
--- based on the QCA9563 SoC - especially the Unifi AC-* devices
-config('KERNEL_AIO', true)
-
 -- enforce mainline ath10k kmod/firmware over openwrt default ath10k-ct usage
 -- ath10k-ct is unstable/broken with 11s meshing, works only wave2 chipsets