diff --git a/openpype/hosts/photoshop/plugins/publish/collect_review.py b/openpype/hosts/photoshop/plugins/publish/collect_review.py
index dafeb95d0e..09fed2df78 100644
--- a/openpype/hosts/photoshop/plugins/publish/collect_review.py
+++ b/openpype/hosts/photoshop/plugins/publish/collect_review.py
@@ -23,15 +23,16 @@ class CollectReview(pyblish.api.ContextPlugin):
     label = "Collect Review"
     order = pyblish.api.CollectorOrder
     hosts = ["photoshop"]
+    order = pyblish.api.CollectorOrder + 0.1
 
     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 1a826c3f2a..71022a86fd 100644
--- a/openpype/hosts/photoshop/plugins/publish/collect_workfile.py
+++ b/openpype/hosts/photoshop/plugins/publish/collect_workfile.py
@@ -20,12 +20,12 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
                 break
 
         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"
         )