diff --git a/common.mk b/common.mk
index eeb6846..018056a 100644
--- a/common.mk
+++ b/common.mk
@@ -4,8 +4,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Add common symlinks definitions for Qualcomm Samsung
-$(call inherit-product, hardware/samsung/symlinks/qcom-common.mk)
+# Add common symlinks definitions for Qualcomm
+$(call soong_config_set,rfs,mpss_firmware_symlink_target,firmware_modem)
+$(call inherit-product, hardware/qcom-caf/common/common.mk)
 
 # Enable project quotas and casefolding for emulated storage without sdcardfs
 $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)