diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 9dbae87..5b694ff 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR ?= device/google/tangorpro-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/tangorpro-kernel/kernel-headers
 TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT
 
 ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION
@@ -23,8 +21,12 @@ TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION)
 endif
 
 ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)/kernel-headers
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/tangorpro-kernel
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/tangorpro-kernel/kernel-headers
 endif
 
 BOARD_WITHOUT_RADIO := true