diff --git a/modules b/modules
index 5c3c3b05..9ceff1ac 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=a4390ea283893fd3166bf660c32f263a6501d5b5
+OPENWRT_COMMIT=f854de6adaba7671f223b436b53244097589cf86
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-22.03
-PACKAGES_PACKAGES_COMMIT=4c4ac1b583fac788b2f19d93ee3da05846fbfeb2
+PACKAGES_PACKAGES_COMMIT=1123b9dae320ca172b47ad31acabab4f76e5bfd6
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-22.03
-PACKAGES_ROUTING_COMMIT=173576829bc19b66d46667b8b270b6adcddd4119
+PACKAGES_ROUTING_COMMIT=1ccc4e435175e6ba5ac60e626e1e95eb25c5757b
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=04d2b6ffbb6ee02012f2733b7752d8db0d12eaff
diff --git a/package/gluon-iptables-clamp-mss-to-pmtu/Makefile b/package/gluon-iptables-clamp-mss-to-pmtu/Makefile
index 20379e0a..d5d91443 100644
--- a/package/gluon-iptables-clamp-mss-to-pmtu/Makefile
+++ b/package/gluon-iptables-clamp-mss-to-pmtu/Makefile
@@ -6,7 +6,7 @@ include ../gluon.mk
 
 define Package/$(PKG_NAME)
   TITLE:=This will establish a firewall rule to clamp the mss to pmtu on the mesh-vpn interface when the connection is towards 64:ff9b::/96
-  DEPENDS:= +ip6tables-legacy
+  DEPENDS:= +ip6tables-zz-legacy
 endef
 
 define Package/$(PKG_NAME)/description
diff --git a/package/gluon-mesh-vpn-core/Makefile b/package/gluon-mesh-vpn-core/Makefile
index 9525f110..2111c7ce 100644
--- a/package/gluon-mesh-vpn-core/Makefile
+++ b/package/gluon-mesh-vpn-core/Makefile
@@ -6,7 +6,7 @@ include ../gluon.mk
 
 define Package/gluon-mesh-vpn-core
   TITLE:=Basic support for connecting meshes via VPN tunnels
-  DEPENDS:=+gluon-core +gluon-wan-dnsmasq +iptables-legacy +iptables-mod-extra +simple-tc
+  DEPENDS:=+gluon-core +gluon-wan-dnsmasq +iptables-zz-legacy +iptables-mod-extra +simple-tc
   USERID:=:gluon-mesh-vpn=800
 endef
 
diff --git a/targets/generic b/targets/generic
index 7e8c17f2..1cb8b5e4 100644
--- a/targets/generic
+++ b/targets/generic
@@ -94,5 +94,5 @@ packages {
 	'-wpad-basic-wolfssl',
 	'-firewall4',
 	'gluon-core',
-	'ip6tables-legacy',
+	'ip6tables-zz-legacy',
 }
diff --git a/targets/mediatek-mt7622 b/targets/mediatek-mt7622
index 5868d9c9..8376c397 100644
--- a/targets/mediatek-mt7622
+++ b/targets/mediatek-mt7622
@@ -6,8 +6,9 @@ device('linksys-e8450-ubi', 'linksys_e8450-ubi', {
 })
 
 
-device('ubiquiti-unifi-6-lr', 'ubnt_unifi-6-lr', {
+device('ubiquiti-unifi-6-lr-v1', 'ubnt_unifi-6-lr-v1', {
 	factory = false,
+	manifest_aliases = {'ubiquiti-unifi-6-lr'},
 })
 
 -- Xiaomi