diff --git a/device-caiman.mk b/device-caiman.mk
index 17d7a5fc..eff9321b 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -14,8 +14,23 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR ?= device/google/caimito-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers
+ifdef RELEASE_GOOGLE_CAIMAN_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIO_DIR)
+endif
+ifdef RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR
+RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
+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_GOOGLE_CAIMAN_KERNEL_DIR
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
+endif
 
 LOCAL_PATH := device/google/caimito
 
diff --git a/device-komodo.mk b/device-komodo.mk
index 0e5f9691..2a8f957e 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -14,8 +14,23 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR ?= device/google/caimito-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers
+ifdef RELEASE_GOOGLE_KOMODO_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_KOMODO_RADIO_DIR)
+endif
+ifdef RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR
+RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
+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_GOOGLE_KOMODO_KERNEL_DIR
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
+endif
 
 LOCAL_PATH := device/google/caimito
 
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index 8cf2cfa1..998020cc 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -14,8 +14,23 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR ?= device/google/caimito-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers
+ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR)
+endif
+ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIOCFG_DIR
+RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIOCFG_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR)
+$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR))
+
+ifdef RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
+endif
 
 $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-ripcurrent24.mk)
 $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk)
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index 4c6b4d5e..cfbf96f8 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -14,8 +14,23 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR ?= device/google/caimito-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers
+ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR)
+endif
+ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIOCFG_DIR
+RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIOCFG_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR)
+$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR))
+
+ifdef RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
+endif
 
 USE_SWIFTSHADER := false
 BOARD_USES_SWIFTSHADER := false
diff --git a/device-tokay.mk b/device-tokay.mk
index 7473ccba..8cfe560f 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -14,8 +14,23 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR ?= device/google/caimito-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers
+ifdef RELEASE_GOOGLE_TOKAY_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIO_DIR)
+endif
+ifdef RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR
+RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR)
+endif
+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_GOOGLE_TOKAY_KERNEL_DIR
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
+endif
 
 $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-tokay.mk)
 $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk)