diff --git a/openpype/hosts/fusion/scripts/fusion_switch_shot.py b/openpype/hosts/fusion/scripts/fusion_switch_shot.py
index 87ff8e2ffe..49ef340679 100644
--- a/openpype/hosts/fusion/scripts/fusion_switch_shot.py
+++ b/openpype/hosts/fusion/scripts/fusion_switch_shot.py
@@ -15,7 +15,7 @@ from openpype.pipeline import (
 from openpype.lib import version_up
 from openpype.hosts.fusion import api
 from openpype.hosts.fusion.api import lib
-from openpype.lib.avalon_context import get_workdir_from_session
+from openpype.pipeline.context_tools import get_workdir_from_session
 
 log = logging.getLogger("Update Slap Comp")
 
diff --git a/openpype/hosts/fusion/utility_scripts/switch_ui.py b/openpype/hosts/fusion/utility_scripts/switch_ui.py
index 01d55db647..93f775b24b 100644
--- a/openpype/hosts/fusion/utility_scripts/switch_ui.py
+++ b/openpype/hosts/fusion/utility_scripts/switch_ui.py
@@ -14,7 +14,7 @@ from openpype.pipeline import (
     legacy_io,
 )
 from openpype.hosts.fusion import api
-from openpype.lib.avalon_context import get_workdir_from_session
+from openpype.pipeline.context_tools import get_workdir_from_session
 
 log = logging.getLogger("Fusion Switch Shot")
 
diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index a2a1839218..1b2ac459a1 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -554,6 +554,8 @@ def compute_session_changes(
         dict: The required changes in the Session dictionary.
     """
 
+    from openpype.pipeline.context_tools import get_workdir_from_session
+
     changes = dict()
 
     # If no changes, return directly
@@ -600,30 +602,11 @@ def compute_session_changes(
     return changes
 
 
-@with_pipeline_io
+@deprecated("openpype.pipeline.context_tools.get_workdir_from_session")
 def get_workdir_from_session(session=None, template_key=None):
-    from openpype.pipeline import Anatomy
-    from openpype.pipeline.context_tools import get_template_data_from_session
+    from openpype.pipeline.context_tools import get_workdir_from_session
 
-    if session is None:
-        session = legacy_io.Session
-    project_name = session["AVALON_PROJECT"]
-    host_name = session["AVALON_APP"]
-    anatomy = Anatomy(project_name)
-    template_data = get_template_data_from_session(session)
-    anatomy_filled = anatomy.format(template_data)
-
-    if not template_key:
-        task_type = template_data["task"]["type"]
-        template_key = get_workfile_template_key(
-            task_type,
-            host_name,
-            project_name=project_name
-        )
-    path = anatomy_filled[template_key]["folder"]
-    if path:
-        path = os.path.normpath(path)
-    return path
+    return get_workdir_from_session(session, template_key)
 
 
 @with_pipeline_io
diff --git a/openpype/pipeline/context_tools.py b/openpype/pipeline/context_tools.py
index c8c70e5ea8..13185c72b2 100644
--- a/openpype/pipeline/context_tools.py
+++ b/openpype/pipeline/context_tools.py
@@ -22,6 +22,7 @@ from openpype.settings import get_project_settings
 from .publish.lib import filter_pyblish_plugins
 from .anatomy import Anatomy
 from .template_data import get_template_data_with_names
+from .workfile import get_workfile_template_key
 from . import (
     legacy_io,
     register_loader_plugin_path,
@@ -377,3 +378,37 @@ def get_template_data_from_session(session=None, system_settings=None):
     return get_template_data_with_names(
         project_name, asset_name, task_name, host_name, system_settings
     )
+
+
+def get_workdir_from_session(session=None, template_key=None):
+    """Template data for template fill from session keys.
+
+    Args:
+        session (Union[Dict[str, str], None]): The Session to use. If not
+            provided use the currently active global Session.
+        template_key (str): Prepared template key from which workdir is
+            calculated.
+
+    Returns:
+        str: Workdir path.
+    """
+
+    if session is None:
+        session = legacy_io.Session
+    project_name = session["AVALON_PROJECT"]
+    host_name = session["AVALON_APP"]
+    anatomy = Anatomy(project_name)
+    template_data = get_template_data_from_session(session)
+    anatomy_filled = anatomy.format(template_data)
+
+    if not template_key:
+        task_type = template_data["task"]["type"]
+        template_key = get_workfile_template_key(
+            task_type,
+            host_name,
+            project_name=project_name
+        )
+    path = anatomy_filled[template_key]["folder"]
+    if path:
+        path = os.path.normpath(path)
+    return path
diff --git a/openpype/scripts/fusion_switch_shot.py b/openpype/scripts/fusion_switch_shot.py
index 15f189e7cb..fc22f060a2 100644
--- a/openpype/scripts/fusion_switch_shot.py
+++ b/openpype/scripts/fusion_switch_shot.py
@@ -17,7 +17,7 @@ from openpype.pipeline import (
     legacy_io,
 )
 
-from openpype.lib.avalon_context import get_workdir_from_session
+from openpype.pipeline.context_tools import get_workdir_from_session
 
 log = logging.getLogger("Update Slap Comp")