diff --git a/ydb/library/yql/providers/dq/actors/yt/lock.cpp b/ydb/library/yql/providers/dq/actors/yt/lock.cpp
index 6e6af3dec559..ba9c590c3832 100644
--- a/ydb/library/yql/providers/dq/actors/yt/lock.cpp
+++ b/ydb/library/yql/providers/dq/actors/yt/lock.cpp
@@ -83,7 +83,7 @@ struct TLockRequest: public TActor<TLockRequest> {
         if (result.IsOK()) {
             NYT::NApi::TLockNodeOptions options;
             options.Waitable = false;
-            auto* actorSystem = ctx.ExecutorThread.ActorSystem;
+            auto* actorSystem = ctx.ActorSystem();
             auto selfId = SelfId();
             try {
                 YT_UNUSED_FUTURE(Transaction->LockNode("#" + ToString(result.ValueOrThrow()), NYT::NCypressClient::ELockMode::Exclusive, options).As<void>()
@@ -224,7 +224,7 @@ struct TLockRequest: public TActor<TLockRequest> {
     template<typename T>
     void Finish(const NYT::TErrorOr<T>& result, const TActorContext& ctx) {
         if (result.IsOK()) {
-            auto* actorSystem = ctx.ExecutorThread.ActorSystem;
+            auto* actorSystem = ctx.ActorSystem();
             auto selfId = SelfId();
             Transaction->SubscribeAborted(BIND([actorSystem, selfId](const NYT::TError& /*error*/) {
                 actorSystem->Send(selfId, new TEvents::TEvPoison());
@@ -247,7 +247,7 @@ struct TLockRequest: public TActor<TLockRequest> {
         auto lockNode = Prefix + "/" + LockName + ".lock";
 
         try {
-            auto* actorSystem = ctx.ExecutorThread.ActorSystem;
+            auto* actorSystem = ctx.ActorSystem();
             auto selfId = SelfId();
             YT_UNUSED_FUTURE(Transaction->CreateNode(
                 lockNode,
diff --git a/ydb/library/yql/providers/dq/actors/yt/yt_wrapper.cpp b/ydb/library/yql/providers/dq/actors/yt/yt_wrapper.cpp
index a606b735309b..a2ab30462d7b 100644
--- a/ydb/library/yql/providers/dq/actors/yt/yt_wrapper.cpp
+++ b/ydb/library/yql/providers/dq/actors/yt/yt_wrapper.cpp
@@ -254,7 +254,7 @@ namespace NYql {
 
         template<typename T>
         TWeakPtr<T> NewRequest(ui64 id, TActorId sender, const TActorContext& ctx) {
-            auto req = New<T>(SelfId(), sender, ctx.ExecutorThread.ActorSystem, id);
+            auto req = New<T>(SelfId(), sender, ctx.ActorSystem(), id);
             Requests.emplace(req);
             return NYT::MakeWeak(req);
         }
diff --git a/ydb/library/yql/providers/dq/global_worker_manager/service_node_pinger.cpp b/ydb/library/yql/providers/dq/global_worker_manager/service_node_pinger.cpp
index 05f94ebdef50..cb437dc086d2 100644
--- a/ydb/library/yql/providers/dq/global_worker_manager/service_node_pinger.cpp
+++ b/ydb/library/yql/providers/dq/global_worker_manager/service_node_pinger.cpp
@@ -269,7 +269,7 @@ class TServiceNodePinger: public TActor<TServiceNodePinger> {
             req.AddKnownNodes(node);
         }
 
-        auto* actorSystem = ctx.ExecutorThread.ActorSystem;
+        auto* actorSystem = ctx.ActorSystem();
         auto selfId = SelfId();
 
         Resolver->GetConnection()
diff --git a/ydb/library/yql/providers/dq/service/grpc_service.cpp b/ydb/library/yql/providers/dq/service/grpc_service.cpp
index 3d0da9ce955e..2efe72e64723 100644
--- a/ydb/library/yql/providers/dq/service/grpc_service.cpp
+++ b/ydb/library/yql/providers/dq/service/grpc_service.cpp
@@ -116,7 +116,7 @@ namespace NYql::NDqs {
                 YQL_LOG_CTX_ROOT_SESSION_SCOPE(TraceId);
                 if (!CtxSubscribed) {
                     auto selfId = ctx.SelfID;
-                    auto* actorSystem = ctx.ExecutorThread.ActorSystem;
+                    auto* actorSystem = ctx.ActorSystem();
                     Ctx->GetFinishFuture().Subscribe([selfId, actorSystem](const NYdbGrpc::IRequestContextBase::TAsyncFinishResult& future) {
                         Y_ABORT_UNLESS(future.HasValue());
                         if (future.GetValue() == NYdbGrpc::IRequestContextBase::EFinishStatus::CANCEL) {
diff --git a/ydb/library/yql/providers/dq/task_runner_actor/task_runner_actor.cpp b/ydb/library/yql/providers/dq/task_runner_actor/task_runner_actor.cpp
index ba86d3da8a9d..c571cad288dc 100644
--- a/ydb/library/yql/providers/dq/task_runner_actor/task_runner_actor.cpp
+++ b/ydb/library/yql/providers/dq/task_runner_actor/task_runner_actor.cpp
@@ -416,7 +416,7 @@ class TTaskRunnerActor
         i64 space,
         bool finish) override
     {
-        auto* actorSystem = NActors::TlsActivationContext->ExecutorThread.ActorSystem;
+        auto* actorSystem = NActors::TActivationContext::ActorSystem();
         auto selfId = SelfId();
 
         YQL_ENSURE(!batch.IsWide());
diff --git a/ydb/library/yql/providers/dq/worker_manager/worker_manager_common.h b/ydb/library/yql/providers/dq/worker_manager/worker_manager_common.h
index 695b183f2072..5bb59cc1bfc4 100644
--- a/ydb/library/yql/providers/dq/worker_manager/worker_manager_common.h
+++ b/ydb/library/yql/providers/dq/worker_manager/worker_manager_common.h
@@ -19,7 +19,7 @@ class TWorkerManagerCommon: public TRichActor<TDerived> {
         auto localRequest = MakeHolder<NActors::TEvInterconnect::TEvListNodes>();
 
         auto replyTo = ev->Sender;
-        auto* actorSystem = ctx.ExecutorThread.ActorSystem;
+        auto* actorSystem = ctx.ActorSystem();
 
         auto callback = MakeHolder<NActors::TActorFutureCallback<NActors::TEvInterconnect::TEvNodesInfo>>(
             [replyTo, actorSystem] (TAutoPtr<NActors::TEventHandle<NActors::TEvInterconnect::TEvNodesInfo>>& event) {