diff --git a/device-caiman.mk b/device-caiman.mk
index 9605c87b..2898abcc 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -26,6 +26,12 @@ RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24D1# Keep this for pdk TODO: b/32711900
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR)
 $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR))
 
+ifdef RELEASE_KERNEL_CAIMAN_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CAIMAN_VERSION)
+else
+TARGET_LINUX_KERNEL_VERSION ?= 6.1
+endif
+
 ifdef RELEASE_KERNEL_CAIMAN_DIR
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers
diff --git a/device-komodo.mk b/device-komodo.mk
index f4e0ec37..62f1af37 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -26,6 +26,12 @@ RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24D1# Keep this for pdk TODO: b/32711900
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR)
 $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR))
 
+ifdef RELEASE_KERNEL_KOMODO_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_KOMODO_VERSION)
+else
+TARGET_LINUX_KERNEL_VERSION ?= 6.1
+endif
+
 ifdef RELEASE_KERNEL_KOMODO_DIR
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers
diff --git a/device-tokay.mk b/device-tokay.mk
index e86f495c..b576bbb4 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -26,6 +26,12 @@ RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR)
 $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR))
 
+ifdef RELEASE_KERNEL_TOKAY_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_TOKAY_VERSION)
+else
+TARGET_LINUX_KERNEL_VERSION ?= 6.1
+endif
+
 ifdef RELEASE_KERNEL_TOKAY_DIR
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers