diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk
index 5865a3e..6c80b2d 100644
--- a/bluejay/BoardConfig.mk
+++ b/bluejay/BoardConfig.mk
@@ -23,4 +23,4 @@ include device/google/gs101/wifi/BoardConfig-wifi.mk
 -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
 -include vendor/google_devices/bluejay/proprietary/BoardConfigVendor.mk
 
-SOONG_CONFIG_google3a_config_target_device := bluejay
+$(call soong_config_set,google3a_config,target_device,bluejay)
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 7b75578..5fdf2f7 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -41,8 +41,8 @@ else
 include device/google/gs101/fingerprint/udfps_factory.mk
 endif
 
-SOONG_CONFIG_lyric_tuning_product := bluejay
-SOONG_CONFIG_google3a_config_target_device := bluejay
+$(call soong_config_set,lyric,tuning_product,bluejay)
+$(call soong_config_set,google3a_config,target_device,bluejay)
 
 # Init files
 PRODUCT_COPY_FILES += \