diff --git a/tests/gha-run-k8s-common.sh b/tests/gha-run-k8s-common.sh
index 9971174485..3b3a580ed6 100644
--- a/tests/gha-run-k8s-common.sh
+++ b/tests/gha-run-k8s-common.sh
@@ -193,6 +193,17 @@ function deploy_k0s() {
 
 	sudo k0s install controller --single ${KUBERNETES_EXTRA_PARAMS:-}
 
+	# kube-router decided to use :8080 for its metrics, and this seems
+	# to be a change that affected k0s 1.30.0+, leading to kube-router
+	# pod crashing all the time and anything can actually be started
+	# after that.
+	#
+	# Due to this issue, let's simply use a different port (:9999) and
+	# move on with our tests.
+	sudo mkdir -p /etc/k0s
+	k0s config create | sudo tee /etc/k0s/k0s.yaml
+	sudo sed -i -e "s/metricsPort: 8080/metricsPort: 9999/g" /etc/k0s/k0s.yaml
+
 	sudo k0s start
 
 	# This is an arbitrary value that came up from local tests
diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
index aedd29980c..33fba31863 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -436,15 +436,20 @@ install_cached_kernel_tarball_component() {
 		"${extra_tarballs}" \
 		|| return 1
 
-	if [[ "${kernel_name}" != "kernel"*"-confidential" ]]; then
-		return 0
-	fi
+	case ${kernel_name} in
+		"kernel-nvidia-gpu"*"")
+			local kernel_headers_dir=$(get_kernel_headers_dir "${kernel_name}")
+			mkdir -p ${kernel_headers_dir} || true
+			tar xvf ${workdir}/${kernel_name}/builddir/kata-static-${kernel_name}-headers.tar.xz -C "${kernel_headers_dir}" || return 1
+			;;& # fallthrough in the confidential case we need the modules.tar.xz and for every kernel-nvidia-gpu we need the headers
+		"kernel"*"-confidential")
+			local modules_dir=$(get_kernel_modules_dir ${kernel_version} ${kernel_kata_config_version} ${build_target})
+			mkdir -p "${modules_dir}" || true
+			tar xvf "${workdir}/kata-static-${kernel_name}-modules.tar.xz" -C "${modules_dir}" || return 1
+			;;
+	esac
 
-	local modules_dir=$(get_kernel_modules_dir ${kernel_version} ${kernel_kata_config_version} ${build_target})
-	mkdir -p "${modules_dir}" || true
-	tar xvf "${workdir}/kata-static-${kernel_name}-modules.tar.xz" -C  "${modules_dir}" && return 0
-
-	return 1
+	return 0
 }
 
 #Install kernel asset