diff --git a/package/gluon-iptables-clamp-mss-to-pmtu/luasrc/lib/gluon/upgrade/800-iptables-mesh-vpn-clamp-mss-to-pmtu b/package/gluon-iptables-clamp-mss-to-pmtu/luasrc/lib/gluon/upgrade/800-iptables-mesh-vpn-clamp-mss-to-pmtu
deleted file mode 100755
index 48b24275..00000000
--- a/package/gluon-iptables-clamp-mss-to-pmtu/luasrc/lib/gluon/upgrade/800-iptables-mesh-vpn-clamp-mss-to-pmtu
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/lua
-
-local uci = require('simple-uci').cursor()
-uci:section('firewall', 'include', 'vpn_clamp_mss', {
-	type = 'nftables',
-	position = 'chain-prepend',
-	chain = 'mangle_forward',
-	path = '/lib/gluon/mesh-vpn/nftables-mss.rules',
-})
-
-uci:save('firewall')
diff --git a/package/gluon-iptables-clamp-mss-to-pmtu/Makefile b/package/gluon-nftables-clamp-mss-to-pmtu/Makefile
similarity index 87%
rename from package/gluon-iptables-clamp-mss-to-pmtu/Makefile
rename to package/gluon-nftables-clamp-mss-to-pmtu/Makefile
index 4a1f334f..f502dff8 100644
--- a/package/gluon-iptables-clamp-mss-to-pmtu/Makefile
+++ b/package/gluon-nftables-clamp-mss-to-pmtu/Makefile
@@ -1,11 +1,12 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=gluon-iptables-clamp-mss-to-pmtu
+PKG_NAME:=gluon-nftables-clamp-mss-to-pmtu
 
 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:=+gluon-nftables
 endef
 
 define Package/$(PKG_NAME)/description
diff --git a/package/gluon-iptables-clamp-mss-to-pmtu/files/lib/gluon/mesh-vpn/nftables-mss.rules b/package/gluon-nftables-clamp-mss-to-pmtu/files/lib/gluon/nftables/mesh_vpn_clamp_mss_to_pmtu.nft
similarity index 100%
rename from package/gluon-iptables-clamp-mss-to-pmtu/files/lib/gluon/mesh-vpn/nftables-mss.rules
rename to package/gluon-nftables-clamp-mss-to-pmtu/files/lib/gluon/nftables/mesh_vpn_clamp_mss_to_pmtu.nft
diff --git a/package/gluon-nftables-clamp-mss-to-pmtu/luasrc/lib/gluon/nftables/mesh_vpn_clamp_mss_to_pmtu.lua b/package/gluon-nftables-clamp-mss-to-pmtu/luasrc/lib/gluon/nftables/mesh_vpn_clamp_mss_to_pmtu.lua
new file mode 100755
index 00000000..5d784158
--- /dev/null
+++ b/package/gluon-nftables-clamp-mss-to-pmtu/luasrc/lib/gluon/nftables/mesh_vpn_clamp_mss_to_pmtu.lua
@@ -0,0 +1,4 @@
+include('mesh_vpn_clamp_mss_to_pmtu', {
+	position = 'chain-prepend',
+	chain = 'mangle_forward',
+})