diff --git a/device-husky.mk b/device-husky.mk
index 26e4bc8..936d594 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -17,16 +17,17 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
-TARGET_KERNEL_DIR ?= device/google/shusky-kernel
-TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
-
 ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION)
 endif
 
 ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/shusky-kernel
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
 endif
 
 LOCAL_PATH := device/google/shusky
diff --git a/device-shiba.mk b/device-shiba.mk
index 75730c0..8b5ff63 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -17,16 +17,17 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
-TARGET_KERNEL_DIR ?= device/google/shusky-kernel
-TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
-
 ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION)
 endif
 
 ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/shusky-kernel
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
 endif
 
 LOCAL_PATH := device/google/shusky