diff --git a/system/telephony/Android.mk b/system/telephony/Android.mk
index 99c13a34..5054f753 100644
--- a/system/telephony/Android.mk
+++ b/system/telephony/Android.mk
@@ -18,13 +18,13 @@ ifneq (,$(filter telephony, $(TARGET_COMMON_QTI_COMPONENTS)))
 
 include $(CLEAR_VARS)
 
-IMS_LIBS := libimscamera_jni.so libimsmedia_jni.so
+IMS_LIBRARIES := libimscamera_jni.so libimsmedia_jni.so
 
-IMS_SYMLINKS := $(addprefix $(TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED)/ims/lib/arm64/,$(notdir $(IMS_LIBS)))
+IMS_SYMLINKS := $(addprefix $(TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED)/ims/lib/arm64/,$(notdir $(IMS_LIBRARIES)))
 $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@rm -rf $@
 	@mkdir -p $(dir $@)
-	$(hide) ln -sf $(TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES)/$(notdir $@) $@
+	@rm -rf $@
+	$(hide) ln -sf /system/system_ext/lib64/$(notdir $@) $@
 
 ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS)
 
diff --git a/system/wfd/Android.mk b/system/wfd/Android.mk
index f6c8b81c..ee674b68 100644
--- a/system/wfd/Android.mk
+++ b/system/wfd/Android.mk
@@ -18,11 +18,13 @@ ifneq (,$(filter wfd, $(TARGET_COMMON_QTI_COMPONENTS)))
 
 include $(CLEAR_VARS)
 
-WFDSERVICE_SYMLINKS := $(TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED)/WfdService/lib/arm64/
+WFDSERVICE_LIBRARIES := libwfdnative.so
+
+WFDSERVICE_SYMLINKS := $(addprefix $(TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED)/WfdService/lib/arm64/,$(notdir $(WFDSERVICE_LIBRARIES)))
 $(WFDSERVICE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@rm -rf $@
 	@mkdir -p $(dir $@)
-	$(hide) ln -sf $(TARGET_OUT_SYSTEM_EXT_SHARED_LIBRARIES)/libwfdnative.so $@/libwfdnative.so
+	@rm -rf $@
+	$(hide) ln -sf /system/system_ext/lib64/$(notdir $@) $@
 
 ALL_DEFAULT_INSTALLED_MODULES += $(WFDSERVICE_SYMLINKS)
 
diff --git a/vendor/telephony/Android.mk b/vendor/telephony/Android.mk
index b15afc6c..8e95f9f8 100644
--- a/vendor/telephony/Android.mk
+++ b/vendor/telephony/Android.mk
@@ -18,11 +18,13 @@ ifneq (,$(filter telephony, $(TARGET_COMMON_QTI_COMPONENTS)))
 
 include $(CLEAR_VARS)
 
-CNE_SYMLINKS := $(TARGET_OUT_VENDOR_APPS)/CneApp/lib/arm64/
+CNE_LIBRARIES := libvndfwk_detect_jni.qti.so
+
+CNE_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR_APPS)/CneApp/lib/arm64/,$(notdir $(CNE_LIBRARIES)))
 $(CNE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@rm -rf $@
 	@mkdir -p $(dir $@)
-	$(hide) ln -sf $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/libvndfwk_detect_jni.qti.so $@/libvndfwk_detect_jni.qti.so
+	@rm -rf $@
+	$(hide) ln -sf /vendor/lib64/$(notdir $@) $@
 
 ALL_DEFAULT_INSTALLED_MODULES += $(CNE_SYMLINKS)