diff --git a/data/defaults.toml b/data/defaults.toml
index 130ae90b12..3e8a722e29 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -14,7 +14,7 @@ vyos_mirror = "https://packages.vyos.net/repositories/rolling"
 vyos_branch = "rolling"
 release_train = "rolling"
 
-kernel_version = "6.18.34"
+kernel_version = "6.18.36"
 kernel_flavor = "vyos"
 bootloaders = "syslinux,grub-efi"
 
diff --git a/scripts/package-build/linux-kernel/build-intel-nic.sh b/scripts/package-build/linux-kernel/build-intel-nic.sh
index 2289659f48..bde7558a20 100755
--- a/scripts/package-build/linux-kernel/build-intel-nic.sh
+++ b/scripts/package-build/linux-kernel/build-intel-nic.sh
@@ -78,4 +78,4 @@ fpm --input-type dir --output-type deb --name vyos-intel-${DRIVER_NAME} \
     --license "GPL2" -C ${DEBIAN_DIR} --after-install ${DEBIAN_POSTINST}
 
 # cleanup
-rm -rf ${DEBIAN_DIR}
+rm -rf -- "${DEBIAN_DIR}" "${DEBIAN_POSTINST}"
diff --git a/scripts/package-build/linux-kernel/package.toml b/scripts/package-build/linux-kernel/package.toml
index 085c407429..df8f70d271 100644
--- a/scripts/package-build/linux-kernel/package.toml
+++ b/scripts/package-build/linux-kernel/package.toml
@@ -36,37 +36,37 @@ build_cmd = "build_intel_qat"
 
 [[packages]]
 name = "igb"
-commit_id = "v5.19.10"
+commit_id = "v5.20.28"
 scm_url = "https://github.com/intel/ethernet-linux-igb"
 build_cmd = "build_intel_nic"
 
 [[packages]]
 name = "ixgbe"
-commit_id = "v6.3.6"
+commit_id = "v6.4.4"
 scm_url = "https://github.com/intel/ethernet-linux-ixgbe"
 build_cmd = "build_intel_nic"
 
 [[packages]]
 name = "ixgbevf"
-commit_id = "v5.2.2"
+commit_id = "v5.3.36"
 scm_url = "http://github.com/intel/ethernet-linux-ixgbevf"
 build_cmd = "build_intel_nic"
 
 [[packages]]
 name = "i40e"
-commit_id = "v2.28.16"
+commit_id = "v2.30.18"
 scm_url = "http://github.com/intel/ethernet-linux-i40e"
 build_cmd = "build_intel_nic"
 
 [[packages]]
 name = "ice"
-commit_id = "v2.5.4"
+commit_id = "v2.6.6"
 scm_url = "http://github.com/intel/ethernet-linux-ice"
 build_cmd = "build_intel_nic"
 
 [[packages]]
 name = "iavf"
-commit_id = "v4.13.20"
+commit_id = "v4.13.35"
 scm_url = "http://github.com/intel/ethernet-linux-iavf"
 build_cmd = "build_intel_nic"
 
diff --git a/scripts/package-build/linux-kernel/patches/i40e/0004-i40e_client-use-ida_alloc-ida_free.patch b/scripts/package-build/linux-kernel/patches/i40e/0004-i40e_client-use-ida_alloc-ida_free.patch
deleted file mode 100644
index 2dbdc5a781..0000000000
--- a/scripts/package-build/linux-kernel/patches/i40e/0004-i40e_client-use-ida_alloc-ida_free.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Christian Breunig <christian@breunig.cc>
-Date: Sun, 3 May 2026 20:18:00 +0000
-Subject: [PATCH 2/3] i40e_client: use ida_alloc and ida_free
-
----
- src/i40e_client.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/src/i40e_client.c
-+++ b/src/i40e_client.c
-@@ -288,7 +288,7 @@ static void i40e_auxiliary_dev_release(struct device *dev)
- 	struct i40e_auxiliary_device *i40e_aux_dev =
- 		container_of(aux_dev, struct i40e_auxiliary_device, aux_dev);
- 
--	ida_simple_remove(&i40e_client_ida, aux_dev->id);
-+	ida_free(&i40e_client_ida, aux_dev->id);
- 	kfree(i40e_aux_dev);
- }
- 
-@@ -311,7 +311,7 @@ static int i40e_register_auxiliary_dev(struct i40e_info *ldev, const char *name)
- 	aux_dev->dev.release = i40e_auxiliary_dev_release;
- 	ldev->aux_dev = aux_dev;
- 
--	ret = ida_simple_get(&i40e_client_ida, 0, 0, GFP_KERNEL);
-+	ret = ida_alloc(&i40e_client_ida, GFP_KERNEL);
- 	if (ret < 0) {
- 		kfree(i40e_aux_dev);
- 		return ret;
-@@ -321,7 +321,7 @@ static int i40e_register_auxiliary_dev(struct i40e_info *ldev, const char *name)
- 
- 	ret = auxiliary_device_init(aux_dev);
- 	if (ret < 0) {
--		ida_simple_remove(&i40e_client_ida, aux_dev->id);
-+		ida_free(&i40e_client_ida, aux_dev->id);
- 		kfree(i40e_aux_dev);
- 		return ret;
- 	}