diff --git a/device-lynx.mk b/device-lynx.mk
index 0b74eb9..349b938 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -26,8 +26,8 @@ include device/google/gs201/device-shipping-common.mk
 include device/google/lynx/audio/lynx/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 
-SOONG_CONFIG_lyric_tuning_product := cloudripper
-SOONG_CONFIG_google3a_config_target_device := cloudripper
+$(call soong_config_set,lyric,tuning_product,cloudripper)
+$(call soong_config_set,google3a_config,target_device,cloudripper)
 
 # Init files
 PRODUCT_COPY_FILES += \