diff --git a/device-caiman.mk b/device-caiman.mk
index 4b833252..2170b9af 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -20,7 +20,7 @@ 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_BOOTLOADER_CAIMAN_DIR ?= 24Q3-12386881# 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))
 
@@ -28,8 +28,8 @@ ifdef RELEASE_KERNEL_CAIMAN_DIR
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_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
+TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24Q3-12386881
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24Q3-12386881/kernel-headers
 endif
 
 LOCAL_PATH := device/google/caimito
diff --git a/device-komodo.mk b/device-komodo.mk
index 30d54d61..ce21e5bc 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -20,7 +20,7 @@ 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_BOOTLOADER_KOMODO_DIR ?= 24Q3-12386881# 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))
 
@@ -28,8 +28,8 @@ ifdef RELEASE_KERNEL_KOMODO_DIR
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_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
+TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24Q3-12386881
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24Q3-12386881/kernel-headers
 endif
 
 LOCAL_PATH := device/google/caimito
diff --git a/device-tokay.mk b/device-tokay.mk
index c65bc593..bcad4ab3 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -20,7 +20,7 @@ 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_BOOTLOADER_TOKAY_DIR ?= 24Q3-12386881# 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))
 
@@ -28,8 +28,8 @@ ifdef RELEASE_KERNEL_TOKAY_DIR
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_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
+TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24Q3-12386881
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24Q3-12386881/kernel-headers
 endif
 
 $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-tokay.mk)