diff --git a/kbuildx/README.md b/kbuildx/README.md
--- a/kbuildx/README.md
+++ b/kbuildx/README.md
@@ -436,7 +436,7 @@
 
 The BSD E2E workflow runs a kernel-only build matrix on KVM-enabled `ubuntu-latest` runners:
 
-- Builds FreeBSD 15.1 and NetBSD 11.0 in their matching bsdkrun guests.
+- Builds FreeBSD 15.1 and NetBSD 11.99.7 in their matching bsdkrun guests.
 - Uses all runner CPUs and 8192 MiB of guest memory.
 - Caches downloaded bsdkrun BSD images and Rust build output.
 - Verifies each exported kernel and its SHA-256 checksum.
diff --git a/.github/workflows/e2e-bsd.yml b/.github/workflows/e2e-bsd.yml
--- a/.github/workflows/e2e-bsd.yml
+++ b/.github/workflows/e2e-bsd.yml
@@ -24,10 +24,10 @@
             os: freebsd
             version: "15.1"
             artifact: freebsd/freebsd-15.1.x86_64.kernel
-          - name: NetBSD 11.0
+          - name: NetBSD 11.99.7
             os: netbsd
-            version: "11.0"
-            artifact: netbsd/netbsd-11.0.x86_64.kernel
+            version: "11.99.7"
+            artifact: netbsd/netbsd-11.99.7.x86_64.kernel
 
     steps:
       - name: Check out repository
diff --git a/kbuildx/scripts/netbsd-deps.sh b/kbuildx/scripts/netbsd-deps.sh
--- a/kbuildx/scripts/netbsd-deps.sh
+++ b/kbuildx/scripts/netbsd-deps.sh
@@ -5,7 +5,9 @@
 export PATH=/usr/pkg/bin:/usr/pkg/sbin:/sbin:/usr/sbin:/bin:/usr/bin
 if command -v resize_ffs >/dev/null 2>&1; then
     printf '%s\n' 'Growing NetBSD FFS root filesystem to fill the virtual disk'
-    resize_ffs -y /dev/ld0a
+    df -h /
+    resize_ffs -y /dev/rld0a
+    df -h /
 else
     printf '%s\n' 'NetBSD resize_ffs is unavailable; cannot use the expanded build disk' >&2
     exit 1
@@ -40,4 +42,4 @@
     printf '%s\n' "$package_path" > /usr/pkg/etc/pkgin/repositories.conf
     pkgin -y update
 fi
-pkgin -y install git-base || pkgin -y install git
+pkgin -y install git-base
diff --git a/kbuildx/src/commands/bsd.rs b/kbuildx/src/commands/bsd.rs
--- a/kbuildx/src/commands/bsd.rs
+++ b/kbuildx/src/commands/bsd.rs
@@ -390,7 +390,11 @@
     match os {
         BuildOs::Freebsd if matches!(version, "current" | "main") => "main".to_string(),
         BuildOs::Freebsd => format!("releng/{}", version.trim_end_matches("-RELEASE")),
-        BuildOs::Netbsd if matches!(version, "current" | "trunk") => "trunk".to_string(),
+        BuildOs::Netbsd
+            if matches!(version, "current" | "trunk") || version.starts_with("11.99.") =>
+        {
+            "trunk".to_string()
+        }
         BuildOs::Netbsd => format!(
             "netbsd-{}-RELEASE",
             version
@@ -444,6 +448,7 @@
             "netbsd-10-1-RELEASE"
         );
         assert_eq!(default_bsd_ref(BuildOs::Netbsd, "current"), "trunk");
+        assert_eq!(default_bsd_ref(BuildOs::Netbsd, "11.99.7"), "trunk");
     }
 
     #[test]