diff --git a/openpype/hosts/photoshop/plugins/publish/collect_review.py b/openpype/hosts/photoshop/plugins/publish/collect_review.py
index 09fed2df78..d825950b9e 100644
--- a/openpype/hosts/photoshop/plugins/publish/collect_review.py
+++ b/openpype/hosts/photoshop/plugins/publish/collect_review.py
@@ -10,7 +10,7 @@ import os
 
 import pyblish.api
 
-from openpype.lib import get_subset_name
+from openpype.lib import get_subset_name_with_asset_doc
 
 
 class CollectReview(pyblish.api.ContextPlugin):
@@ -27,13 +27,13 @@ class CollectReview(pyblish.api.ContextPlugin):
 
     def process(self, context):
         family = "review"
-        subset = get_subset_name(
+        subset = get_subset_name_with_asset_doc(
             family,
             "",
             context.data["anatomyData"]["task"]["name"],
-            context.data["assetEntity"]["_id"],
+            context.data["assetEntity"],
             context.data["anatomyData"]["project"]["name"],
-            host_name="photoshop"
+            host_name=context.data["hostName"]
         )
 
         instance = context.create_instance(subset)
diff --git a/openpype/hosts/photoshop/plugins/publish/collect_workfile.py b/openpype/hosts/photoshop/plugins/publish/collect_workfile.py
index 71022a86fd..e4f0a07b34 100644
--- a/openpype/hosts/photoshop/plugins/publish/collect_workfile.py
+++ b/openpype/hosts/photoshop/plugins/publish/collect_workfile.py
@@ -1,7 +1,7 @@
 import os
 import pyblish.api
 
-from openpype.lib import get_subset_name
+from openpype.lib import get_subset_name_with_asset_doc
 
 
 class CollectWorkfile(pyblish.api.ContextPlugin):
@@ -20,13 +20,13 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
                 break
 
         family = "workfile"
-        subset = get_subset_name(
+        subset = get_subset_name_with_asset_doc(
             family,
             "",
             context.data["anatomyData"]["task"]["name"],
-            context.data["assetEntity"]["_id"],
+            context.data["assetEntity"],
             context.data["anatomyData"]["project"]["name"],
-            host_name="photoshop"
+            host_name=context.data["hostName"]
         )
 
         file_path = context.data["currentFile"]