diff --git a/BUILD.bazel b/BUILD.bazel
index 11117638..809160fd 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -163,7 +163,7 @@ kernel_module(
         "sound/soc/tegra-virt-alt/snd-soc-tegra-virt-t210ref-pcm.ko",
         "sound/tegra-safety-audio/safety-i2s.ko",
     ],
-    kernel_build = "//android-common-kernel/6.1/kernel-source:tegra_android",
+    kernel_build = "//nvidia-build/kleaf:tegra_android",
     deps = [
         "//hwpm/drivers/tegra/hwpm:hwpm",
     ],
diff --git a/Makefile.kleaf b/Makefile.kleaf
index c381b1f6..f9efc7c0 100644
--- a/Makefile.kleaf
+++ b/Makefile.kleaf
@@ -10,10 +10,10 @@ export srctree.nvidia-oot := $(abspath $(shell dirname $(lastword $(MAKEFILE_LIS
 endif
 
 ifeq ($(origin srctree.hwpm), undefined)
-export srctree.hwpm := $(KERNEL_SRC)/../../../hwpm
+export srctree.hwpm := $(KERNEL_SRC)/../hwpm
 endif
 
-EXTRA_SYMBOLS += $(O)/../../../hwpm/drivers/tegra/hwpm/Module.symvers
+EXTRA_SYMBOLS += $(OUT_DIR)/../hwpm/drivers/tegra/hwpm/Module.symvers
 
 KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
 M ?= $(shell pwd)