diff --git a/known_good.json b/known_good.json
index cedc0fd701e..b4e6e957e85 100644
--- a/known_good.json
+++ b/known_good.json
@@ -163,8 +163,7 @@
             },
             "score_config_management": {
                 "repo": "https://github.com/eclipse-score/config_management.git",
-                "docs": false,
-                "hash": "e0489b190ed6d2fa183b9a8063e2dba4f6378505",
+                "hash": "08b7156529967c3233d2474f4f332bc8b3796e10",
                 "bazel_patches": [
                     "//patches/config_management:001-adapt-proxy-api-and-remove-internal-targets.patch",
                     "//patches/config_management:002-migrate-baselibs-targets.patch"
@@ -175,11 +174,16 @@
                         "@score_config_management//score/config_management/config_daemon/code:score_variant=true"
                     ],
                     "exclude_test_targets": [
-                        "//score/config_management/config_daemon/code/factory/details:unit_test_mw_com",
-                        "//score/config_management/config_daemon/code/services/details/mw_com:unit_test",
-                        "//score/config_management/config_provider/code/config_provider/factory:unit_tests_mw_com",
-                        "//score/config_management/config_provider/code/proxies/details:unit_test_mw",
+                        "//score/config_management/config_provider:all",
+                        "//score/config_management/config_provider/code/config_provider/details/...",
+                        "//score/config_management/config_provider/code/config_provider/factory/...",
+                        "//score/config_management/config_provider/code/config_provider:unit_tests_host",
                         "//score/config_management/config_daemon/code:main_function_test",
+                        "//score/config_management/config_daemon/code:unit_tests_host",
+                        "//score/config_management/config_daemon:unit_tests_host",
+                        "//score/config_management/config_daemon/code:config_daemon",
+                        "//score/config_management/config_daemon/code/factory/details:unit_test_mw_com",
+                        "//score/config_management/config_daemon/code/factory:unit_tests_host",
                         "//score/config_management/dependability/..."
                     ],
                     "langs": [
diff --git a/patches/config_management/001-adapt-proxy-api-and-remove-internal-targets.patch b/patches/config_management/001-adapt-proxy-api-and-remove-internal-targets.patch
index de556089782..96c82f52079 100644
--- a/patches/config_management/001-adapt-proxy-api-and-remove-internal-targets.patch
+++ b/patches/config_management/001-adapt-proxy-api-and-remove-internal-targets.patch
@@ -1,73 +1,3 @@
-diff --git a/score/config_management/config_daemon/code/BUILD b/score/config_management/config_daemon/code/BUILD
-index 2917696..2ddcc60 100644
---- a/score/config_management/config_daemon/code/BUILD
-+++ b/score/config_management/config_daemon/code/BUILD
-@@ -76,6 +76,7 @@ cc_binary(
-     deps = [
-         "//score/config_management/config_daemon/code/app/details:app",
-         "//score/config_management/config_daemon/code/factory/details:mw_factory",
-+        "@score_lifecycle//score/launch_manager:lifecyclemanager_cc",
-         "@score_lifecycle//score/launch_manager:runapplication_cc",
-     ],
- )
-diff --git a/score/config_management/config_daemon/code/app/details/BUILD b/score/config_management/config_daemon/code/app/details/BUILD
-index 976bde7..9aeff36 100644
---- a/score/config_management/config_daemon/code/app/details/BUILD
-+++ b/score/config_management/config_daemon/code/app/details/BUILD
-@@ -52,6 +52,7 @@ cc_library(
-         "//score/config_management/config_daemon/code/factory:interface_for_unit_test",
-         "//score/config_management/config_daemon/code/fault_event_reporter",
-         "@score_baselibs//score/scope_exit",
-+        "@score_lifecycle//score/launch_manager:application_cc",
-         "@score_lifecycle//score/launch_manager:mock_application_context_cc",
-         "@score_logging//score/mw/log",
-     ],
-diff --git a/score/config_management/config_provider/BUILD b/score/config_management/config_provider/BUILD
-index e0d763b..0dd66b9 100644
---- a/score/config_management/config_provider/BUILD
-+++ b/score/config_management/config_provider/BUILD
-@@ -14,13 +14,6 @@ alias(
-     visibility = ["//visibility:public"],
- )
- 
--cc_library(
--    name = "config_provider_factory_impl",
--    tags = ["FUSA"],
--    visibility = ["//visibility:public"],
--    deps = ["//score/config_management/config_provider/code/config_provider/factory:factory_socal_r20_11"],
--)
--
- cc_library(
-     name = "config_provider_mw_com",
-     tags = ["FUSA"],
-@@ -28,12 +21,6 @@ cc_library(
-     deps = ["//score/config_management/config_provider/code/config_provider/factory:factory_mw_com"],
- )
- 
--alias(
--    name = "config_provider_factory_for_unit_test",
--    actual = "//score/config_management/config_provider/code/config_provider/factory:factory_socal_r20_11_for_unit_tests",
--    visibility = ["//visibility:public"],
--)
--
- cc_unit_test_suites_for_host_and_qnx(
-     name = "unit_tests",
-     test_suites_from_sub_packages = [
-@@ -45,14 +32,6 @@ cc_unit_test_suites_for_host_and_qnx(
-     visibility = ["//score/config_management:__pkg__"],
- )
- 
--test_suite(
--    name = "component_tests",
--    tests = [
--        "//score/config_management/config_provider/test/sct:component_tests",
--    ],
--    visibility = ["//score/config_management:__pkg__"],
--)
--
- clang_tidy_extra_checks(
-     name = "clang_tidy_extra_checks",
-     extra_features = [
 diff --git a/score/config_management/config_provider/code/config_provider/details/config_provider_impl.cpp b/score/config_management/config_provider/code/config_provider/details/config_provider_impl.cpp
 index 6784355..c6f05ea 100644
 --- a/score/config_management/config_provider/code/config_provider/details/config_provider_impl.cpp