diff --git a/device-akita.mk b/device-akita.mk
index 99f82bb..9157398 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -16,16 +16,17 @@
 
 PRODUCT_RELEASE_CONFIG_MAPS += vendor/google_devices/release/phones/release_config_map.mk
 
-TARGET_KERNEL_DIR ?= device/google/akita-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/akita-kernel/kernel-headers
-
 ifdef RELEASE_GOOGLE_AKITA_KERNEL_VERSION
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_AKITA_KERNEL_VERSION)
 endif
 
 ifdef RELEASE_GOOGLE_AKITA_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_AKITA_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_AKITA_KERNEL_DIR)/kernel-headers
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_AKITA_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_AKITA_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/akita-kernel
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/akita-kernel/kernel-headers
 endif
 
 $(call inherit-product-if-exists, vendor/google_devices/akita/prebuilts/device-vendor-akita.mk)