diff --git a/share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake b/share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake
index 304211ba..7026ebaa 100644
--- a/share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake
+++ b/share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake
@@ -315,7 +315,7 @@ function(rocm_write_package_deps CONFIG_TEMPLATE)
     set(DEPENDS ${ARGN})
     rocm_list_split(DEPENDS PACKAGE DEPENDS_LIST)
     foreach(DEPEND ${DEPENDS_LIST})
-        rocm_write_package_template_function(${CONFIG_TEMPLATE} find_dependency ${${DEPEND}})
+        rocm_write_package_template_function(${CONFIG_TEMPLATE} find_dependency ${${DEPEND}} HINTS "\"\${PACKAGE_PREFIX_DIR}\"")
     endforeach()
 endfunction()
 
diff --git a/share/rocmcmakebuildtools/cmake/ROCMPackageConfigHelpers.cmake b/share/rocmcmakebuildtools/cmake/ROCMPackageConfigHelpers.cmake
index f15bfb94..ac57f869 100644
--- a/share/rocmcmakebuildtools/cmake/ROCMPackageConfigHelpers.cmake
+++ b/share/rocmcmakebuildtools/cmake/ROCMPackageConfigHelpers.cmake
@@ -87,10 +87,6 @@ include(CMakeFindDependencyMacro OPTIONAL RESULT_VARIABLE _ROCMCMakeFindDependen
 if (NOT _ROCMCMakeFindDependencyMacro_FOUND)
     macro(find_dependency dep)
         if (NOT \${dep}_FOUND)
-            set(rocm_fd_version)
-            if (\${ARGC} GREATER 1)
-                set(rocm_fd_version \${ARGV1})
-            endif()
             set(rocm_fd_exact_arg)
             if(\${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION_EXACT)
                 set(rocm_fd_exact_arg EXACT)
@@ -103,7 +99,7 @@ if (NOT _ROCMCMakeFindDependencyMacro_FOUND)
             if(\${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
                 set(rocm_fd_required_arg REQUIRED)
             endif()
-            find_package(\${dep} \${rocm_fd_version}
+            find_package(\${dep} \${ARGN}
                 \${rocm_fd_exact_arg}
                 \${rocm_fd_quiet_arg}
                 \${rocm_fd_required_arg}