diff --git a/modules b/modules
index e3502328..32252cc6 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=ddeeb350073f02a4e337adfef34a0e9ca817bc06
+OPENWRT_COMMIT=0a32f66fea95cabc5d21c945678d918bed8cca47
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-22.03
-PACKAGES_PACKAGES_COMMIT=4cb3303d519862a90d2c6ff78b6eadc928659d1c
+PACKAGES_PACKAGES_COMMIT=3ea3a0657775d5eceecf2c8ea847dbe00ecb5870
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-22.03
-PACKAGES_ROUTING_COMMIT=74948d5cea85d476937f38bf1447df00984505cf
+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 aa298f57..40a10b1b 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)
-
 local ATH10K_PACKAGES_QCA9880 = {
 	'kmod-ath10k',
 	'-kmod-ath10k-ct',