diff --git a/openpype/plugins/publish/collect_from_create_context.py b/openpype/plugins/publish/collect_from_create_context.py
index d3398c885e..5fcf8feb56 100644
--- a/openpype/plugins/publish/collect_from_create_context.py
+++ b/openpype/plugins/publish/collect_from_create_context.py
@@ -32,7 +32,7 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
             thumbnail_paths_by_instance_id.get(None)
         )
 
-        project_name = create_context.project_name
+        project_name = create_context.get_current_project_name()
         if project_name:
             context.data["projectName"] = project_name
 
@@ -53,11 +53,15 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
         context.data.update(create_context.context_data_to_store())
         context.data["newPublishing"] = True
         # Update context data
-        for key in ("AVALON_PROJECT", "AVALON_ASSET", "AVALON_TASK"):
-            value = create_context.dbcon.Session.get(key)
-            if value is not None:
-                legacy_io.Session[key] = value
-                os.environ[key] = value
+        asset_name = create_context.get_current_asset_name()
+        task_name = create_context.get_current_task_name()
+        for key, value in (
+            ("AVALON_PROJECT", project_name),
+            ("AVALON_ASSET", asset_name),
+            ("AVALON_TASK", task_name)
+        ):
+            legacy_io.Session[key] = value
+            os.environ[key] = value
 
     def create_instance(
         self,