diff --git a/device-comet.mk b/device-comet.mk
index 6a7be7a..701f884 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -14,8 +14,25 @@
 # limitations under the License.
 #
 
-TARGET_KERNEL_DIR ?= device/google/comet-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/comet-kernel/kernel-headers
+ifdef RELEASE_GOOGLE_COMET_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR)
+endif
+ifdef RELEASE_GOOGLE_COMET_RADIOCFG_DIR
+RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_COMET_RADIOCFG_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_COMET_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR)
+$(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR))
+
+
+ifdef RELEASE_GOOGLE_COMET_KERNEL_DIR
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/comet-kernels/6.1/24D1
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/comet-kernels/6.1/24D1/kernel-headers
+endif
+
 TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))