diff --git a/bundle.json b/bundle.json
index d29fdf4c84a8dac65f2b0f245b19f6e6bdb42e77..076f65a96dffad4266d5228672a264346e36e999 100644
--- a/bundle.json
+++ b/bundle.json
@@ -42,9 +42,7 @@
           "os_account",
           "safwk",
           "samgr",
-          "security_guard"
-        ],
-        "third_party": [
+          "security_guard",
           "openssl"
         ]
       },
diff --git a/frameworks/cert_manager_standard/main/common/BUILD.gn b/frameworks/cert_manager_standard/main/common/BUILD.gn
index f06faf45376a0050f8f8d6ce95d20049287d33e1..eec54ea99a860ef29b10adb751dc29bbffe291a1 100644
--- a/frameworks/cert_manager_standard/main/common/BUILD.gn
+++ b/frameworks/cert_manager_standard/main/common/BUILD.gn
@@ -37,7 +37,6 @@ ohos_static_library("libcert_manager_common_standard_static") {
       [ ":cert_manager_config" ]  # Share include files for other gn when deps.
 
   include_dirs = [
-    "//third_party/openssl/include",
     "../../../../interfaces/innerkits/cert_manager_standard/main/include",
   ]
 
@@ -47,10 +46,11 @@ ohos_static_library("libcert_manager_common_standard_static") {
     "src/cm_x509.c",
   ]
 
-  deps = [ "//third_party/openssl:libcrypto_shared" ]
+  deps = []
   external_deps = [
     "c_utils:utils",
     "huks:libhukssdk",
+    "openssl:libcrypto_shared",
   ]
   cflags = [
     "-DHILOG_ENABLE",
diff --git a/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn b/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn
index b8429f58a00a8295a1612a232d2aee4c5669ac66..dd9f05d43a2e62a2a369f2621ee33d92ffe2e8e0 100644
--- a/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn
+++ b/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn
@@ -84,13 +84,13 @@ ohos_static_library("libcert_manager_ipc_client_static") {
   ]
   deps = [
     ":libcert_manager_log_mem_static",
-    "//third_party/openssl:libcrypto_shared",
   ]
   external_deps = [
     "c_utils:utils",
     "hilog:libhilog",
     "ipc:ipc_single",
     "samgr:samgr_proxy",
+    "openssl:libcrypto_shared",
   ]
   cflags_cc = [
     "-DHILOG_ENABLE",
diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn b/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn
index e7e3526d321474e2124551c5d4f1f2310c1a78bc..2809474b9e94679afb8a6c5e2e12435ffc8f8201 100644
--- a/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn
+++ b/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn
@@ -37,7 +37,6 @@ ohos_static_library("cert_manager_engine_core_standard") {
   ]
   include_dirs = [
     "../../../../../interfaces/innerkits/cert_manager_standard/main/include",
-    "//third_party/openssl/include",
   ]
   cflags = [
     "-Wall",
@@ -70,7 +69,6 @@ ohos_static_library("cert_manager_engine_core_standard") {
   deps = [
     "../../../../../frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static",
     "../../../../../frameworks/cert_manager_standard/main/os_dependency:libcert_manager_log_mem_static",
-    "//third_party/openssl:libcrypto_shared",
   ]
   external_deps = [
     "access_token:libaccesstoken_sdk",
@@ -78,5 +76,6 @@ ohos_static_library("cert_manager_engine_core_standard") {
     "c_utils:utils",
     "huks:libhukssdk",
     "ipc:ipc_core",
+    "openssl:libcrypto_shared",
   ]
 }
diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_updateflag.h b/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_updateflag.h
index c024436cc3f7e99dac73507c23ff34da3c0f0886..2fc7827b3a95709d861903a4c0a9d2d21998807c 100644
--- a/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_updateflag.h
+++ b/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_updateflag.h
@@ -18,7 +18,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "openssl/ossl_typ.h"
 #include "cm_type.h"
 
 #ifdef __cplusplus
@@ -77,4 +76,4 @@ int32_t CmBakeupAllSaUserCerts(void);
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn b/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn
index 008c10e7bff3e6ffcf4d5e23b1cbf81560be950d..3ce435f1df8bf682c50385fedc06bd231efb5850 100644
--- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn
+++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn
@@ -26,7 +26,6 @@ ohos_static_library("libcert_manager_service_os_dependency_standard_static") {
     ubsan = true
   }
   include_dirs = [
-    "//third_party/openssl/include",
     "../../../cert_manager_engine/main/core/include",
     "../../../../../interfaces/innerkits/cert_manager_standard/main/include",
   ]
@@ -40,7 +39,6 @@ ohos_static_library("libcert_manager_service_os_dependency_standard_static") {
     "../../../../../frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static",
     "../../../../../frameworks/cert_manager_standard/main/os_dependency:libcert_manager_log_mem_static",
     "idl:libcm_service_idl_standard_static",
-    "//third_party/openssl:libcrypto_shared",
   ]
 
   external_deps = [
diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn
index 0a3e3af91c34baadc834862db192488507412d15..1f70a3929afb4ef6de78b67c61256d07480a5b89 100644
--- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn
+++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn
@@ -31,7 +31,6 @@ ohos_static_library("libcm_service_idl_standard_static") {
     ubsan = true
   }
   include_dirs = [
-    "//third_party/openssl/include",
     "../../../../../../interfaces/innerkits/cert_manager_standard/main/include",
     "../../../../cert_manager_engine/main/core/include",
   ]
@@ -49,13 +48,13 @@ ohos_static_library("libcm_service_idl_standard_static") {
     "../../../../../../frameworks/cert_manager_standard/main/os_dependency:libcert_manager_log_mem_static",
     "../../hisysevent_wrapper:libcert_manager_hisysevent_wrapper_static",
     "../../security_guard_report:libcert_manager_sg_report_static",
-    "//third_party/openssl:libcrypto_shared",
   ]
   external_deps = [
     "c_utils:utils",
     "huks:libhukssdk",
     "ipc:ipc_core",
     "os_account:os_account_innerkits",
+    "openssl:libcrypto_shared",
   ]
 
   if (support_jsapi) {
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 42a66b8ce891f1e81943682a6292e2400607ab4e..071156e82eff2dcbb5becce6ef42683f05e08408 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -36,7 +36,6 @@ ohos_unittest("cm_sdk_test") {
   ]
 
   include_dirs = [
-    "//third_party/bounds_checking_function/include",
     "unittest/include",
   ]
   cflags_cc = [
@@ -57,15 +56,15 @@ ohos_unittest("cm_sdk_test") {
   deps = [
     "../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks",
     "../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk",
-    "//third_party/bounds_checking_function:libsec_static",
-    "//third_party/googletest:gtest_main",
-    "//third_party/openssl:libcrypto_shared",
   ]
   external_deps = [
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "c_utils:utils",
+    "bounds_checking_function:libsec_static",
+    "googletest:gtest",
+    "openssl:libcrypto_shared",
   ]
   resource_config_file = "./resource/certificate_manager/ohos_test.xml"
 
diff --git a/test/unittest/common_permission_test/BUILD.gn b/test/unittest/common_permission_test/BUILD.gn
index 604ea5879a2d5e7e98b82c0d815fb560f956496a..80851d9006a4b7e8368061c5334d1c0b0d800bba 100644
--- a/test/unittest/common_permission_test/BUILD.gn
+++ b/test/unittest/common_permission_test/BUILD.gn
@@ -24,7 +24,6 @@ ohos_unittest("cm_common_permission_test") {
 
   include_dirs = [
     "../include",
-    "//third_party/bounds_checking_function/include",
   ]
   cflags_cc = [
     "-Wall",
@@ -44,8 +43,6 @@ ohos_unittest("cm_common_permission_test") {
   deps = [
     "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks",
     "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk",
-    "//third_party/bounds_checking_function:libsec_static",
-    "//third_party/googletest:gtest_main",
   ]
   defines = [ "_CM_LOG_ENABLE_" ]
   external_deps = [
@@ -53,5 +50,7 @@ ohos_unittest("cm_common_permission_test") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "c_utils:utils",
+    "bounds_checking_function:libsec_static",
+    "googletest:gtest",
   ]
 }
diff --git a/test/unittest/inner_permission_test/BUILD.gn b/test/unittest/inner_permission_test/BUILD.gn
index 58786e88d22d1a3cc28087cc3a6ea7b1c7176cfc..798f03328d94825234a6b2484eabe054d8b3ae73 100644
--- a/test/unittest/inner_permission_test/BUILD.gn
+++ b/test/unittest/inner_permission_test/BUILD.gn
@@ -24,7 +24,6 @@ ohos_unittest("cm_inner_permission_test") {
 
   include_dirs = [
     "../include",
-    "//third_party/bounds_checking_function/include",
   ]
   cflags_cc = [
     "-Wall",
@@ -44,8 +43,6 @@ ohos_unittest("cm_inner_permission_test") {
   deps = [
     "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks",
     "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk",
-    "//third_party/bounds_checking_function:libsec_static",
-    "//third_party/googletest:gtest_main",
   ]
   defines = [ "_CM_LOG_ENABLE_" ]
   external_deps = [
@@ -53,5 +50,7 @@ ohos_unittest("cm_inner_permission_test") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "c_utils:utils",
+    "bounds_checking_function:libsec_static",
+    "googletest:gtest",
   ]
 }
diff --git a/test/unittest/module_test/BUILD.gn b/test/unittest/module_test/BUILD.gn
index 3c826554c5ba1d0bacff230159f818935b3fc0bc..8d4346c6dcf4cad25f0fdc35b984b969d10a415e 100644
--- a/test/unittest/module_test/BUILD.gn
+++ b/test/unittest/module_test/BUILD.gn
@@ -24,8 +24,6 @@ ohos_unittest("cm_module_test") {
   ]
 
   include_dirs = [
-    "//third_party/bounds_checking_function/include",
-    "//third_party/openssl/include",
     "include",
     "../include",
   ]
@@ -47,10 +45,12 @@ ohos_unittest("cm_module_test") {
   deps = [
     "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks",
     "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk",
-    "//third_party/bounds_checking_function:libsec_static",
-    "//third_party/googletest:gtest_main",
-    "//third_party/openssl:libcrypto_shared",
   ]
   defines = [ "_CM_LOG_ENABLE_" ]
-  external_deps = [ "c_utils:utils" ]
+  external_deps = [
+    "c_utils:utils",
+    "bounds_checking_function:libsec_static",
+    "googletest:gtest",
+    "openssl:libcrypto_shared",
+  ]
 }
diff --git a/test/unittest/multi_thread_test/BUILD.gn b/test/unittest/multi_thread_test/BUILD.gn
index d41f4144f45c7883dbe5129d06ec88969c64cc0e..9d4b5a9f5ba07edd73a1fda5a85b441f60e5a7ad 100644
--- a/test/unittest/multi_thread_test/BUILD.gn
+++ b/test/unittest/multi_thread_test/BUILD.gn
@@ -27,7 +27,6 @@ ohos_unittest("cm_multi_thread_test") {
 
   include_dirs = [
     "../include",
-    "//third_party/bounds_checking_function/include",
   ]
   cflags_cc = [
     "-Wall",
@@ -47,8 +46,6 @@ ohos_unittest("cm_multi_thread_test") {
   deps = [
     "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks",
     "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk",
-    "//third_party/bounds_checking_function:libsec_static",
-    "//third_party/googletest:gtest_main",
   ]
   defines = [ "_CM_LOG_ENABLE_" ]
   external_deps = [
@@ -56,5 +53,7 @@ ohos_unittest("cm_multi_thread_test") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "c_utils:utils",
+    "bounds_checking_function:libsec_static",
+    "googletest:gtest",
   ]
 }