diff --git a/device-cheetah.mk b/device-cheetah.mk
index eb5b3d7..9f69170 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -35,6 +35,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 09e7211..439310f 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -27,6 +27,8 @@ include device/google/pantah/audio/cloudripper/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 
+# 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 48f570a..3c4ad3f 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -31,6 +31,8 @@ include device/google/gs201/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 
+# 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 30cb1e9..eb00889 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -32,6 +32,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)