diff --git a/.github/workflows/e2e-bsd.yml b/.github/workflows/e2e-bsd.yml
index e2f4dae..011a18a 100644
--- a/.github/workflows/e2e-bsd.yml
+++ b/.github/workflows/e2e-bsd.yml
@@ -24,10 +24,10 @@ jobs:
             os: freebsd
             version: "15.1"
             artifact: freebsd/freebsd-15.1.x86_64.kernel
-          - name: NetBSD 11.99.7
+          - name: NetBSD 11.0
             os: netbsd
-            version: "11.99.7"
-            artifact: netbsd/netbsd-11.99.7.x86_64.kernel
+            version: "11.0"
+            artifact: netbsd/netbsd-11.0.x86_64.kernel
 
     steps:
       - name: Check out repository
diff --git a/kbuildx/README.md b/kbuildx/README.md
index 81d7e19..7065df2 100644
--- a/kbuildx/README.md
+++ b/kbuildx/README.md
@@ -436,7 +436,7 @@ A separate host E2E workflow runs directly on `ubuntu-latest`:
 
 The BSD E2E workflow runs a kernel-only build matrix on KVM-enabled `ubuntu-latest` runners:
 
-- Builds FreeBSD 15.1 and NetBSD 11.99.7 in their matching bsdkrun guests.
+- Builds FreeBSD 15.1 and NetBSD 11.0 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/kbuildx/scripts/netbsd-deps.sh b/kbuildx/scripts/netbsd-deps.sh
index ab611a0..638b0ff 100755
--- a/kbuildx/scripts/netbsd-deps.sh
+++ b/kbuildx/scripts/netbsd-deps.sh
@@ -42,4 +42,12 @@ if [ -e /etc/ssl/cert.pem ] || [ -e /etc/openssl/certs/ca-certificates.crt ]; th
     printf '%s\n' "$package_path" > /usr/pkg/etc/pkgin/repositories.conf
     pkgin -y update
 fi
-pkgin -y install git-base
+if ! pkgin -y install git-base; then
+    # NetBSD pkg_install can report post-install warnings for base files while
+    # still completing the requested package. Continue only when Git is usable.
+    if ! command -v git >/dev/null 2>&1; then
+        printf '%s\n' 'pkgin failed and git is unavailable' >&2
+        exit 1
+    fi
+    printf '%s\n' 'pkgin reported warnings; git-base is available, continuing'
+fi
diff --git a/kbuildx/src/commands/bsd.rs b/kbuildx/src/commands/bsd.rs
index 94cd5f3..71c96b8 100644
--- a/kbuildx/src/commands/bsd.rs
+++ b/kbuildx/src/commands/bsd.rs
@@ -448,7 +448,10 @@ mod tests {
             "netbsd-10-1-RELEASE"
         );
         assert_eq!(default_bsd_ref(BuildOs::Netbsd, "current"), "trunk");
-        assert_eq!(default_bsd_ref(BuildOs::Netbsd, "11.99.7"), "trunk");
+        assert_eq!(
+            default_bsd_ref(BuildOs::Netbsd, "11.0"),
+            "netbsd-11-0-RELEASE"
+        );
     }
 
     #[test]