Intermediate changes

55 files changed, 175 insertions, 69 deletions

diff --git a/library/cpp/actors/core/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/core/ut/CMakeLists.darwin-x86_64.txt
index 1401f8b097c..ef83a150ec2 100644
--- a/library/cpp/actors/core/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/core/ut/CMakeLists.darwin-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-core-ut PRIVATE
 target_link_libraries(library-cpp-actors-core-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -83,4 +82,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-core-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-core-ut)
diff --git a/library/cpp/actors/core/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/core/ut/CMakeLists.linux-aarch64.txt
index dace67d9aa8..768f9af719b 100644
--- a/library/cpp/actors/core/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/core/ut/CMakeLists.linux-aarch64.txt
@@ -15,7 +15,6 @@ target_link_libraries(library-cpp-actors-core-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   cpp-testing-unittest_main
   cpp-actors-core
   cpp-actors-interconnect
@@ -86,4 +85,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-core-ut
+  cpp-malloc-jemalloc
+)
 vcs_info(library-cpp-actors-core-ut)
diff --git a/library/cpp/actors/core/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/core/ut/CMakeLists.linux-x86_64.txt
index 9ebb40c8c7c..f2b6f3e3056 100644
--- a/library/cpp/actors/core/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/core/ut/CMakeLists.linux-x86_64.txt
@@ -15,8 +15,6 @@ target_link_libraries(library-cpp-actors-core-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -88,4 +86,8 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-core-ut
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(library-cpp-actors-core-ut)
diff --git a/library/cpp/actors/core/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/core/ut/CMakeLists.windows-x86_64.txt
index d5288ca703e..bc26cc7c5d1 100644
--- a/library/cpp/actors/core/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/core/ut/CMakeLists.windows-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-core-ut PRIVATE
 target_link_libraries(library-cpp-actors-core-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -76,4 +75,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-core-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-core-ut)
diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt
index c1b0239d7f9..9e092bba80b 100644
--- a/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt
@@ -15,7 +15,6 @@ target_include_directories(library-cpp-actors-dnsresolver-ut PRIVATE
 target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-dnsresolver
@@ -66,4 +65,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-dnsresolver-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-dnsresolver-ut)
diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt
index 2d65fdbaf0f..c8eb27acd0f 100644
--- a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt
@@ -16,7 +16,6 @@ target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   cpp-testing-unittest_main
   cpp-actors-dnsresolver
   cpp-actors-testlib
@@ -69,4 +68,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-dnsresolver-ut
+  cpp-malloc-jemalloc
+)
 vcs_info(library-cpp-actors-dnsresolver-ut)
diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt
index 79ad14cc21d..eae7bc85a39 100644
--- a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt
@@ -16,8 +16,6 @@ target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-dnsresolver
@@ -71,4 +69,8 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-dnsresolver-ut
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(library-cpp-actors-dnsresolver-ut)
diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt
index 05a043ead4e..7705d206a38 100644
--- a/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt
@@ -15,7 +15,6 @@ target_include_directories(library-cpp-actors-dnsresolver-ut PRIVATE
 target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-dnsresolver
@@ -59,4 +58,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-dnsresolver-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-dnsresolver-ut)
diff --git a/library/cpp/actors/examples/01_ping_pong/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/examples/01_ping_pong/CMakeLists.darwin-x86_64.txt
index 0c4009e1d5d..1e053eb6b49 100644
--- a/library/cpp/actors/examples/01_ping_pong/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/examples/01_ping_pong/CMakeLists.darwin-x86_64.txt
@@ -11,7 +11,6 @@ add_executable(example_01_ping_pong)
 target_link_libraries(example_01_ping_pong PUBLIC
   contrib-libs-cxxsupp
   yutil
-  library-cpp-lfalloc
   library-cpp-cpuid_check
   cpp-actors-core
 )
