diff --git a/openpype/hosts/photoshop/plugins/publish/collect_review.py b/openpype/hosts/photoshop/plugins/publish/collect_review.py
index 6c299a60f5..e219326d64 100644
--- a/openpype/hosts/photoshop/plugins/publish/collect_review.py
+++ b/openpype/hosts/photoshop/plugins/publish/collect_review.py
@@ -15,12 +15,12 @@ class CollectReview(pyblish.api.ContextPlugin):
 
     def process(self, context):
         family = "review"
-        task = os.getenv("AVALON_TASK", None)
         subset = get_subset_name(
             family,
             "",
-            task,
+            context.data["anatomyData"]["task"]["name"],
             context.data["assetEntity"]["_id"],
+            context.data["anatomyData"]["project"]["name"],
             host_name="photoshop"
         )
 
diff --git a/openpype/hosts/photoshop/plugins/publish/collect_workfile.py b/openpype/hosts/photoshop/plugins/publish/collect_workfile.py
index 841db72cde..ca1124fd24 100644
--- a/openpype/hosts/photoshop/plugins/publish/collect_workfile.py
+++ b/openpype/hosts/photoshop/plugins/publish/collect_workfile.py
@@ -13,12 +13,12 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
 
     def process(self, context):
         family = "workfile"
-        task = os.getenv("AVALON_TASK", None)
         subset = get_subset_name(
             family,
             "",
-            task,
+            context.data["anatomyData"]["task"]["name"],
             context.data["assetEntity"]["_id"],
+            context.data["anatomyData"]["project"]["name"],
             host_name="photoshop"
         )