diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07649958af..32d9a2e5b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -500,13 +500,15 @@ function(unpack_db db_bzip2_file)
 endfunction()
 
 file(GLOB PERF_DB_BZIP_FILES CONFIGURE_DEPENDS "${KERNELS_SOURCE_DIR}/*.db.bz2")
-foreach(DB_BZIP_FILE ${PERF_DB_BZIP_FILES})
-    unpack_db(${DB_BZIP_FILE})
-endforeach()
-
 file(GLOB FIND_DB_BZIP_FILES CONFIGURE_DEPENDS "${KERNELS_SOURCE_DIR}/*.fdb.txt.bz2")
-foreach(DB_BZIP_FILE ${FIND_DB_BZIP_FILES})
+
+foreach(DB_BZIP_FILE ${PERF_DB_BZIP_FILES} ${FIND_DB_BZIP_FILES})
     unpack_db(${DB_BZIP_FILE})
+    get_filename_component(__fname ${DB_BZIP_FILE} NAME_WLE)
+    if(MIOPEN_EMBED_DB STREQUAL "" AND NOT MIOPEN_DISABLE_SYSDB AND NOT ENABLE_ASAN_PACKAGING)
+        install(FILES ${KERNELS_BINARY_DIR}/${__fname}
+                DESTINATION ${DATABASE_INSTALL_DIR})
+    endif()
 endforeach()
 
 # Begin KDB package creation
@@ -519,12 +521,13 @@ function(install_kdb FILE_NAME COMPONENT_NAME)
     else()
         unpack_db(${FILE_NAME})
         if( NOT ENABLE_ASAN_PACKAGING )
+            if( NOT MIOPEN_TEST_DBSYNC )
+                set(__component_name COMPONENT ${COMPONENT_NAME})
+            endif()
             rocm_install(FILES ${KERNELS_BINARY_DIR}/${__fname}
                          DESTINATION ${DATABASE_INSTALL_DIR}
-                         COMPONENT ${COMPONENT_NAME})
+                         ${__component_name})
         endif()
-        set(CPACK_COMPONENTS_ALL
-            "${CPACK_COMPONENTS_ALL};${__component}" PARENT_SCOPE)
     endif()
     set(LFS_MISSING_FILES ${LFS_MISSING_FILES} PARENT_SCOPE)
 endfunction()
@@ -552,6 +555,8 @@ if(LFS_MISSING_FILES)
     string(REPLACE ";" ", " __lfs_missing_files "${LFS_MISSING_FILES}")
     message(WARNING "GIT LFS files not pulled down, skipped: ${__lfs_missing_files}")
     set(MIOPEN_NO_LFS_PULLED TRUE CACHE INTERNAL "")
+else()
+    set(CPACK_COMPONENTS_ALL ${COMPONENT_LST})
 endif()
 
 # End KDB package creation
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 652bc4c246..0741a60234 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -894,13 +894,12 @@ if(NOT MIOPEN_EMBED_DB STREQUAL "")
         if(MIOPEN_NO_LFS_PULLED)
             message(WARNING "Binary cache files have not been pulled down from git-lfs, will not embed.")
         else()
-            set(MIOPEN_BINCACHE_PATH "${CMAKE_SOURCE_DIR}/src/kernels")
+            set(MIOPEN_BINCACHE_PATH ${KERNELS_BINARY_DIR})
             message("MIOPEN_BINCACHE_PATH: ${MIOPEN_BINCACHE_PATH}")
         endif()
     else()
         message(WARNING "MIOPEN_EMBED_BINCACHE is set and MIOPEN_BINCACHE_PATH was used to override default binary cache files. Proceed at your own risk!")
     endif()
-    set(CODE_OBJECTS)
 # embed find db
     foreach(EMBED_ARCH ${MIOPEN_EMBED_DB})
         message(STATUS "Adding find db for arch: ${EMBED_ARCH}")
@@ -918,27 +917,6 @@ if(NOT MIOPEN_EMBED_DB STREQUAL "")
     endif()
     add_embed_library(miopen_data ${CODE_OBJECTS})
     target_link_libraries(MIOpen PRIVATE $<BUILD_INTERFACE:miopen_data> )
-else()
-    file(GLOB FIND_DB_FILES ${PROJECT_BINARY_DIR}/${DATABASE_INSTALL_DIR}/*.fdb.txt)
-    file(GLOB PERF_DB_FILES ${PROJECT_BINARY_DIR}/${DATABASE_INSTALL_DIR}/*.db)
-    file(GLOB KERN_DB_FILES ${PROJECT_BINARY_DIR}/${DATABASE_INSTALL_DIR}/*.kdb)
-    list(APPEND FIND_DB_FILES ${PERF_DB_FILES})
-# Install the kdb files for the kdb sync test only, a better approach would be to 
-# install the kdb package instead
-if(MIOPEN_TEST_DBSYNC)
-    list(APPEND FIND_DB_FILES ${KERN_DB_FILES})
-endif()
-    if(NOT MIOPEN_DISABLE_SYSDB)
-        if( NOT ENABLE_ASAN_PACKAGING )
-          install(FILES
-              ${FIND_DB_FILES}
-              DESTINATION ${DATABASE_INSTALL_DIR})
-        endif()
-        foreach(DB_FILE ${FIND_DB_FILES})
-            get_filename_component(DB_FILE_FILENAME "${DB_FILE}" NAME)
-	        configure_file("${DB_FILE}" "${PROJECT_BINARY_DIR}/${DATABASE_INSTALL_DIR}/${DB_FILE_FILENAME}" COPYONLY)
-        endforeach()
-    endif()
 endif()
 
 if(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY)