diff --git a/projects/hip/packaging/hip-targets-release.cmake b/projects/hip/packaging/hip-targets-release.cmake
index abdbbbee35..735f56ef26 100644
--- a/projects/hip/packaging/hip-targets-release.cmake
+++ b/projects/hip/packaging/hip-targets-release.cmake
@@ -20,6 +20,7 @@ set_target_properties(hip::hip_hcc_static PROPERTIES
 else()
 set_target_properties(hip::hip_hcc_static PROPERTIES
   IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+  IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE "hc_am"
   IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libhip_hcc_static.a"
   )
 endif()
@@ -36,6 +37,7 @@ set_target_properties(hip::hip_hcc PROPERTIES
   )
 else()
 set_target_properties(hip::hip_hcc PROPERTIES
+  IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE "hcc::hccrt;hcc::hc_am"
   IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libhip_hcc.so"
   IMPORTED_SONAME_RELEASE "libhip_hcc.so"
   )
diff --git a/projects/hip/packaging/hip-targets.cmake b/projects/hip/packaging/hip-targets.cmake
index b3cbbcec96..955ad93b6c 100644
--- a/projects/hip/packaging/hip-targets.cmake
+++ b/projects/hip/packaging/hip-targets.cmake
@@ -26,9 +26,6 @@ foreach(_expectedTarget hip::hip_hcc_static hip::hip_hcc hip::host hip::device)
   endif()
 endforeach()
 if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
-  unset(_targetsDefined)
-  unset(_targetsNotDefined)
-  unset(_expectedTargets)
   set(CMAKE_IMPORT_FILE_VERSION)
   cmake_policy(POP)
   return()
@@ -50,7 +47,6 @@ endif()
 get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
 get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH)
 
-
 # Create imported target hip::hip_hcc_static
 add_library(hip::hip_hcc_static STATIC IMPORTED)