diff --git a/pype/plugins/photoshop/publish/collect_workfile.py b/pype/plugins/photoshop/publish/collect_workfile.py
new file mode 100644
index 0000000000..766be02354
--- /dev/null
+++ b/pype/plugins/photoshop/publish/collect_workfile.py
@@ -0,0 +1,39 @@
+import pyblish.api
+import os
+
+
+class CollectWorkfile(pyblish.api.ContextPlugin):
+    """Collect current script for publish."""
+
+    order = pyblish.api.CollectorOrder + 0.1
+    label = "Collect Workfile"
+    hosts = ["photoshop"]
+
+    def process(self, context):
+        family = "workfile"
+        task = os.getenv("AVALON_TASK", None)
+        subset = family + task.capitalize()
+
+        file_path = context.data["currentFile"]
+        staging_dir = os.path.dirname(file_path)
+        base_name = os.path.basename(file_path)
+
+        # Create instance
+        instance = context.create_instance(subset)
+        instance.data.update({
+            "subset": subset,
+            "label": base_name,
+            "name": base_name,
+            "family": family,
+            "families": [],
+            "representations": [],
+            "asset": os.environ["AVALON_ASSET"]
+        })
+
+        # creating representation
+        instance.data["representations"].append({
+            "name": "psd",
+            "ext": "psd",
+            "files": base_name,
+            "stagingDir": staging_dir,
+        })
diff --git a/pype/plugins/photoshop/publish/extract_save_scene.py b/pype/plugins/photoshop/publish/extract_save_scene.py
new file mode 100644
index 0000000000..b3d4f0e447
--- /dev/null
+++ b/pype/plugins/photoshop/publish/extract_save_scene.py
@@ -0,0 +1,14 @@
+import pype.api
+from avalon import photoshop
+
+
+class ExtractSaveScene(pype.api.Extractor):
+    """Save scene before extraction."""
+
+    order = pype.api.Extractor.order - 0.49
+    label = "Extract Save Scene"
+    hosts = ["photoshop"]
+    families = ["workfile"]
+
+    def process(self, instance):
+        photoshop.app().ActiveDocument.Save()