diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ad62248..60653d5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,5 +11,5 @@ jobs:
   test:
     uses: ./.github/workflows/matrix.yml
     with:
-      spec: "only-latest:flavor=host,zone,zone-nvidiagpu"
+      spec: "only-latest-lts:flavor=host,zone,zone-nvidiagpu"
       publish: false
diff --git a/config.yaml b/config.yaml
index af2aa58..c0b2da6 100644
--- a/config.yaml
+++ b/config.yaml
@@ -77,6 +77,7 @@ patches:
   lower: '6.16'
 - patch: 0001-9p-xen-mark-9p-transport-device-as-closing-when-remo.patch
   lower: '6.1'
+  upper: '6.18.15'
 - patch: 0002-x86-amd_node-fix-integer-divide-by-zero-during-init.patch
   lower: '6.17'
 - patch: 0003-x86-amd_node-fix-null-pointer-dereference-if-amd_smn.patch
diff --git a/hack/build/generate-matrix.py b/hack/build/generate-matrix.py
index b5a032d..edefe0e 100644
--- a/hack/build/generate-matrix.py
+++ b/hack/build/generate-matrix.py
@@ -11,6 +11,11 @@ def construct_stable_matrix():
     return stable_matrix
 
 
+def construct_lts_matrix():
+    lts_matrix = matrix.generate_lts_matrix()
+    return lts_matrix
+
+
 def construct_backbuild_matrix():
     backbuild_matrix = matrix.generate_backbuild_matrix()
     return backbuild_matrix
@@ -61,6 +66,17 @@ def construct_manual_matrix(exact_versions):
     apply_config_versions = False
 elif build_spec_type == "stable":
     first_matrix = construct_stable_matrix()
+elif build_spec_type == "lts":
+    first_matrix = construct_lts_matrix()
+elif build_spec_type == "only-latest-lts":
+    first_matrix = construct_lts_matrix()
+    apply_config_versions = False
+    matrix.sort_matrix(first_matrix)
+    last_version = parse(first_matrix[-1]["version"]).base_version
+    last_version_builds = list(
+        filter(lambda build: last_version in build["version"], first_matrix)
+    )
+    first_matrix = last_version_builds
 elif build_spec_type == "only-latest":
     first_matrix = construct_stable_matrix()
     apply_config_versions = False
diff --git a/hack/build/matrix.py b/hack/build/matrix.py
index 27ac97f..136ff29 100644
--- a/hack/build/matrix.py
+++ b/hack/build/matrix.py
@@ -347,60 +347,43 @@ def summarize_matrix(builds: list[dict[str, any]]):
         )
 
 
-def generate_stable_matrix() -> list[dict[str, any]]:
-    current_kernel_releases = get_current_kernel_releases()
-    latest_stable = current_kernel_releases["latest_stable"]["version"]
-
-    known_releases = []
-
-    for release in current_kernel_releases["releases"]:
-        if (release["moniker"] in ["stable", "longterm"]) or release[
-            "version"
-        ] == latest_stable:
-            known_releases.append(release["version"])
-
+def build_release_tags(versions: list[str]) -> dict[str, str]:
     tags = {}
-    major_minors = {}
-
-    for raw_version in known_releases:
-        if raw_version == latest_stable:
-            tags["stable"] = raw_version
-
-
+    for raw_version in versions:
         parsed_ver = parse(raw_version)
-
         # Hardcode skip of pre-5.x.x kernels
         if parsed_ver.major < 5:
             print(f'skipping {raw_version}, too old to support')
             continue
-
         major = str(parsed_ver.major)
         major_minor = "%s.%s" % (parsed_ver.major, parsed_ver.minor)
-        if major in tags:
-            existing = tags[major]
-            if parse(existing) < parsed_ver:
-                tags[major] = raw_version
-        else:
+        if major not in tags or parse(tags[major]) < parsed_ver:
             tags[major] = raw_version
-
-        if major_minor in tags:
-            existing = tags[major_minor]
-            if parse(existing) < parsed_ver:
-                tags[major_minor] = raw_version
-                major_minors[major_minor] = raw_version
-
-        else:
+        if major_minor not in tags or parse(tags[major_minor]) < parsed_ver:
             tags[major_minor] = raw_version
-            major_minors[major_minor] = raw_version
+    for tag in list(tags.keys()):
+        tags[tags[tag]] = tags[tag]
+    return tags
 
-    tags["latest"] = tags["stable"]
 
-    for tag in list(tags.keys()):
-        local_version = tags[tag]
-        tags[local_version] = local_version
+def generate_stable_matrix() -> list[dict[str, any]]:
+    current_kernel_releases = get_current_kernel_releases()
+    latest_stable = current_kernel_releases["latest_stable"]["version"]
+    versions = [r["version"] for r in current_kernel_releases["releases"]
+                if r["moniker"] in ["stable", "longterm"]]
+    tags = build_release_tags(versions)
+    tags["stable"] = latest_stable
+    tags["latest"] = latest_stable
     return generate_matrix(tags)
 
 
+def generate_lts_matrix() -> list[dict[str, any]]:
+    current_kernel_releases = get_current_kernel_releases()
+    versions = [r["version"] for r in current_kernel_releases["releases"]
+                if r["moniker"] == "longterm"]
+    return generate_matrix(build_release_tags(versions))
+
+
 def generate_backbuild_matrix() -> list[dict[str, any]]:
     tags = {}
     major_minors = {}