diff --git a/cloud/blockstore/libs/storage/disk_agent/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/storage/disk_agent/CMakeLists.darwin-x86_64.txt
index f1ccf8a604f..66ce265ab5a 100644
--- a/cloud/blockstore/libs/storage/disk_agent/CMakeLists.darwin-x86_64.txt
+++ b/cloud/blockstore/libs/storage/disk_agent/CMakeLists.darwin-x86_64.txt
@@ -6,6 +6,7 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(actors)
 add_subdirectory(benchmark)
 add_subdirectory(model)
 add_subdirectory(testlib)
@@ -31,6 +32,7 @@ target_link_libraries(libs-storage-disk_agent PUBLIC
   libs-spdk-iface
   libs-storage-api
   libs-storage-core
+  storage-disk_agent-actors
   storage-disk_agent-model
   libs-storage-disk_common
   libs-storage-model
diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.darwin-x86_64.txt
new file mode 100644
index 00000000000..1d30b7b3931
--- /dev/null
+++ b/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.darwin-x86_64.txt
@@ -0,0 +1,18 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_library(storage-disk_agent-actors)
+target_link_libraries(storage-disk_agent-actors PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  blockstore-libs-common
+  cpp-actors-core
+)
+target_sources(storage-disk_agent-actors PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor.cpp
+)
diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.linux-aarch64.txt
new file mode 100644
index 00000000000..30a72f905d5
--- /dev/null
+++ b/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,21 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(ut)
+
+add_library(storage-disk_agent-actors)
+target_link_libraries(storage-disk_agent-actors PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  blockstore-libs-common
+  cpp-actors-core
+)
+target_sources(storage-disk_agent-actors PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor.cpp
+)
diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.linux-x86_64.txt
new file mode 100644
index 00000000000..30a72f905d5
--- /dev/null
+++ b/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.linux-x86_64.txt
@@ -0,0 +1,21 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(ut)
+
+add_library(storage-disk_agent-actors)
+target_link_libraries(storage-disk_agent-actors PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  blockstore-libs-common
+  cpp-actors-core
+)
+target_sources(storage-disk_agent-actors PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor.cpp
+)
diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.txt b/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.txt
new file mode 100644
index 00000000000..f8b31df0c11
--- /dev/null
+++ b/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-aarch64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  include(CMakeLists.darwin-x86_64.txt)
+elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
+  include(CMakeLists.windows-x86_64.txt)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
+  include(CMakeLists.linux-x86_64.txt)
+endif()
diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor.cpp b/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor.cpp
index 662386cdb1a..c1fb2bbbb94 100644
--- a/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor.cpp
+++ b/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor.cpp
@@ -6,10 +6,9 @@
 #include <cloud/storage/core/libs/actors/helpers.h>
 #include <cloud/storage/core/libs/common/error.h>
 
-#include <contrib/ydb/library/actors/core/actor_bootstrapped.h>
-#include <contrib/ydb/library/actors/core/events.h>
-#include <contrib/ydb/library/actors/core/log.h>
-
+#include <library/cpp/actors/core/actor_bootstrapped.h>
+#include <library/cpp/actors/core/events.h>
+#include <library/cpp/actors/core/log.h>
 #include <library/cpp/protobuf/util/pb_io.h>
 
 #include <util/system/fs.h>
diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor.h b/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor.h
index 9609f57543e..370716b9791 100644
--- a/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor.h
+++ b/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor.h
@@ -4,7 +4,7 @@
 
 #include <cloud/blockstore/libs/storage/core/request_info.h>
 
-#include <contrib/ydb/library/actors/core/actor.h>
+#include <library/cpp/actors/core/actor.h>
 
 #include <memory>
 
diff --git a/cloud/blockstore/libs/storage/disk_agent/disk_agent_actor_acquire.cpp b/cloud/blockstore/libs/storage/disk_agent/disk_agent_actor_acquire.cpp
index 4852b2a52a5..94a49162ada 100644
--- a/cloud/blockstore/libs/storage/disk_agent/disk_agent_actor_acquire.cpp
+++ b/cloud/blockstore/libs/storage/disk_agent/disk_agent_actor_acquire.cpp
@@ -2,7 +2,7 @@
 
 #include <cloud/blockstore/libs/storage/core/request_info.h>
 
-#include <contrib/ydb/core/base/appdata.h>
+#include <ydb/core/base/appdata.h>
 
 #include <util/string/join.h>
 
diff --git a/cloud/blockstore/libs/storage/disk_agent/disk_agent_actor_release.cpp b/cloud/blockstore/libs/storage/disk_agent/disk_agent_actor_release.cpp
index bd5f11f1f31..ef422dd1d26 100644
--- a/cloud/blockstore/libs/storage/disk_agent/disk_agent_actor_release.cpp
+++ b/cloud/blockstore/libs/storage/disk_agent/disk_agent_actor_release.cpp
@@ -1,6 +1,6 @@
 #include "disk_agent_actor.h"
 
-#include <contrib/ydb/core/base/appdata.h>
+#include <ydb/core/base/appdata.h>
 
 namespace NCloud::NBlockStore::NStorage {