@@ -25,4 +24,7 @@ target_link_options(example_01_ping_pong PRIVATE
 target_sources(example_01_ping_pong PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/01_ping_pong/main.cpp
 )
+target_allocator(example_01_ping_pong
+  library-cpp-lfalloc
+)
 vcs_info(example_01_ping_pong)
diff --git a/library/cpp/actors/examples/01_ping_pong/CMakeLists.linux-aarch64.txt b/library/cpp/actors/examples/01_ping_pong/CMakeLists.linux-aarch64.txt
index d37268db3b7..5884f062610 100644
--- a/library/cpp/actors/examples/01_ping_pong/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/examples/01_ping_pong/CMakeLists.linux-aarch64.txt
@@ -12,7 +12,6 @@ target_link_libraries(example_01_ping_pong PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  library-cpp-lfalloc
   cpp-actors-core
 )
 target_link_options(example_01_ping_pong PRIVATE
@@ -28,4 +27,7 @@ target_link_options(example_01_ping_pong PRIVATE
 target_sources(example_01_ping_pong PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/01_ping_pong/main.cpp
 )
+target_allocator(example_01_ping_pong
+  library-cpp-lfalloc
+)
 vcs_info(example_01_ping_pong)
diff --git a/library/cpp/actors/examples/01_ping_pong/CMakeLists.linux-x86_64.txt b/library/cpp/actors/examples/01_ping_pong/CMakeLists.linux-x86_64.txt
index 79067f5ead7..73209820291 100644
--- a/library/cpp/actors/examples/01_ping_pong/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/examples/01_ping_pong/CMakeLists.linux-x86_64.txt
@@ -12,7 +12,6 @@ target_link_libraries(example_01_ping_pong PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  library-cpp-lfalloc
   library-cpp-cpuid_check
   cpp-actors-core
 )
@@ -29,4 +28,7 @@ target_link_options(example_01_ping_pong PRIVATE
 target_sources(example_01_ping_pong PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/01_ping_pong/main.cpp
 )
+target_allocator(example_01_ping_pong
+  library-cpp-lfalloc
+)
 vcs_info(example_01_ping_pong)
diff --git a/library/cpp/actors/examples/01_ping_pong/CMakeLists.windows-x86_64.txt b/library/cpp/actors/examples/01_ping_pong/CMakeLists.windows-x86_64.txt
index af8b315ee34..22c41768c9b 100644
--- a/library/cpp/actors/examples/01_ping_pong/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/examples/01_ping_pong/CMakeLists.windows-x86_64.txt
@@ -11,11 +11,13 @@ add_executable(example_01_ping_pong)
 target_link_libraries(example_01_ping_pong PUBLIC
   contrib-libs-cxxsupp
   yutil
-  library-cpp-lfalloc
   library-cpp-cpuid_check
   cpp-actors-core
 )
 target_sources(example_01_ping_pong PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/01_ping_pong/main.cpp
 )
+target_allocator(example_01_ping_pong
+  library-cpp-lfalloc
+)
 vcs_info(example_01_ping_pong)
diff --git a/library/cpp/actors/examples/02_discovery/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/examples/02_discovery/CMakeLists.darwin-x86_64.txt
index 84c1a6dc913..6d3a2ddc542 100644
--- a/library/cpp/actors/examples/02_discovery/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/examples/02_discovery/CMakeLists.darwin-x86_64.txt
@@ -23,7 +23,6 @@ add_executable(example_02_discovery)
 target_link_libraries(example_02_discovery PUBLIC
   contrib-libs-cxxsupp
   yutil
-  library-cpp-lfalloc
   library-cpp-cpuid_check
   cpp-actors-core
   cpp-actors-dnsresolver
@@ -48,6 +47,9 @@ target_sources(example_02_discovery PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/02_discovery/publish.cpp
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/02_discovery/replica.cpp
 )
+target_allocator(example_02_discovery
+  library-cpp-lfalloc
+)
 target_proto_addincls(example_02_discovery
   ./
   ${CMAKE_SOURCE_DIR}/
diff --git a/library/cpp/actors/examples/02_discovery/CMakeLists.linux-aarch64.txt b/library/cpp/actors/examples/02_discovery/CMakeLists.linux-aarch64.txt
index 9f53b255761..8bfd3443010 100644
--- a/library/cpp/actors/examples/02_discovery/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/examples/02_discovery/CMakeLists.linux-aarch64.txt
@@ -24,7 +24,6 @@ target_link_libraries(example_02_discovery PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  library-cpp-lfalloc
   cpp-actors-core
   cpp-actors-dnsresolver
   cpp-actors-interconnect
@@ -51,6 +50,9 @@ target_sources(example_02_discovery PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/02_discovery/publish.cpp
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/02_discovery/replica.cpp
 )
+target_allocator(example_02_discovery
+  library-cpp-lfalloc
+)
 target_proto_addincls(example_02_discovery
   ./
   ${CMAKE_SOURCE_DIR}/
diff --git a/library/cpp/actors/examples/02_discovery/CMakeLists.linux-x86_64.txt b/library/cpp/actors/examples/02_discovery/CMakeLists.linux-x86_64.txt
index 934f3d6b086..34d2610a7db 100644
--- a/library/cpp/actors/examples/02_discovery/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/examples/02_discovery/CMakeLists.linux-x86_64.txt
@@ -24,7 +24,6 @@ target_link_libraries(example_02_discovery PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  library-cpp-lfalloc
   library-cpp-cpuid_check
   cpp-actors-core
   cpp-actors-dnsresolver
@@ -52,6 +51,9 @@ target_sources(example_02_discovery PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/02_discovery/publish.cpp
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/02_discovery/replica.cpp
 )
+target_allocator(example_02_discovery
+  library-cpp-lfalloc
+)
 target_proto_addincls(example_02_discovery
   ./
   ${CMAKE_SOURCE_DIR}/
diff --git a/library/cpp/actors/examples/02_discovery/CMakeLists.windows-x86_64.txt b/library/cpp/actors/examples/02_discovery/CMakeLists.windows-x86_64.txt
index 0e4c17401b4..2168520e191 100644
--- a/library/cpp/actors/examples/02_discovery/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/examples/02_discovery/CMakeLists.windows-x86_64.txt
@@ -23,7 +23,6 @@ add_executable(example_02_discovery)
 target_link_libraries(example_02_discovery PUBLIC
   contrib-libs-cxxsupp
   yutil
-  library-cpp-lfalloc
   library-cpp-cpuid_check
   cpp-actors-core
   cpp-actors-dnsresolver
@@ -41,6 +40,9 @@ target_sources(example_02_discovery PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/02_discovery/publish.cpp
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/examples/02_discovery/replica.cpp
 )
+target_allocator(example_02_discovery
+  library-cpp-lfalloc
+)
 target_proto_addincls(example_02_discovery
   ./
   ${CMAKE_SOURCE_DIR}/
diff --git a/library/cpp/actors/helpers/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/helpers/ut/CMakeLists.darwin-x86_64.txt
index e5e023adf87..126b29e5748 100644
--- a/library/cpp/actors/helpers/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/helpers/ut/CMakeLists.darwin-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-helpers-ut PRIVATE
 target_link_libraries(library-cpp-actors-helpers-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-helpers
@@ -72,4 +71,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-helpers-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-helpers-ut)
diff --git a/library/cpp/actors/helpers/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/helpers/ut/CMakeLists.linux-aarch64.txt
index 7222f8dc5c9..24da0dacd6f 100644
--- a/library/cpp/actors/helpers/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/helpers/ut/CMakeLists.linux-aarch64.txt
@@ -15,7 +15,6 @@ target_link_libraries(library-cpp-actors-helpers-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   cpp-testing-unittest_main
   cpp-actors-helpers
   cpp-actors-interconnect
@@ -75,4 +74,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-helpers-ut
+  cpp-malloc-jemalloc
+)
 vcs_info(library-cpp-actors-helpers-ut)
diff --git a/library/cpp/actors/helpers/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/helpers/ut/CMakeLists.linux-x86_64.txt
index e2894e9b9d1..db118dc91ea 100644
--- a/library/cpp/actors/helpers/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/helpers/ut/CMakeLists.linux-x86_64.txt
@@ -15,8 +15,6 @@ target_link_libraries(library-cpp-actors-helpers-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-helpers
@@ -77,4 +75,8 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-helpers-ut
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(library-cpp-actors-helpers-ut)
diff --git a/library/cpp/actors/helpers/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/helpers/ut/CMakeLists.windows-x86_64.txt
index aa3e413f046..7e68870a0ea 100644
--- a/library/cpp/actors/helpers/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/helpers/ut/CMakeLists.windows-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-helpers-ut PRIVATE
 target_link_libraries(library-cpp-actors-helpers-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-helpers
@@ -65,4 +64,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-helpers-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-helpers-ut)
diff --git a/library/cpp/actors/http/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/http/ut/CMakeLists.darwin-x86_64.txt
index f52dc3175d5..99677acae5e 100644
--- a/library/cpp/actors/http/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/http/ut/CMakeLists.darwin-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-http-ut PRIVATE
 target_link_libraries(library-cpp-actors-http-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-http
@@ -63,4 +62,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-http-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-http-ut)
diff --git a/library/cpp/actors/http/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/http/ut/CMakeLists.linux-aarch64.txt
index 15c2e22dc58..8818e4418fe 100644
--- a/library/cpp/actors/http/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/http/ut/CMakeLists.linux-aarch64.txt
@@ -15,7 +15,6 @@ target_link_libraries(library-cpp-actors-http-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   cpp-testing-unittest_main
   cpp-actors-http
   cpp-actors-testlib
@@ -66,4 +65,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-http-ut
+  cpp-malloc-jemalloc
+)
 vcs_info(library-cpp-actors-http-ut)
diff --git a/library/cpp/actors/http/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/http/ut/CMakeLists.linux-x86_64.txt
index 1190cc58f33..620f66ad003 100644
--- a/library/cpp/actors/http/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/http/ut/CMakeLists.linux-x86_64.txt
@@ -15,8 +15,6 @@ target_link_libraries(library-cpp-actors-http-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-http
@@ -68,4 +66,8 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-http-ut
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(library-cpp-actors-http-ut)
diff --git a/library/cpp/actors/http/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/http/ut/CMakeLists.windows-x86_64.txt
index 80bc753531e..73603d626cd 100644
--- a/library/cpp/actors/http/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/http/ut/CMakeLists.windows-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-http-ut PRIVATE
 target_link_libraries(library-cpp-actors-http-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-http
@@ -53,4 +52,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-http-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-http-ut)
diff --git a/library/cpp/actors/interconnect/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/interconnect/ut/CMakeLists.darwin-x86_64.txt
index 2c1aea6b811..e1e00ed6adc 100644
--- a/library/cpp/actors/interconnect/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut/CMakeLists.darwin-x86_64.txt
@@ -13,7 +13,6 @@ add_executable(library-cpp-actors-interconnect-ut)
 target_link_libraries(library-cpp-actors-interconnect-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -79,4 +78,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-interconnect-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-interconnect-ut)
diff --git a/library/cpp/actors/interconnect/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/interconnect/ut/CMakeLists.linux-aarch64.txt
index 521f2e1eba5..a869318b87e 100644
--- a/library/cpp/actors/interconnect/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/interconnect/ut/CMakeLists.linux-aarch64.txt
@@ -14,7 +14,6 @@ target_link_libraries(library-cpp-actors-interconnect-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   cpp-testing-unittest_main
   cpp-actors-core
   cpp-actors-interconnect
@@ -82,4 +81,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-interconnect-ut
+  cpp-malloc-jemalloc
+)
 vcs_info(library-cpp-actors-interconnect-ut)
diff --git a/library/cpp/actors/interconnect/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/interconnect/ut/CMakeLists.linux-x86_64.txt
index 6456daf5b83..479e70158ad 100644
--- a/library/cpp/actors/interconnect/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut/CMakeLists.linux-x86_64.txt
@@ -14,8 +14,6 @@ target_link_libraries(library-cpp-actors-interconnect-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -84,4 +82,8 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-interconnect-ut
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(library-cpp-actors-interconnect-ut)
diff --git a/library/cpp/actors/interconnect/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/interconnect/ut/CMakeLists.windows-x86_64.txt
index 9abc682685c..61244b1f9da 100644
--- a/library/cpp/actors/interconnect/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut/CMakeLists.windows-x86_64.txt
@@ -13,7 +13,6 @@ add_executable(library-cpp-actors-interconnect-ut)
 target_link_libraries(library-cpp-actors-interconnect-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -72,4 +71,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-interconnect-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-interconnect-ut)
diff --git a/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-x86_64.txt
index b036ca2968d..42855134991 100644
--- a/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-x86_64.txt
@@ -11,7 +11,6 @@ add_executable(library-cpp-actors-interconnect-ut_fat)
 target_link_libraries(library-cpp-actors-interconnect-ut_fat PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -65,4 +64,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-interconnect-ut_fat
+  system_allocator
+)
 vcs_info(library-cpp-actors-interconnect-ut_fat)
diff --git a/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-aarch64.txt b/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-aarch64.txt
index bff55081e17..5365ba4e247 100644
--- a/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-aarch64.txt
@@ -12,7 +12,6 @@ target_link_libraries(library-cpp-actors-interconnect-ut_fat PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   cpp-testing-unittest_main
   cpp-actors-core
   cpp-actors-interconnect
@@ -68,4 +67,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-interconnect-ut_fat
+  cpp-malloc-jemalloc
+)
 vcs_info(library-cpp-actors-interconnect-ut_fat)
diff --git a/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-x86_64.txt b/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-x86_64.txt
index 229645955c6..86ef393babe 100644
--- a/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-x86_64.txt
@@ -12,8 +12,6 @@ target_link_libraries(library-cpp-actors-interconnect-ut_fat PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -70,4 +68,8 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-interconnect-ut_fat
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(library-cpp-actors-interconnect-ut_fat)
diff --git a/library/cpp/actors/interconnect/ut_fat/CMakeLists.windows-x86_64.txt b/library/cpp/actors/interconnect/ut_fat/CMakeLists.windows-x86_64.txt
index c1c58aa0728..3841949a285 100644
--- a/library/cpp/actors/interconnect/ut_fat/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_fat/CMakeLists.windows-x86_64.txt
@@ -11,7 +11,6 @@ add_executable(library-cpp-actors-interconnect-ut_fat)
 target_link_libraries(library-cpp-actors-interconnect-ut_fat PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -58,4 +57,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-interconnect-ut_fat
+  system_allocator
+)
 vcs_info(library-cpp-actors-interconnect-ut_fat)
diff --git a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-x86_64.txt
index bfce0145c43..45fd7e20603 100644
--- a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-x86_64.txt
@@ -11,7 +11,6 @@ add_executable(library-cpp-actors-interconnect-ut_huge_cluster)
 target_link_libraries(library-cpp-actors-interconnect-ut_huge_cluster PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -71,4 +70,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-interconnect-ut_huge_cluster
+  system_allocator
+)
 vcs_info(library-cpp-actors-interconnect-ut_huge_cluster)
diff --git a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-aarch64.txt b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-aarch64.txt
index a7881169fbe..51c8af6a267 100644
--- a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-aarch64.txt
@@ -12,7 +12,6 @@ target_link_libraries(library-cpp-actors-interconnect-ut_huge_cluster PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   cpp-testing-unittest_main
   cpp-actors-core
   cpp-actors-interconnect
@@ -74,4 +73,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-interconnect-ut_huge_cluster
+  cpp-malloc-jemalloc
+)
 vcs_info(library-cpp-actors-interconnect-ut_huge_cluster)
diff --git a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-x86_64.txt b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-x86_64.txt
index 39395876178..97a04cc1022 100644
--- a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-x86_64.txt
@@ -12,8 +12,6 @@ target_link_libraries(library-cpp-actors-interconnect-ut_huge_cluster PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -76,4 +74,8 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-interconnect-ut_huge_cluster
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(library-cpp-actors-interconnect-ut_huge_cluster)
diff --git a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.windows-x86_64.txt b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.windows-x86_64.txt
index f758b835ace..7155e17cd54 100644
--- a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.windows-x86_64.txt
@@ -11,7 +11,6 @@ add_executable(library-cpp-actors-interconnect-ut_huge_cluster)
 target_link_libraries(library-cpp-actors-interconnect-ut_huge_cluster PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-core
@@ -64,4 +63,7 @@ set_yunittest_property(
   TIMEOUT
   600
 )
+target_allocator(library-cpp-actors-interconnect-ut_huge_cluster
+  system_allocator
+)
 vcs_info(library-cpp-actors-interconnect-ut_huge_cluster)
diff --git a/library/cpp/actors/prof/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/prof/ut/CMakeLists.darwin-x86_64.txt
index 8dee6a653a0..0ec56d87626 100644
--- a/library/cpp/actors/prof/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/prof/ut/CMakeLists.darwin-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-prof-ut PRIVATE
 target_link_libraries(library-cpp-actors-prof-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-prof
@@ -62,4 +61,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-prof-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-prof-ut)
diff --git a/library/cpp/actors/prof/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/prof/ut/CMakeLists.linux-aarch64.txt
index fae703068a1..591055b7443 100644
--- a/library/cpp/actors/prof/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/prof/ut/CMakeLists.linux-aarch64.txt
@@ -15,7 +15,6 @@ target_link_libraries(library-cpp-actors-prof-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   cpp-testing-unittest_main
   cpp-actors-prof
 )
@@ -65,4 +64,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-prof-ut
+  cpp-malloc-jemalloc
+)
 vcs_info(library-cpp-actors-prof-ut)
diff --git a/library/cpp/actors/prof/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/prof/ut/CMakeLists.linux-x86_64.txt
index 707f5473403..7c84eda1b00 100644
--- a/library/cpp/actors/prof/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/prof/ut/CMakeLists.linux-x86_64.txt
@@ -15,8 +15,6 @@ target_link_libraries(library-cpp-actors-prof-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-prof
@@ -67,4 +65,8 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-prof-ut
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(library-cpp-actors-prof-ut)
diff --git a/library/cpp/actors/prof/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/prof/ut/CMakeLists.windows-x86_64.txt
index 54124f414fb..3165130380b 100644
--- a/library/cpp/actors/prof/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/prof/ut/CMakeLists.windows-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-prof-ut PRIVATE
 target_link_libraries(library-cpp-actors-prof-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-prof
@@ -55,4 +54,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-prof-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-prof-ut)
diff --git a/library/cpp/actors/testlib/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/testlib/ut/CMakeLists.darwin-x86_64.txt
index f19083b8be6..03d106c63f9 100644
--- a/library/cpp/actors/testlib/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/testlib/ut/CMakeLists.darwin-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-testlib-ut PRIVATE
 target_link_libraries(library-cpp-actors-testlib-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-testlib
@@ -63,4 +62,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-testlib-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-testlib-ut)
diff --git a/library/cpp/actors/testlib/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/testlib/ut/CMakeLists.linux-aarch64.txt
index f41e1a37639..598b6e53dea 100644
--- a/library/cpp/actors/testlib/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/testlib/ut/CMakeLists.linux-aarch64.txt
@@ -15,7 +15,6 @@ target_link_libraries(library-cpp-actors-testlib-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   cpp-testing-unittest_main
   cpp-actors-testlib
   cpp-actors-core
@@ -66,4 +65,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-testlib-ut
+  cpp-malloc-jemalloc
+)
 vcs_info(library-cpp-actors-testlib-ut)
diff --git a/library/cpp/actors/testlib/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/testlib/ut/CMakeLists.linux-x86_64.txt
index 83a9b7371f1..42713842dab 100644
--- a/library/cpp/actors/testlib/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/testlib/ut/CMakeLists.linux-x86_64.txt
@@ -15,8 +15,6 @@ target_link_libraries(library-cpp-actors-testlib-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-testlib
@@ -68,4 +66,8 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-testlib-ut
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(library-cpp-actors-testlib-ut)
diff --git a/library/cpp/actors/testlib/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/testlib/ut/CMakeLists.windows-x86_64.txt
index c04f088b8ac..077ccae7fb6 100644
--- a/library/cpp/actors/testlib/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/testlib/ut/CMakeLists.windows-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-testlib-ut PRIVATE
 target_link_libraries(library-cpp-actors-testlib-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-testlib
@@ -56,4 +55,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-testlib-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-testlib-ut)
diff --git a/library/cpp/actors/util/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/util/ut/CMakeLists.darwin-x86_64.txt
index cd6833fe778..cb32e0652f7 100644
--- a/library/cpp/actors/util/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/util/ut/CMakeLists.darwin-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-util-ut PRIVATE
 target_link_libraries(library-cpp-actors-util-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-util
@@ -68,4 +67,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-util-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-util-ut)
diff --git a/library/cpp/actors/util/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/util/ut/CMakeLists.linux-aarch64.txt
index 095f1c02f44..27ff864fef5 100644
--- a/library/cpp/actors/util/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/util/ut/CMakeLists.linux-aarch64.txt
@@ -15,7 +15,6 @@ target_link_libraries(library-cpp-actors-util-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   cpp-testing-unittest_main
   cpp-actors-util
 )
@@ -73,4 +72,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-util-ut
+  cpp-malloc-jemalloc
+)
 vcs_info(library-cpp-actors-util-ut)
diff --git a/library/cpp/actors/util/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/util/ut/CMakeLists.linux-x86_64.txt
index 9d526492d88..d1143a475b4 100644
--- a/library/cpp/actors/util/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/util/ut/CMakeLists.linux-x86_64.txt
@@ -15,8 +15,6 @@ target_link_libraries(library-cpp-actors-util-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-util
@@ -75,4 +73,8 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-util-ut
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(library-cpp-actors-util-ut)
diff --git a/library/cpp/actors/util/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/util/ut/CMakeLists.windows-x86_64.txt
index becfd9853bc..3af5d98ef02 100644
--- a/library/cpp/actors/util/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/util/ut/CMakeLists.windows-x86_64.txt
@@ -14,7 +14,6 @@ target_include_directories(library-cpp-actors-util-ut PRIVATE
 target_link_libraries(library-cpp-actors-util-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-testing-unittest_main
   cpp-actors-util
@@ -63,4 +62,7 @@ set_yunittest_property(
   PROCESSORS
   1
 )
+target_allocator(library-cpp-actors-util-ut
+  system_allocator
+)
 vcs_info(library-cpp-actors-util-ut)
diff --git a/library/cpp/balloc/CMakeLists.windows-x86_64.txt b/library/cpp/balloc/CMakeLists.windows-x86_64.txt
index 7a299b9800f..f6b91521b3c 100644
--- a/library/cpp/balloc/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/balloc/CMakeLists.windows-x86_64.txt
@@ -10,5 +10,7 @@
 add_library(library-cpp-balloc INTERFACE)
 target_link_libraries(library-cpp-balloc INTERFACE
   contrib-libs-cxxsupp
+)
+target_allocator(library-cpp-balloc
   library-cpp-lfalloc
 )
diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin-x86_64.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin-x86_64.txt
index 48e79f950d8..64e8d803e5e 100644
--- a/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin-x86_64.txt
@@ -11,7 +11,6 @@ add_executable(gencrc)
 target_link_libraries(gencrc PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
 )
 target_link_options(gencrc PRIVATE
@@ -22,4 +21,7 @@ target_link_options(gencrc PRIVATE
 target_sources(gencrc PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/digest/old_crc/gencrc/main.cpp
 )
+target_allocator(gencrc
+  system_allocator
+)
 vcs_info(gencrc)
diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-aarch64.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-aarch64.txt
index 38e5afdb8ad..f4a3176047e 100644
--- a/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-aarch64.txt
@@ -12,7 +12,6 @@ target_link_libraries(gencrc PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
 )
 target_link_options(gencrc PRIVATE
   -ldl
@@ -27,4 +26,7 @@ target_link_options(gencrc PRIVATE
 target_sources(gencrc PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/digest/old_crc/gencrc/main.cpp
 )
+target_allocator(gencrc
+  cpp-malloc-jemalloc
+)
 vcs_info(gencrc)
diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-x86_64.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-x86_64.txt
index ed861d121c8..33bcd9c559f 100644
--- a/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-x86_64.txt
@@ -12,8 +12,6 @@ target_link_libraries(gencrc PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
 )
 target_link_options(gencrc PRIVATE
@@ -29,4 +27,8 @@ target_link_options(gencrc PRIVATE
 target_sources(gencrc PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/digest/old_crc/gencrc/main.cpp
 )
+target_allocator(gencrc
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(gencrc)
diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.windows-x86_64.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.windows-x86_64.txt
index ca1d923ee24..b2bfec2ccb8 100644
--- a/library/cpp/digest/old_crc/gencrc/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.windows-x86_64.txt
@@ -11,10 +11,12 @@ add_executable(gencrc)
 target_link_libraries(gencrc PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
 )
 target_sources(gencrc PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/digest/old_crc/gencrc/main.cpp
 )
+target_allocator(gencrc
+  system_allocator
+)
 vcs_info(gencrc)
diff --git a/library/cpp/malloc/system/CMakeLists.darwin-x86_64.txt b/library/cpp/malloc/system/CMakeLists.darwin-x86_64.txt
index 72c039454cb..02b71485333 100644
--- a/library/cpp/malloc/system/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/malloc/system/CMakeLists.darwin-x86_64.txt
@@ -7,11 +7,11 @@
 
 
 
-add_library(cpp-malloc-system)
-target_link_libraries(cpp-malloc-system PUBLIC
+add_library(system_allocator)
+target_link_libraries(system_allocator PUBLIC
   contrib-libs-cxxsupp
   cpp-malloc-api
 )
-target_sources(cpp-malloc-system PRIVATE
+target_sources(system_allocator PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/malloc/system/malloc-info.cpp
 )
diff --git a/library/cpp/malloc/system/CMakeLists.windows-x86_64.txt b/library/cpp/malloc/system/CMakeLists.windows-x86_64.txt
index 72c039454cb..02b71485333 100644
--- a/library/cpp/malloc/system/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/malloc/system/CMakeLists.windows-x86_64.txt
@@ -7,11 +7,11 @@
 
 
 
-add_library(cpp-malloc-system)
-target_link_libraries(cpp-malloc-system PUBLIC
+add_library(system_allocator)
+target_link_libraries(system_allocator PUBLIC
   contrib-libs-cxxsupp
   cpp-malloc-api
 )
-target_sources(cpp-malloc-system PRIVATE
+target_sources(system_allocator PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/malloc/system/malloc-info.cpp
 )