diff --git a/bundle.json b/bundle.json
index 9df0c39342fdb30e1f77bddbe4bdecaf7865687c..cb25fe55146695998a928b636d5d671c4a799c5e 100644
--- a/bundle.json
+++ b/bundle.json
@@ -29,7 +29,6 @@
         "bounds_checking_function",
         "c_utils",
         "cJSON",
-        "common_event_service",
         "curl",
         "eventhandler",
         "hilog",
@@ -37,7 +36,6 @@
         "safwk",
         "samgr",
         "napi",
-        "startup_l2",
         "access_token",
         "hisysevent",
         "init",
@@ -46,7 +44,6 @@
         "mbedtls",
         "updater",
         "ability_base",
-        "ability_runtime",
         "netmanager_base",
         "openssl",
         "preferences",
diff --git a/foundations/ability/sa_loader/include/base_service_kits_impl.h b/foundations/ability/sa_loader/include/base_service_kits_impl.h
index 228707a08b76207e974c9cf9695cc27864d32d60..c3e5ae021f59dbfab54bf0338fa67d12cf2f83b1 100644
--- a/foundations/ability/sa_loader/include/base_service_kits_impl.h
+++ b/foundations/ability/sa_loader/include/base_service_kits_impl.h
@@ -124,9 +124,6 @@ template <typename SERVICE> void BaseServiceKitsImpl<SERVICE>::ResetService(cons
     }
     remoteServer_ = nullptr;
     deathRecipient_ = nullptr;
-    auto updateService = GetService(); //重新连接注册回调
-    ENGINE_LOGI("Remote is dead, do ResetService, reconnect service %{public}s",
-        (updateService != nullptr) ? "success" : "fail");
 }
 }
 #endif // BASE_SERVICE_KITS_IMPL_H
diff --git a/foundations/ability/utils/include/json_builder.h b/foundations/ability/utils/include/json_builder.h
index c00d28af68f36a708b5799eaa6b82f354c45a8e0..8e0161fe9e6bb85bc5f5b23d5ecbda53a736fa55 100644
--- a/foundations/ability/utils/include/json_builder.h
+++ b/foundations/ability/utils/include/json_builder.h
@@ -73,7 +73,7 @@ public:
         if (!valueList.empty()) {
             JsonBuilder jsonArray;
             jsonArray.Append("[");
-            for (size_t i = 0; i < valueListSize; i++) {
+            for (std::vector<JsonBuilder>::size_type i = 0; i < valueListSize; i++) {
                 jsonArray.Append(valueList[i].ToJson());
                 if (i != valueListSize - 1) {
                     jsonArray.Append(",");
diff --git a/interfaces/inner_api/modulemgr/modulemgr.gni b/interfaces/inner_api/modulemgr/modulemgr.gni
index c83cef7aa8692a983ebca1fb5a2ab8bfa07f9ff6..2540b9fc0725a85cc264a70c00f39b637ca76f2a 100644
--- a/interfaces/inner_api/modulemgr/modulemgr.gni
+++ b/interfaces/inner_api/modulemgr/modulemgr.gni
@@ -24,19 +24,15 @@ modulemgr_external_deps = [
   "safwk:system_ability_fwk",
 ]
 
-modulemgr_deps = []
+modulemgr_deps = [ "$updateengine_root_path/foundations:update_foundations" ]
 
 modulemgr_public_deps = []
 
-modulemgr_include = [
-  "$modulemgr_root_path/include",
-  "$updateengine_root_path/foundations/ability/log/include",
-]
+modulemgr_include = [ "$modulemgr_root_path/include" ]
 
 modulemgr_src = [
   "$modulemgr_root_path/src/update_service_module.cpp",
   "$modulemgr_root_path/src/module_manager.cpp",
-  "$updateengine_root_path/foundations/ability/log/src/update_log.cpp",
 ]
 
 modulemgr_cflags = [
diff --git a/services/core/ability/common/include/constant.h b/services/core/ability/common/include/constant.h
index 6319187806f20c82336d8381610f116286515a08..6df32e6df4b24b5daaf2c002a3dd9f69d2cfc85b 100644
--- a/services/core/ability/common/include/constant.h
+++ b/services/core/ability/common/include/constant.h
@@ -36,7 +36,7 @@ static const std::string DUPDATE_ENGINE_CONFIG_PATH = "/system/etc/update/dupdat
 // 存放升级引擎数据库、缓存等文件的加密路径
 static const std::string UPDATE_ENCRYPTED_ROOT_PATH = "/data/service/el1/public/update";
 static const std::string DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "/dupdate_engine";
-static const std::string DATABASES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/databases";
+static const std::string DATABASES_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "/update_service" + "/databases";
 static const std::string PREFERENCES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/preferences";
 static const std::string FILES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/files";
 
diff --git a/services/engine/etc/updater_sa.cfg b/services/engine/etc/updater_sa.cfg
index de4271cca246afcde596159f665907bd0a348928..8e4ccd9ae51e334f1a97580673569d775b279ce7 100644
--- a/services/engine/etc/updater_sa.cfg
+++ b/services/engine/etc/updater_sa.cfg
@@ -9,6 +9,8 @@
                 "mkdir /data/service/el1/public/update/dupdate_engine/files 0700 update update",
                 "mkdir /data/service/el1/public/update/dupdate_engine/files/firmware 0700 update update",
                 "mkdir /data/service/el1/public/update/dupdate_engine/files/firmware/changelogs 0700 update update",
+                "mkdir /data/service/el1/public/update/update_service 0700 update update",
+                "mkdir /data/service/el1/public/update/update_service/databases 0700 update update",
                 "mkdir /data/update 0770 update update",
                 "mkdir /data/update/ota_package 0770 update update",
                 "mkdir /data/update/ota_package/firmware 0770 update update",
diff --git a/services/firmware/data/db/src/firmware_database_empty.cpp b/services/firmware/data/db/src/firmware_database_empty.cpp
index 36621288bcde761040f916be58fd4757671b4a56..d10b6163a3c7e2abfb8efa2c9133dee8b5bd814a 100644
--- a/services/firmware/data/db/src/firmware_database_empty.cpp
+++ b/services/firmware/data/db/src/firmware_database_empty.cpp
@@ -16,7 +16,6 @@
 #include "firmware_database.h"
 
 #include "constant.h"
-#include "update_log.h"
 
 namespace OHOS {
 namespace UpdateEngine {