diff --git a/device-cheetah.mk b/device-cheetah.mk
index fc9f725..3759ccb 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -36,6 +36,8 @@ ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),)
 include device/google/pantah/uwb/uwb_calibration.mk
 endif
 
+# go/lyric-soong-variables
+$(call soong_config_set,lyric,camera_hardware,cheetah)
 $(call soong_config_set,lyric,tuning_product,cheetah)
 $(call soong_config_set,google3a_config,target_device,cheetah)
 
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index d9c6bd5..1b63578 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -28,6 +28,8 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
+# go/lyric-soong-variables
+$(call soong_config_set,lyric,camera_hardware,cloudripper)
 $(call soong_config_set,lyric,tuning_product,cloudripper)
 $(call soong_config_set,google3a_config,target_device,cloudripper)
 
diff --git a/device-panther.mk b/device-panther.mk
index dcadae4..e053afb 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -32,6 +32,8 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs101/bluetooth/bluetooth.mk
 
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml
+# go/lyric-soong-variables
+$(call soong_config_set,lyric,camera_hardware,panther)
 $(call soong_config_set,lyric,tuning_product,panther)
 $(call soong_config_set,google3a_config,target_device,panther)
 
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index c18b4eb..f8ef6dc 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -33,6 +33,8 @@ include device/google/gs101/uwb/uwb.mk
 include device/google/pantah/uwb/uwb_calibration.mk
 endif
 
+# go/lyric-soong-variables
+$(call soong_config_set,lyric,camera_hardware,ravenclaw)
 $(call soong_config_set,lyric,tuning_product,cloudripper)
 $(call soong_config_set,google3a_config,target_device,cloudripper)