diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk
index 5880d5b..66bf1a4 100644
--- a/cheetah/BoardConfig.mk
+++ b/cheetah/BoardConfig.mk
@@ -17,6 +17,9 @@
 # Enable load module in parallel
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR)
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_CHEETAH_BOOTLOADER_DIR)
+
 # The modules which need to be loaded in sequential
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 
diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk
index d8b7444..c11cb43 100644
--- a/panther/BoardConfig.mk
+++ b/panther/BoardConfig.mk
@@ -20,6 +20,9 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
 # The modules which need to be loaded in sequential
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR)
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_PANTHER_BOOTLOADER_DIR)
+
 ifdef PHONE_CAR_BOARD_PRODUCT
     include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
 else