diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 1f65d87..074c0db 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -16,18 +16,10 @@
 
 TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT
 
-ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION
-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION)
-endif
-
-ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_TANGORPRO_VERSION)
 # 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
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TANGORPRO_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TANGORPRO_DIR)/kernel-headers
 
 BOARD_WITHOUT_RADIO := true