diff --git a/device-husky.mk b/device-husky.mk
index cb60da0..460d6e1 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -20,6 +20,15 @@ $(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
+endif
+
 LOCAL_PATH := device/google/shusky
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 0d14aad..86df2e9 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -20,6 +20,15 @@ $(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_RIPCURRENT_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)/kernel-headers
+endif
+
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     USE_UWBFIELDTESTQM := true
 endif
diff --git a/device-shiba.mk b/device-shiba.mk
index 4156044..d80f056 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -20,6 +20,15 @@ $(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
+endif
+
 LOCAL_PATH := device/google/shusky
 
 $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)