diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e69de29
diff --git a/kernel_builder/config/variants.json b/kernel_builder/config/variants.json
index 975a83d..f837454 100644
--- a/kernel_builder/config/variants.json
+++ b/kernel_builder/config/variants.json
@@ -39,7 +39,7 @@
         },
         "config": {
             "CONFIG_KSU": true,
-            "CONFIG_KPM": false,
+            "CONFIG_KPM": true,
             "CONFIG_KSU_SUSFS": false,
             "CONFIG_KSU_KPROBES_HOOK": false,
             "CONFIG_KSU_TRACEPOINT_HOOK": true
@@ -79,7 +79,7 @@
         },
         "config": {
             "CONFIG_KSU": true,
-            "CONFIG_KPM": false,
+            "CONFIG_KPM": true,
             "CONFIG_KSU_KPROBES_HOOK": false,
             "CONFIG_KSU_TRACEPOINT_HOOK": true,
             "CONFIG_KSU_SUSFS": true,
diff --git a/kernel_builder/kernel_builder.py b/kernel_builder/kernel_builder.py
index d425bc4..ac6f188 100755
--- a/kernel_builder/kernel_builder.py
+++ b/kernel_builder/kernel_builder.py
@@ -15,6 +15,7 @@
 from kernel_builder.constants import OUTPUT, TOOLCHAIN, WORKSPACE
 from kernel_builder.post_build.export_env import GithubExportEnv
 from kernel_builder.post_build.flashable import FlashableBuilder
+from kernel_builder.post_build.kpm import KPMPatcher
 from kernel_builder.pre_build.ksu import KSUInstaller
 from kernel_builder.pre_build.lxc import LXCPatcher
 from kernel_builder.pre_build.susfs import SUSFSPatcher
@@ -33,6 +34,7 @@ def __init__(self, ksu: str, susfs: bool, lxc: bool) -> None:
         self.use_susfs: bool = susfs
         self.use_lxc: bool = lxc
 
+        self.kpm: KPMPatcher = KPMPatcher(ksu)
         self.ksu: KSUInstaller = KSUInstaller(ksu, susfs)
         self.susfs: SUSFSPatcher = SUSFSPatcher(ksu, susfs)
         self.lxc: LXCPatcher = LXCPatcher(lxc)
@@ -104,6 +106,7 @@ def run_build(self) -> None:
         self.builder.build()
 
         # Post build
+        self.kpm.patch()
         self.export_env.export_github_env()
 
         # Build flashable
diff --git a/preserved/pre_build/kpm.py b/kernel_builder/post_build/kpm.py
similarity index 100%
rename from preserved/pre_build/kpm.py
rename to kernel_builder/post_build/kpm.py
diff --git a/pyproject.toml b/pyproject.toml
index a8ed8a1..af6b5b8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,10 @@
 [project]
 name            = "kernel_builder"
 version         = "1.0.0"
-description     = "A python android12-5.10 gki kernel builder"
+description     = "A python gki kernel builder"
 readme          = "README.md"
 license         = "GPL-3.0"
-license-files   = ["LICENSE"]
+license-files   = ["LICEN[CS]E*"]
 requires-python = ">=3.12"
 dependencies    = [
     "lz4>=4.4.4",
@@ -22,7 +22,7 @@ dependencies    = [
 [tool.ruff]
 target-version = "py312"
 line-length    = 120
-extend-exclude = ["tests", "typings", "preserved"]
+extend-exclude = ["tests", "typings"]
 
 [tool.ruff.lint]
 extend-select = ["I"]
@@ -41,7 +41,7 @@ line-ending               = "auto"
 
 [tool.basedpyright]
 include = ["kernel_builder"]
-exclude = ["tests", "typings", "preserved"]
+exclude = ["tests", "typings"]
 
 pythonVersion    = "3.12"
 pythonPlatform   = "Linux"
diff --git a/uv.lock b/uv.lock
index a6ddf2b..12490d3 100644
--- a/uv.lock
+++ b/uv.lock
@@ -260,14 +260,14 @@ wheels = [
 
 [[package]]
 name = "pytest-mock"
-version = "3.14.1"
+version = "3.15.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pytest" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/71/28/67172c96ba684058a4d24ffe144d64783d2a270d0af0d9e792737bddc75c/pytest_mock-3.14.1.tar.gz", hash = "sha256:159e9edac4c451ce77a5cdb9fc5d1100708d2dd4ba3c3df572f14097351af80e", size = 33241, upload-time = "2025-05-26T13:58:45.167Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/68/14/eb014d26be205d38ad5ad20d9a80f7d201472e08167f0bb4361e251084a9/pytest_mock-3.15.1.tar.gz", hash = "sha256:1849a238f6f396da19762269de72cb1814ab44416fa73a8686deac10b0d87a0f", size = 34036, upload-time = "2025-09-16T16:37:27.081Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b2/05/77b60e520511c53d1c1ca75f1930c7dd8e971d0c4379b7f4b3f9644685ba/pytest_mock-3.14.1-py3-none-any.whl", hash = "sha256:178aefcd11307d874b4cd3100344e7e2d888d9791a6a1d9bfe90fbc1b74fd1d0", size = 9923, upload-time = "2025-05-26T13:58:43.487Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/cc/06253936f4a7fa2e0f48dfe6d851d9c56df896a9ab09ac019d70b760619c/pytest_mock-3.15.1-py3-none-any.whl", hash = "sha256:0a25e2eb88fe5168d535041d09a4529a188176ae608a6d249ee65abc0949630d", size = 10095, upload-time = "2025-09-16T16:37:25.734Z" },
 ]
 
 [[package]]