diff --git a/.github/ISSUE_TEMPLATE/build-failure.yml b/.github/ISSUE_TEMPLATE/build-failure.yml
new file mode 100644
index 0000000..c374605
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/build-failure.yml
@@ -0,0 +1,46 @@
+name: Build Failure Report
+description: Report a kernel build failure (please read carefully before submitting)
+title: '[Build Failure] '
+labels: ['build-failure']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## ⚠️ Before You Submit
+
+        Most kernel build failures are caused by version mismatch between CachyOS patches and nixpkgs kernel version.
+
+        If this is the case, the build will be automatically fixed once the versions to be in sync again.
+
+        Please consider using the `release` branch as it contains the last successful build:
+
+        ```nix
+        {
+          inputs = {
+            nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
+          }
+        }
+        ```
+
+  - type: checkboxes
+    id: confirmation
+    attributes:
+      label: Please confirm the following before submitting an issue
+      description: |
+        Only submit an issue if the build has been failing for multiple consecutive days, or if it's failing on the `release` branch.
+
+      options:
+        - label: I understand that most build failures are caused by version mismatch between CachyOS patches and nixpkgs kernel version
+          required: true
+        - label: I understand that in most cases, the build will be automatically fixed once the versions to be in sync again
+          required: true
+        - label: The build has been failing for multiple consecutive days, OR it is failing on the `release` branch
+          required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Issue Description
+      description: Describe the build failure (kernel variant, duration, error summary, etc.)
+    validations:
+      required: true
diff --git a/README.md b/README.md
index a3403e6..dd691bf 100644
--- a/README.md
+++ b/README.md
@@ -166,13 +166,13 @@ This repo also has [Garnix CI](https://garnix.io) set up, and should work as lon
 ```
 ### Help! My kernel is failing to build!
 
-In most cases, failing to build a kernel is caused by CachyOS not updating patches for the latest kernel version. (e.g. hardened 6.18 kernel as of 2025-12-12)
+In most cases, failing to build a kernel is caused by version mismatch between CachyOS patches and nixpkgs kernel version. (e.g. hardened 6.18 kernel as of 2025-12-12)
 
 Common symptoms are:
 - "File not found" error, which indicates that CachyOS patches for given kernel version/variant are unavailable.
 - Failures/conflicts when applying patches, which indicates that CachyOS patches are for an older kernel version.
 
-If this is the case, the only option is to wait for CachyOS team to update the patches.
+If this is the case, the build will be automatically fixed once versions to be in sync again.
 
 ## How to use ZFS modules
 
diff --git a/flake.lock b/flake.lock
index fa0712b..a87e4a6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "cachyos-kernel": {
       "flake": false,
       "locked": {
-        "lastModified": 1767470290,
-        "narHash": "sha256-nusECSaOWleBgcaxK+H9PwEju+mrreGOLr8qKgqOADE=",
+        "lastModified": 1767984036,
+        "narHash": "sha256-lcHdWENZAMakHEpjLRpi6DHPmqbUHji0TZTAsdyVIKA=",
         "owner": "CachyOS",
         "repo": "linux-cachyos",
-        "rev": "e3d64ed3ba19785cfa1190e7359aede8c2b00bc8",
+        "rev": "46822116e738fbe7f1696d592761606fec514247",
         "type": "github"
       },
       "original": {
@@ -19,11 +19,11 @@
     "cachyos-kernel-patches": {
       "flake": false,
       "locked": {
-        "lastModified": 1767470151,
-        "narHash": "sha256-YClqbqOjSy1fUtmfqWE7zrdkC8OYfX642/q/LaIlkp8=",
+        "lastModified": 1767983926,
+        "narHash": "sha256-Jl+iTkK1Tn0vkgQysuBAxJOolDh7FVo6Y4uB+ebjc1E=",
         "owner": "CachyOS",
         "repo": "kernel-patches",
-        "rev": "1485985b1bc65228db9058138f66162fd78f281a",
+        "rev": "834da202117f5750fd17a927eb48dbbc0892b653",
         "type": "github"
       },
       "original": {
@@ -53,11 +53,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1765835352,
-        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "lastModified": 1767609335,
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
         "type": "github"
       },
       "original": {
@@ -68,11 +68,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767502730,
-        "narHash": "sha256-nQLQ5E0D4TyUhe5WOjCjokdCZoi8PllC+REEdA0lQHM=",
+        "lastModified": 1768044162,
+        "narHash": "sha256-F02+jfasjo1RlPd9y/FfScpQfmv7ZDsyvNjKXhKRaXA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d410f1407c0722a50c8dfeba1be251e50655dd49",
+        "rev": "5980debfbeb842c193d21bbec4ec42b3b80a6861",
         "type": "github"
       },
       "original": {