diff --git a/conf/build.manifest b/conf/build.manifest
index dc380ba4..9a001ca2 100644
--- a/conf/build.manifest
+++ b/conf/build.manifest
@@ -345,7 +345,7 @@ sources:
   predepscmd:
     - "apt install -y flex bison dwarves libssl-dev devscripts"
     # Install dependencies to build perf
-    - "apt install -y libelf-dev libdw-dev systemtap-sdt-dev libunwind-dev libslang2-dev libperl-dev binutils-dev libiberty-dev python3 python3-setuptools python3-dev liblzma-dev libzstd-dev libcap-dev libnuma-dev libbabeltrace-dev openjdk-17-jdk"
+    - "apt install -y libelf-dev libdw-dev systemtap-sdt-dev libunwind-dev libslang2-dev libperl-dev binutils-dev libiberty-dev python3 python3-setuptools python3-dev liblzma-dev libzstd-dev libcap-dev libnuma-dev libbabeltrace-dev openjdk-17-jdk libcapstone-dev llvm-dev"
     # We remove git files because kernel makefile tries to interact with git for determining version
     # which results in misconfigured version due to our debian based changes
     - "rm -rf .git .gitattributes .gitignore"
@@ -389,7 +389,7 @@ sources:
   branch: truenas/zfs-2.3-release
   env:
     KVERS: "$(shell apt info linux-headers-truenas-production-amd64 | awk '/Source:/ { print $$2}' | sed 's/linux-//')"
-    KSRC: "/usr/src/linux-headers-$(KVERS)"
+    KSRC: "/usr/src/linux-headers-truenas-production-amd64"
     KOBJ: "$(KSRC)"
   predepscmd:
     - "cp -r contrib/debian debian"
@@ -415,7 +415,7 @@ sources:
       batch_priority: 0
       env:
         KVERS: "$(shell apt info linux-headers-truenas-debug-amd64 | awk '/Source:/ { print $$2}' | sed 's/linux-//')"
-        KSRC: "/usr/src/linux-headers-$(KVERS)"
+        KSRC: "/usr/src/linux-headers-truenas-debug-amd64"
         KOBJ: "$(KSRC)"
       predepscmd:
         - "cp -r contrib/debian debian"